Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-26 16:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-03-17 02:25:22 +01:00
commit 3bbd82abb3
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/display.php
View file

@ -16,7 +16,15 @@ function display_content(&$a) {
$o = '<div id="live-display"></div>' . "\r\n"; $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] : ''); $nick = (($a->argc > 1) ? $a->argv[1] : '');

3
view/theme/darkzero-NS/theme.php
View file

@ -52,9 +52,6 @@ $('.savedsearchterm').hover(
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} $('#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");
}); });

3
view/theme/dispy/theme.php
View file

@ -108,9 +108,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'}); $(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-photo-wrapper').mouseover(function() {
$('.profile-edit-side-div').css({display: 'block'}); $('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() { }).mouseout(function() {