diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-09 11:41:23 +0100 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-09 11:41:23 +0100 |
| commit | 11c29e0cba4f521c5f37d963109c4807af8bccae (patch) | |
| tree | 3dde72ce8528cfa9cc6111098585623b5971b605 /js | |
| parent | 52ea842e872cc004fd012496c828e9fb6186bec9 (diff) | |
| parent | 2ce78253aeda8672e12f18f0963f52cd4a35e546 (diff) | |
| download | volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.gz volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.bz2 volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.zip | |
Merge commit 'upstream/master'
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"); }); } |