Fix for list email plugin, tinymce

Fabrik · Jul 14, 2017 · b2e2360 · b2e2360
1 parent f90ec54
commit b2e2360
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/plugins/fabrik_list/email/email-min.js b/plugins/fabrik_list/email/email-min.js
diff --git a/plugins/fabrik_list/email/email.js b/plugins/fabrik_list/email/email.js
@@ -20,7 +20,10 @@ define(['jquery', 'fab/list-plugin', 'fab/fabrik'], function (jQuery, FbListPlug
                 if (typeof WFEditor !== 'undefined') {
                     WFEditor.getContent('message');
                 }
-                var url = 'index.php';
+                else if (typeof tinymce !== 'undefined') {
+                    tinyMCE.activeEditor.save();
+                }
+                var url = Fabrik.liveSite + '/index.php';
                 if (self.options.additionalQS !== '') {
                     url += '?' + self.options.additionalQS;
                 }
@@ -77,7 +80,7 @@ define(['jquery', 'fab/list-plugin', 'fab/fabrik'], function (jQuery, FbListPlug
         },
 
         buttonAction: function () {
-            var url = 'index.php?option=com_fabrik&controller=list.email&task=popupwin&tmpl=component&ajax=1&id=' +
+            var url = Fabrik.liveSite + '/index.php?option=com_fabrik&controller=list.email&task=popupwin&tmpl=component&ajax=1&id=' +
                     this.listid + '&renderOrder=' + this.options.renderOrder,
                 self = this;
             this.listform.getElements('input[name^=ids]').each(function (id) {

diff --git a/plugins/fabrik_list/email/models/email.php b/plugins/fabrik_list/email/models/email.php
@@ -1085,7 +1085,7 @@ public function getEditor()
 
 		if ($params->get('wysiwyg', true))
 		{
-			$editor = JFactory::getEditor();
+			$editor = JEditor::getInstance($this->config->get('editor'));
 
 			return $editor->display('message', $msg, '100%', '200px', 75, 10, true, 'message');
 		}