Merge remote branch 'upstream/master'
This commit is contained in:
commit
3bbd82abb3
|
@ -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] : '');
|
||||
|
|
|
@ -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");
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
|
|
@ -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() {
|
||||
|
|
Loading…
Reference in a new issue