Changeset 340546c in github

Timestamp:

May 31, 2011 3:38:56 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:

09c59ab

Parents:

644e3ad9

Message:

• Optimization for spellcheck_before_send: don't invoke new ajax request. While we already have mispellings, we can return them and enable spellchecker directly without querying the server again

Location:

program

Files:

• js/app.js (modified) (1 diff)
• js/googiespell.js (modified) (4 diffs)
• steps/mail/sendmail.inc (modified) (2 diffs)

program/js/app.js

@@ -3018 +3018 @@
     }
   };
+
+  // resume spellchecking, highlight provided mispellings without new ajax request
+  this.spellcheck_resume = function(ishtml, data)
+  {
+    if (ishtml) {
+      var ed = tinyMCE.get(this.env.composebody);
+        sp = ed.plugins.spellchecker;
+
+      sp.active = 1;
+      sp._markWords(data);
+      ed.nodeChanged();
+    }
+    else {
+      var sp = this.env.spellcheck;
+      sp.prepare(false, true);
+      sp.processData(data);
+    }
+  }
 
   this.set_draft_id = function(id)

program/js/googiespell.js

@@ -204 +204 @@
 
 this.spellCheck = function(ignore) {
-    this.cnt_errors_fixed = 0;
-    this.cnt_errors = 0;
-    this.setStateChanged('checking_spell');
-
-    if (this.main_controller)
-        this.appendIndicator(this.spell_span);
-
-    this.error_links = [];
-    this.ta_scroll_top = this.text_area.scrollTop;
-    this.ignore = ignore;
-    this.hideLangWindow();
-
-    if ($(this.text_area).val() == '' || ignore) {
-        if (!this.custom_no_spelling_error)
-            this.flashNoSpellingErrorState();
-        else
-            this.custom_no_spelling_error(this);
-        this.removeIndicator();
-        return;
-    }
-
-    this.createEditLayer(this.text_area.offsetWidth, this.text_area.offsetHeight);
-    this.createErrorWindow();
-    $('body').append(this.error_window);
-
-    try { netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead"); }
-    catch (e) { }
-
-    if (this.main_controller)
-        $(this.spell_span).unbind('click');
-
-    this.orginal_text = $(this.text_area).val();
-    var req_text = this.escapeSpecial(this.orginal_text);
-    var ref = this;
+    this.prepare(ignore);
+
+    var req_text = this.escapeSpecial(this.orginal_text),
+        ref = this;
 
     $.ajax({ type: 'POST', url: this.getUrl(),
@@ -253 +223 @@
             },
         success: function(data) {
-                var r_text = data;
-            ref.results = ref.parseResult(r_text);
-            if (r_text.match(/<c.*>/) != null) {
-                    // Before parsing be sure that errors were found
-                    ref.showErrorsInIframe();
-                    ref.resumeEditingState();
-            } else {
+            ref.processData(data);
+            if (!ref.results.length) {
                     if (!ref.custom_no_spelling_error)
                         ref.flashNoSpellingErrorState();
@@ -274 +239 @@
 // Spell checking functions
 /////
+this.prepare = function(ignore, no_indicator)
+{
+    this.cnt_errors_fixed = 0;
+    this.cnt_errors = 0;
+    this.setStateChanged('checking_spell');
+
+    if (!no_indicator && this.main_controller)
+        this.appendIndicator(this.spell_span);
+
+    this.error_links = [];
+    this.ta_scroll_top = this.text_area.scrollTop;
+    this.ignore = ignore;
+    this.hideLangWindow();
+
+    if ($(this.text_area).val() == '' || ignore) {
+        if (!this.custom_no_spelling_error)
+            this.flashNoSpellingErrorState();
+        else
+            this.custom_no_spelling_error(this);
+        this.removeIndicator();
+        return;
+    }
+
+    this.createEditLayer(this.text_area.offsetWidth, this.text_area.offsetHeight);
+    this.createErrorWindow();
+    $('body').append(this.error_window);
+
+    try { netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead"); }
+    catch (e) { }
+
+    if (this.main_controller)
+        $(this.spell_span).unbind('click');
+
+    this.orginal_text = $(this.text_area).val();
+};
+
 this.parseResult = function(r_text) {
     // Returns an array: result[item] -> ['attrs'], ['suggestions']
@@ -312 +313 @@
 };
 
+this.processData = function(data)
+{
+    this.results = this.parseResult(data);
+    if (this.results.length) {
+            this.showErrorsInIframe();
+            this.resumeEditingState();
+    }
+};
 
 //////

program/steps/mail/sendmail.inc

@@ -412 +412 @@
   // Check spelling before send
   if ($CONFIG['spellcheck_before_send'] && $CONFIG['enable_spellcheck']
-    && empty($_SESSION['compose']['spell_checked'])
+    && empty($_SESSION['compose']['spell_checked']) && !empty($message_body)
   ) {
     $spellchecker = new rcube_spellchecker(get_input_value('_lang', RCUBE_INPUT_GPC));
@@ -420 +420 @@
 
     if (!$spell_result) {
+      $result = $isHtml ? $spellchecker->get_words() : $spellchecker->get_xml();
       $OUTPUT->show_message('mispellingsfound', 'error');
-      $OUTPUT->command('command', 'spellcheck');
+      $OUTPUT->command('spellcheck_resume', $isHtml, $result);
       $OUTPUT->send('iframe');
     }