fix compose popup again

salesagility · Jun 29, 2017 · 7a50086 · 7a50086
1 parent f2f4157
commit 7a50086
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 85 deletions.
diff --git a/include/javascript/EmailsComposeViewModal.js b/include/javascript/EmailsComposeViewModal.js
diff --git a/jssource/src_files/include/javascript/EmailsComposeViewModal.js b/jssource/src_files/include/javascript/EmailsComposeViewModal.js
@@ -114,10 +114,10 @@
     self.emailComposeView = null;
     var opts = $.extend({}, $.fn.EmailsComposeViewModal.defaults);
     var composeBox = $('<div></div>').appendTo(opts.contentSelector);
-    composeBox.messageBox({"showHeader": false, "showFooter": false, "size": 'lg'});
+    composeBox.messageBox({"showHeader": false, "showFooter": false, "size": 'lg',});
     composeBox.setBody('<div class="email-in-progress"><img src="themes/' + SUGAR.themes.theme_name + '/images/loading.gif"></div>');
     composeBox.show();
-    $.ajax({type: "GET", cache: false, url: 'index.php?module=Emails&action=ComposeView'}).done(function (data) {
+    $.ajax({type: "GET", cache: false, url: 'index.php?module=Emails&action=ComposeView&in_popup=1'}).done(function (data) {
       if (data.length === 0) {
         console.error("Unable to display ComposeView");
         composeBox.setBody(SUGAR.language.translate('', 'ERR_AJAX_LOAD'));

diff --git a/modules/Emails/include/ComposeView/ComposeView.tpl b/modules/Emails/include/ComposeView/ComposeView.tpl
@@ -196,7 +196,8 @@
     </div>
 {{sugar_include type='smarty' file=$footerTpl}}
 
-{if $RETURN_MODULE}
+{if !$IS_MODAL}
+
     {literal}
 
         <script type="text/javascript">

diff --git a/modules/Emails/include/ComposeView/EmailsComposeView.js b/modules/Emails/include/ComposeView/EmailsComposeView.js
@@ -1074,7 +1074,7 @@
       }
 
       if (typeof opts.tinyMceOptions.selector === "undefined") {
-        opts.tinyMceOptions.selector = $(self).find('#description_html');
+        opts.tinyMceOptions.selector = 'form[name="ComposeView"] textarea#description';
       }
 
       if ($(self).find('#from_addr_name').length !== 0) {
@@ -1084,89 +1084,89 @@
         var from_addr = $(self).find('#from_addr_name');
         from_addr.replaceWith(selectFrom);
 
-          $.ajax({
-            "url": 'index.php?module=Emails&action=getFromFields'
-          }).done(function (response) {
-            var json = JSON.parse(response);
-            if (typeof json.data !== "undefined") {
-              $(json.data).each(function (i, v) {
-                var selectOption = $('<option></option>');
-                selectOption.attr('value', v.attributes.from);
-                selectOption.attr('inboundId', v.id);
-                selectOption.html(v.attributes.from);
-                selectOption.appendTo(selectFrom);
-
-                // include signature for account
-                $('<textarea></textarea>')
-                  .val(v.emailSignatures.html)
-                  .addClass('email-signature')
-                  .addClass('html')
-                  .addClass('hidden')
-                  .attr('data-inbound-email-id', v.id)
-                  .appendTo(self);
-
-                $('<textarea></textarea>')
-                  .val(v.emailSignatures.plain)
-                  .addClass('email-signature')
-                  .addClass('plain')
-                  .addClass('hidden')
-                  .attr('data-inbound-email-id', v.id)
-                  .appendTo(self);
-
-                if(typeof v.prepend !== "undefined" && v.prepend === true) {
-                  self.prependSignature = true;
-                }
-                self.updateSignature();
-              });
-
-              var selectedInboundEmail = $(self).find('[name=inbound_email_id]').val();
-
-              $(selectFrom).val(
-                $(selectFrom).find('[inboundid=' + selectedInboundEmail + ']').val()
-              );
+        $.ajax({
+          "url": 'index.php?module=Emails&action=getFromFields'
+        }).done(function (response) {
+          var json = JSON.parse(response);
+          if (typeof json.data !== "undefined") {
+            $(json.data).each(function (i, v) {
+              var selectOption = $('<option></option>');
+              selectOption.attr('value', v.attributes.from);
+              selectOption.attr('inboundId', v.id);
+              selectOption.html(v.attributes.from);
+              selectOption.appendTo(selectFrom);
+
+              // include signature for account
+              $('<textarea></textarea>')
+                .val(v.emailSignatures.html)
+                .addClass('email-signature')
+                .addClass('html')
+                .addClass('hidden')
+                .attr('data-inbound-email-id', v.id)
+                .appendTo(self);
+
+              $('<textarea></textarea>')
+                .val(v.emailSignatures.plain)
+                .addClass('email-signature')
+                .addClass('plain')
+                .addClass('hidden')
+                .attr('data-inbound-email-id', v.id)
+                .appendTo(self);
+
+              if(typeof v.prepend !== "undefined" && v.prepend === true) {
+                self.prependSignature = true;
+              }
+              self.updateSignature();
+            });
 
-              $(selectFrom).change(function (e) {
-                $(self).find('[name=inbound_email_id]').val($(this).find('option:selected').attr('inboundId'));
-                self.updateSignature();
-              });
+            var selectedInboundEmail = $(self).find('[name=inbound_email_id]').val();
 
-              $(self).trigger('emailComposeViewGetFromFields');
+            $(selectFrom).val(
+              $(selectFrom).find('[inboundid="' + selectedInboundEmail + '"]').val()
+            );
 
-            }
+            $(selectFrom).change(function (e) {
+              $(self).find('[name=inbound_email_id]').val($(this).find('option:selected').attr('inboundId'));
+              self.updateSignature();
+            });
 
-            if ($(self).find('#is_only_plain_text').length === 1) {
-              $(self).find('#is_only_plain_text').click(function() {
-                var tinemceToolbar = $(tinymce.EditorManager.activeEditor.getContainer()).find('.mce-toolbar');
-                if ($('#is_only_plain_text').prop('checked')) {
-                  tinemceToolbar.hide();
-                } else {
-                  tinemceToolbar.show();
-                }
-              });
-            }
+            $(self).trigger('emailComposeViewGetFromFields');
 
-            if (typeof json.errors !== "undefined") {
-              var message = '';
-              $.each(json.errors, function (i, v) {
-                message = message + v.title;
-              });
-              var mb = messageBox();
-              mb.setBody('message');
-              mb.show();
-
-              mb.on('ok', function () {
-                "use strict";
-                mb.remove();
-              });
-
-              mb.on('cancel', function () {
-                "use strict";
-                mb.remove();
-              });
-            }
-          }).error(function (response) {
-            console.error(response);
-          });
+          }
+
+          if ($(self).find('#is_only_plain_text').length === 1) {
+            $(self).find('#is_only_plain_text').click(function() {
+              var tinemceToolbar = $(tinymce.EditorManager.activeEditor.getContainer()).find('.mce-toolbar');
+              if ($('#is_only_plain_text').prop('checked')) {
+                tinemceToolbar.hide();
+              } else {
+                tinemceToolbar.show();
+              }
+            });
+          }
+
+          if (typeof json.errors !== "undefined") {
+            var message = '';
+            $.each(json.errors, function (i, v) {
+              message = message + v.title;
+            });
+            var mb = messageBox();
+            mb.setBody('message');
+            mb.show();
+
+            mb.on('ok', function () {
+              "use strict";
+              mb.remove();
+            });
+
+            mb.on('cancel', function () {
+              "use strict";
+              mb.remove();
+            });
+          }
+        }).error(function (response) {
+          console.error(response);
+        });
       }
 
       /**
@@ -1200,7 +1200,7 @@
           }
         }, 300);
 
-        tinymce.init(opts.tinyMceOptions)
+        tinymce.init(opts.tinyMceOptions);
 
       }
 
@@ -1298,7 +1298,6 @@
 
   $.fn.EmailsComposeView.defaults = {
     "tinyMceOptions": {
-      mode: "specific_textareas",
       plugins: "fullscreen",
       menubar: false,
       toolbar: ['fontselect | fontsizeselect | bold italic underline | styleselect'],

diff --git a/modules/Emails/views/view.compose.php b/modules/Emails/views/view.compose.php
@@ -88,6 +88,7 @@ public function preDisplay()
         $this->ev->ss->assign('RETURN_MODULE', isset($_GET['return_module']) ? $_GET['return_module'] : '');
         $this->ev->ss->assign('RETURN_ACTION', isset($_GET['return_action']) ? $_GET['return_action'] : '');
         $this->ev->ss->assign('RETURN_ID', isset($_GET['return_id']) ? $_GET['return_id'] : '');
+        $this->ev->ss->assign('IS_MODAL', isset($_GET['in_popup']) ? $_GET['in_popup'] : false);
         $this->ev->setup(
             $this->module,
             $this->bean,