aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-17 02:25:22 +0100
committerzottel <github@zottel.net>2012-03-17 02:25:22 +0100
commit3bbd82abb3b33f041ec35b85de5bddcd79ed5471 (patch)
tree8cb7d68340d40e78e8a8ea2a1618250749a6edb9
parentc56e3c5dd4bcbb949282fd3b4c065ccfd4673726 (diff)
parent4a6f114ec008002f439214aac1d006d8db4051ac (diff)
downloadvolse-hubzilla-3bbd82abb3b33f041ec35b85de5bddcd79ed5471.tar.gz
volse-hubzilla-3bbd82abb3b33f041ec35b85de5bddcd79ed5471.tar.bz2
volse-hubzilla-3bbd82abb3b33f041ec35b85de5bddcd79ed5471.zip
Merge remote branch 'upstream/master'
-rwxr-xr-xmod/display.php10
-rwxr-xr-xview/theme/darkzero-NS/theme.php3
-rw-r--r--view/theme/dispy/theme.php3
3 files changed, 9 insertions, 7 deletions
diff --git a/mod/display.php b/mod/display.php
index f428149e8..81ed174ac 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -16,7 +16,15 @@ function display_content(&$a) {
$o = '<div id="live-display"></div>' . "\r\n";
- $a->page['htmlhead'] .= '<script>$(document).ready(function() { $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); });</script>';
+ $a->page['htmlhead'] .= <<<EOT
+<script>
+$(document).ready(function() {
+ $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+ // make auto-complete work in more places
+ $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+EOT;
$nick = (($a->argc > 1) ? $a->argv[1] : '');
diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 3598e34f2..2d3e4fd56 100755
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -52,9 +52,6 @@ $('.savedsearchterm').hover(
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
);
- // make auto-complete work in more places
- $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-
});
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 9f0fcba82..26e07b1f7 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -108,9 +108,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
- // make auto-complete work in more places
- $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-
/* $('#profile-photo-wrapper').mouseover(function() {
$('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() {