Aleksander Machniak
2014-05-28 f56e70bd049bde916c368f3f79df702a73ad63db
TinyMCE4: Fix spellchecker resume
2 files modified
16 ■■■■■ changed files
program/js/app.js 8 ●●●●● patch | view | raw | blame | history
program/steps/mail/sendmail.inc 8 ●●●● patch | view | raw | blame | history
program/js/app.js
@@ -3592,11 +3592,9 @@
  {
    if (ishtml) {
      var ed = tinymce.get(this.env.composebody);
        sp = ed.plugins.spellchecker;
      sp.active = 1;
      sp._markWords(data);
      ed.nodeChanged();
      ed.settings.spellchecker_callback = function(name, text, done, error) { done(data); };
      ed.execCommand('mceSpellCheck');
      ed.settings.spellchecker_callback = null;
    }
    else {
      var sp = this.env.spellcheck;
program/steps/mail/sendmail.inc
@@ -301,7 +301,13 @@
        $COMPOSE['spell_checked'] = true;
        if (!$spell_result) {
            $result = $isHtml ? $spellchecker->get_words() : $spellchecker->get_xml();
            if ($isHtml) {
                $result['words']      = $spellchecker->get();
                $result['dictionary'] = (bool) $RCMAIL->config->get('spellcheck_dictionary');
            }
            else {
                $result = $spellchecker->get_xml();
            }
            $OUTPUT->show_message('mispellingsfound', 'error');
            $OUTPUT->command('spellcheck_resume', $isHtml, $result);