aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-12 16:48:31 -0800
committerfriendica <info@friendica.com>2013-11-12 16:48:31 -0800
commit061b438f97e40baf03cc449eac2aa4f1de33b60b (patch)
treea89e989c3d17a547e690fb6056248c8d873281bd /js
parentac7292489c0eeb981fd04cf5c194fc76f473c130 (diff)
downloadvolse-hubzilla-061b438f97e40baf03cc449eac2aa4f1de33b60b.tar.gz
volse-hubzilla-061b438f97e40baf03cc449eac2aa4f1de33b60b.tar.bz2
volse-hubzilla-061b438f97e40baf03cc449eac2aa4f1de33b60b.zip
revert addeditortext changes for tinymce detection
Diffstat (limited to 'js')
-rw-r--r--js/main.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/js/main.js b/js/main.js
index a7421b312..22b2571d0 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1044,16 +1044,15 @@ function chanviewFull() {
addeditortext(data);
}
-
function addeditortext(data) {
- if(typeof tinyMCE !== "undefined") {
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- }
- else {
+ if(plaintext == 'none') {
var currentText = $("#profile-jot-text").val();
$("#profile-jot-text").val(currentText + data);
}
- }
+ else
+ tinyMCE.execCommand('mceInsertRawHTML',false,data);
+ }
+
function h2b(s) {
var y = s;