i18n - Improve multilingual popup for text and wysiwyg fields

[civicrm-core.git] / js / wysiwyg / crm.wysiwyg.js

diff --git a/js/wysiwyg/crm.wysiwyg.js b/js/wysiwyg/crm.wysiwyg.js
index d61bcdea82e44f93356c89aaf42e594a624de7c7..41adc35d4e74bf73899113780554858ed807951d 100644 (file)
--- a/js/wysiwyg/crm.wysiwyg.js
+++ b/js/wysiwyg/crm.wysiwyg.js
@@ -34,14 +34,16 @@
     },
     // Fallback function to use when a wysiwyg has not been initialized
     _insertIntoTextarea: function(item, text) {
-      var origVal = $(item).val();
-      var origPos = item[0].selectionStart;
-      var newVal = origVal + text;
-      $(item).val(newVal);
-      var newPos = (origPos + text.length);
-      item[0].selectionStart = newPos;
-      item[0].selectionEnd = newPos;
-      $(item).triggerHandler('change');
+      var itemObj = $(item);
+      var origVal = itemObj.val();
+      var origStart = itemObj[0].selectionStart;
+      var origEnd = itemObj[0].selectionEnd;
+      var newVal = origVal.substring(0, origStart) + text + origVal.substring(origEnd);
+      itemObj.val(newVal);
+      var newPos = (origStart + text.length);
+      itemObj[0].selectionStart = newPos;
+      itemObj[0].selectionEnd = newPos;
+      itemObj.triggerHandler('change');
       CRM.wysiwyg.focus(item);
     },
     // Create a "collapsed" textarea that expands into a wysiwyg when clicked
@@ -52,6 +54,9 @@
           CRM.wysiwyg.destroy(item);
           $(item).hide().next('.replace-plain').show().html($(item).val());
         })
+        .on('change', function() {
+          $(this).next('.replace-plain').html($(this).val());
+        })
         .after('<div class="replace-plain" tabindex="0"></div>');
       $(item).next('.replace-plain')
         .attr('title', ts('Click to edit'))