Merge remote branch 'friendica/master' into quattro-fontsoptions

[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 826fca316089bbdf9bcdebbcdf7caa6899ca37a5..571720e7c4154fbfa97a1137cd2cf765932ee377 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 ]
@@ -544,6 +544,15 @@ function showHideComments(id) {
        }
 }
 
+/*function showHideCommentBox(id) {
+       if( $j('#comment-edit-form-' + id).is(':visible')) {
+               $j('#comment-edit-form-' + id).hide();
+       }
+       else {
+               $j('#comment-edit-form-' + id).show();
+       }
+}*/
+
 
 /*function deleteCheckedItems() {
        var checkedstr = '';