Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / theme / frost-mobile / js / theme.js

diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index e9024cf5a3d80c9f6d3b35c2eb25806f893692ed..3c0db8fbf9ea5c5db237998368e365d6576d6445 100644 (file)
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -49,7 +49,7 @@ $j(document).ready(function() {
                }
        }
 
-       if(typeof acl=="undefined"){
+       if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
                acl = new ACL(
                        baseurl+"/acl",
                        [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@@ -533,17 +533,6 @@ function qCommentInsert(obj,id) {
        $j(obj).val("");
 }
 
-function showHideComments(id) {
-       if( $j("#collapsed-comments-" + id).is(":visible")) {
-               $j("#collapsed-comments-" + id).hide();
-               $j("#hide-comments-" + id).html(window.showMore);
-       }
-       else {
-               $j("#collapsed-comments-" + id).show();
-               $j("#hide-comments-" + id).html(window.showFewer);
-       }
-}
-
 /*function showHideCommentBox(id) {
        if( $j('#comment-edit-form-' + id).is(':visible')) {
                $j('#comment-edit-form-' + id).hide();