Changeset d1d9fd8 in github

Timestamp:

Apr 8, 2011 3:44:19 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ff10f5e

Parents:

d483cd7

Message:

• Prevent javascript error if TinyMCE is not initialized (#1487862)

File:

• program/js/app.js (modified) (4 diffs)

program/js/app.js

@@ -3022 +3022 @@
   {
     // check input fields
-    var value_to = $("[name='_to']").val();
-    var value_cc = $("[name='_cc']").val();
-    var value_bcc = $("[name='_bcc']").val();
-    var value_subject = $("[name='_subject']").val();
-    var str = '';
+    var ed, str = '',
+      value_to = $("[name='_to']").val(),
+      value_cc = $("[name='_cc']").val(),
+      value_bcc = $("[name='_bcc']").val(),
+      value_subject = $("[name='_subject']").val();
 
     if (value_to)
@@ -3037 +3037 @@
       str += value_subject+':';
 
-    var editor = tinyMCE.get(this.env.composebody);
-    if (editor)
-      str += editor.getContent();
+    if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)))
+      str += ed.getContent();
     else
       str += $("[name='_message']").val();
@@ -3985 +3984 @@
       this.env.contactfolders[newkey].id = prop.newid;
       this.env.group = prop.newid;
-      
+
       var newprop = $.extend({}, prop);
       newprop.id = prop.newid;
       newprop.type = 'group';
-      
+
       link = $('<a>').attr('href', '#')
         .attr('rel', prop.source+':'+prop.newid)
@@ -4009 +4008 @@
     if (!elem)
       elem = $('.ff_' + col);
-    
+
     elem.focus(function(){ ref.focus_textfield(this); })
       .blur(function(){ ref.blur_textfield(this); })