Index: /trunk/roundcubemail/CHANGELOG =================================================================== --- /trunk/roundcubemail/CHANGELOG (revision 5993) +++ /trunk/roundcubemail/CHANGELOG (revision 5994) @@ -2,4 +2,5 @@ =========================== +- Unified (single) spellchecker button - Fix encoding of attachment with comma in name (#1488389) - Scroll long lists on drag&drop (#1485946) Index: /trunk/roundcubemail/program/js/app.js =================================================================== --- /trunk/roundcubemail/program/js/app.js (revision 5993) +++ /trunk/roundcubemail/program/js/app.js (revision 5994) @@ -262,9 +262,7 @@ if (this.env.spellcheck) { - this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); }; + this.env.spellcheck.spelling_state_observer = function(s) { ref.spellcheck_state(); }; this.env.compose_commands.push('spellcheck') - this.set_spellcheck_state('ready'); - if ($("input[name='_is_html']").val() == '1') - this.display_spellcheck_controls(false); + this.enable_command('spellcheck', true); } @@ -899,11 +897,16 @@ case 'spellcheck': - if (window.tinyMCE && tinyMCE.get(this.env.composebody)) { - tinyMCE.execCommand('mceSpellCheck', true); - } - else if (this.env.spellcheck && this.env.spellcheck.spellCheck && this.spellcheck_ready) { - this.env.spellcheck.spellCheck(); - this.set_spellcheck_state('checking'); - } + if (this.spellcheck_state()) { + this.stop_spellchecking(); + } + else { + if (window.tinyMCE && tinyMCE.get(this.env.composebody)) { + tinyMCE.execCommand('mceSpellCheck', true); + } + else if (this.env.spellcheck && this.env.spellcheck.spellCheck) { + this.env.spellcheck.spellCheck(); + } + } + this.spellcheck_state(); break; @@ -3117,6 +3120,7 @@ this.toggle_editor = function(props) { + this.stop_spellchecking(); + if (props.mode == 'html') { - this.display_spellcheck_controls(false); this.plain2html($('#'+props.id).val(), props.id); tinyMCE.execCommand('mceAddControl', false, props.id); @@ -3129,6 +3133,4 @@ else { var thisMCE = tinyMCE.get(props.id), existingHtml; - if (thisMCE.plugins.spellchecker && thisMCE.plugins.spellchecker.active) - thisMCE.execCommand('mceSpellCheck', false); if (existingHtml = thisMCE.getContent()) { @@ -3139,5 +3141,4 @@ } tinyMCE.execCommand('mceRemoveControl', false, props.id); - this.display_spellcheck_controls(true); } @@ -3148,29 +3149,29 @@ { var ed; + if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody))) { if (ed.plugins.spellchecker && ed.plugins.spellchecker.active) ed.execCommand('mceSpellCheck'); } - else if ((ed = this.env.spellcheck) && !this.spellcheck_ready) { - $(ed.spell_span).trigger('click'); - this.set_spellcheck_state('ready'); - } - }; - - this.display_spellcheck_controls = function(vis) - { - if (this.env.spellcheck) { - // stop spellchecking process - if (!vis) - this.stop_spellchecking(); - - $(this.env.spellcheck.spell_container)[vis ? 'show' : 'hide'](); - } - }; - - this.set_spellcheck_state = function(s) - { - this.spellcheck_ready = (s == 'ready' || s == 'no_error_found'); - this.enable_command('spellcheck', this.spellcheck_ready); + else if (ed = this.env.spellcheck) { + if (ed.state && ed.state != 'ready' && ed.state != 'no_error_found') + $(ed.spell_span).trigger('click'); + } + + this.spellcheck_state(); + }; + + this.spellcheck_state = function() + { + var ed, active; + + if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins.spellchecker) + active = ed.plugins.spellchecker.active; + else if ((ed = this.env.spellcheck) && ed.state) + active = ed.state != 'ready' && ed.state != 'no_error_found'; + + $('#'+rcmail.buttons.spellcheck[0].id)[active ? 'addClass' : 'removeClass']('selected'); + + return active; }; @@ -3179,10 +3180,19 @@ { var ed; - if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins.spellchecker) { + + if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins.spellchecker) return ed.plugins.spellchecker.selectedLang; - } - else if (this.env.spellcheck) { + else if (this.env.spellcheck) return GOOGIE_CUR_LANG; - } + }; + + this.spellcheck_lang_set = function(lang) + { + var editor; + + if (window.tinyMCE && (editor = tinyMCE.get(this.env.composebody))) + editor.plugins.spellchecker.selectedLang = lang; + else if (this.env.spellcheck) + this.env.spellcheck.setCurrentLanguage(lang); }; @@ -3203,4 +3213,6 @@ sp.processData(data); } + + this.spellcheck_state(); } Index: /trunk/roundcubemail/program/js/editor.js =================================================================== --- /trunk/roundcubemail/program/js/editor.js (revision 5993) +++ /trunk/roundcubemail/program/js/editor.js (revision 5994) @@ -45,9 +45,9 @@ theme_advanced_buttons2: ',fontselect,fontsizeselect' }); - else // mail compose + else { // mail compose $.extend(conf, { plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (config.spellcheck ? ',spellchecker' : ''), theme_advanced_buttons1: 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect', - theme_advanced_buttons2: 'link,unlink,table,|,emotions,charmap,image,media,|,code,search' + (config.spellcheck ? ',spellchecker' : '') + ',undo,redo', + theme_advanced_buttons2: 'link,unlink,table,|,emotions,charmap,image,media,|,code,search,undo,redo', spellchecker_languages: (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'), spellchecker_rpc_url: '?_task=utils&_action=spell_html', @@ -56,4 +56,13 @@ oninit: 'rcmail_editor_callback' }); + + // add handler for spellcheck button state update + conf.setup = function(ed) { + ed.onSetProgressState.add(function(ed, active) { + if (!active) + rcmail.spellcheck_state(); + }); + } + } // support external configuration settings e.g. from skin Index: /trunk/roundcubemail/program/steps/mail/compose.inc =================================================================== --- /trunk/roundcubemail/program/steps/mail/compose.inc (revision 5993) +++ /trunk/roundcubemail/program/steps/mail/compose.inc (revision 5994) @@ -814,4 +814,7 @@ $lang = 'en'; + $OUTPUT->set_env('spell_langs', $spellcheck_langs); + $OUTPUT->set_env('spell_lang', $lang); + $editor_lang_set = array(); foreach ($spellcheck_langs as $key => $name) { @@ -831,5 +834,5 @@ "googie.setLanguages(%s);\n". "googie.setCurrentLanguage('%s');\n". - "googie.setSpellContainer('spellcheck-control');\n". + "googie.setDecoration(false);\n". "googie.decorateTextarea('%s');\n". "%s.set_env('spellcheck', googie);", Index: /trunk/roundcubemail/skins/default/common.css =================================================================== --- /trunk/roundcubemail/skins/default/common.css (revision 5993) +++ /trunk/roundcubemail/skins/default/common.css (revision 5994) @@ -496,4 +496,5 @@ text-decoration: none; min-height: 14px; + background: transparent; } @@ -505,5 +506,6 @@ } -.popupmenu li a.active:hover +.popupmenu li a.active:hover, +.popupmenu.selectable li a.selected:hover { color: #fff; @@ -514,4 +516,14 @@ { float: left; +} + +.popupmenu.selectable li a.selected +{ + background: url(images/messageicons.png) 2px -372px no-repeat; +} + +.popupmenu.selectable li a +{ + padding-left: 20px; } Index: /trunk/roundcubemail/skins/default/functions.js =================================================================== --- /trunk/roundcubemail/skins/default/functions.js (revision 5993) +++ /trunk/roundcubemail/skins/default/functions.js (revision 5994) @@ -103,4 +103,5 @@ mailboxmenu: {id:'mailboxoptionsmenu', above:1}, composemenu: {id:'composeoptionsmenu', editable:1, overlap:1}, + spellmenu: {id:'spellmenu'}, // toggle: #1486823, #1486930 uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux }, @@ -352,4 +353,41 @@ }, +spellmenu: function(show) +{ + var link, li, + lang = rcmail.spellcheck_lang(), + menu = this.popups.spellmenu.obj, + ul = $('ul', menu); + + if (!ul.length) { + ul = $('