diff options
author | Tobias Hößl <tobias@hoessl.eu> | 2012-03-09 10:00:12 +0000 |
---|---|---|
committer | Tobias Hößl <tobias@hoessl.eu> | 2012-03-09 10:00:12 +0000 |
commit | 635958e11da2f5a0d587b66968453064c2d41f13 (patch) | |
tree | 9e9b21d45551772a4aac8a54e3bafa382681ed70 /js | |
parent | 02a9fd5dc1d1d9e848e2f406f2e13c4cf0ce228b (diff) | |
parent | 2ce78253aeda8672e12f18f0963f52cd4a35e546 (diff) | |
download | volse-hubzilla-635958e11da2f5a0d587b66968453064c2d41f13.tar.gz volse-hubzilla-635958e11da2f5a0d587b66968453064c2d41f13.tar.bz2 volse-hubzilla-635958e11da2f5a0d587b66968453064c2d41f13.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'js')
-rwxr-xr-x | js/fk.autocomplete.js | 1 | ||||
-rwxr-xr-x | js/main.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index 509466bd9..69fe77e8c 100755 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -103,6 +103,7 @@ ACPopup.prototype._search = function(){ } else { txt = tinyMCE.activeEditor.getContent(); + // alert(that.searchText + ':' + t); newtxt = txt.replace(that.searchText,t+' '); tinyMCE.activeEditor.setContent(newtxt); tinyMCE.activeEditor.focus(); diff --git a/js/main.js b/js/main.js index a5d1214cb..c20455ad1 100755 --- a/js/main.js +++ b/js/main.js @@ -292,7 +292,7 @@ $('body').css('cursor', 'auto'); } /* autocomplete @nicknames */ - $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); + $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); }); } |