aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-11 17:50:36 -0800
committerfriendica <info@friendica.com>2013-11-11 17:50:36 -0800
commit54438be7c2c402e4a897a2534f0f465dea5f068b (patch)
tree21f1dbf5dc93dc18c5693902d66e4615f16f45ee /js
parentd9013f43110a6474a8e52b72492bc490d50b7972 (diff)
downloadvolse-hubzilla-54438be7c2c402e4a897a2534f0f465dea5f068b.tar.gz
volse-hubzilla-54438be7c2c402e4a897a2534f0f465dea5f068b.tar.bz2
volse-hubzilla-54438be7c2c402e4a897a2534f0f465dea5f068b.zip
make e2ee work on tinymce
Diffstat (limited to 'js')
-rw-r--r--js/crypto.js16
1 files changed, 15 insertions, 1 deletions
diff --git a/js/crypto.js b/js/crypto.js
index e9ab6961b..50282d18f 100644
--- a/js/crypto.js
+++ b/js/crypto.js
@@ -31,6 +31,9 @@ function red_encrypt(alg, elem,text) {
var enc_text = '';
var newdiv = '';
+ if(typeof tinyMCE !== "undefined")
+ tinyMCE.triggerSave(false,true);
+
var text = $(elem).val();
// key and hint need to be localised
@@ -63,7 +66,18 @@ function red_encrypt(alg, elem,text) {
// alert(newdiv);
- $(elem).val(newdiv);
+ // This might be a comment box on a page with a tinymce editor
+ // so check if there is a tinymce editor but also check the display
+ // property of our source element - because a tinymce instance
+ // will have display "none". If a normal textarea such as in a comment
+ // box has display "none" you wouldn't be able to type in it.
+
+ if($(elem).css('display') == 'none' && typeof tinyMCE !== "undefined") {
+ tinyMCE.activeEditor.setContent(newdiv);
+ }
+ else {
+ $(elem).val(newdiv);
+ }
// textarea = document.getElementById(elem);
// if (document.selection) {