From ab0b51a1fef87bcc643c3aaf2e635c811b28ccd8 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Tue, 15 Feb 2011 06:10:59 -0500 Subject: [PATCH] - Use only one from IMAP authentication methods to prevent login delays (1487784) --- program/js/googiespell.js | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/program/js/googiespell.js b/program/js/googiespell.js index 27658a4..22716c4 100644 --- a/program/js/googiespell.js +++ b/program/js/googiespell.js @@ -52,7 +52,7 @@ this.show_spell_img = false; // roundcube mod. this.decoration = true; - this.use_close_btn = true; + this.use_close_btn = false; this.edit_layer_dbl_click = true; this.report_ta_not_found = true; @@ -82,15 +82,16 @@ // Set document's onclick to hide the language and error menu $(document).bind('click', function(e) { - if($(e.target).attr('googie_action_btn') != '1' && ref.isLangWindowShown()) + var target = $(e.target); + if(target.attr('googie_action_btn') != '1' && ref.isLangWindowShown()) ref.hideLangWindow(); - if($(e.target).attr('googie_action_btn') != '1' && ref.isErrorWindowShown()) + if(target.attr('googie_action_btn') != '1' && ref.isErrorWindowShown()) ref.hideErrorWindow(); }); this.decorateTextarea = function(id) { - this.text_area = typeof(id) == 'string' ? document.getElementById(id) : id; + this.text_area = typeof id === 'string' ? document.getElementById(id) : id; if (this.text_area) { if (!this.spell_container && this.decoration) { @@ -119,7 +120,7 @@ // API Functions (the ones that you can call) ///// this.setSpellContainer = function(id) { - this.spell_container = typeof(id) == 'string' ? document.getElementById(id) : id; + this.spell_container = typeof id === 'string' ? document.getElementById(id) : id; }; this.setLanguages = function(lang_dict) { @@ -316,7 +317,7 @@ ///// this.createErrorWindow = function() { this.error_window = document.createElement('div'); - $(this.error_window).addClass('googie_window').attr('googie_action_btn', '1'); + $(this.error_window).addClass('googie_window popupmenu').attr('googie_action_btn', '1'); }; this.isErrorWindowShown = function() { @@ -324,8 +325,8 @@ }; this.hideErrorWindow = function() { - $(this.error_window).css('visibility', 'hidden'); - $(this.error_window_iframe).css('visibility', 'hidden'); + $(this.error_window).hide(); + $(this.error_window_iframe).hide(); }; this.updateOrginalText = function(offset, old_value, new_value, id) { @@ -544,7 +545,7 @@ top = pos.top + height + 20 < pageheight ? pos.top + 20 : pos.top - height, left = pos.left + width < pagewidth ? pos.left : pos.left - width; - $(this.error_window).css({'visibility': 'visible', 'top': top+'px', 'left': left+'px'}); + $(this.error_window).css({'top': top+'px', 'left': left+'px'}).show(); // Dummy for IE - dropdown bug fix if ($.browser.msie) { @@ -554,9 +555,10 @@ this.error_window_iframe = iframe; } - $(this.error_window_iframe).css({'visibility': 'visible', - 'top': this.error_window.offsetTop, 'left': this.error_window.offsetLeft, - 'width': this.error_window.offsetWidth, 'height': this.error_window.offsetHeight}); + $(this.error_window_iframe) + .css({'top': this.error_window.offsetTop, 'left': this.error_window.offsetLeft, + 'width': this.error_window.offsetWidth, 'height': this.error_window.offsetHeight}) + .show(); } }; @@ -567,7 +569,7 @@ this.createEditLayer = function(width, height) { this.edit_layer = document.createElement('div'); $(this.edit_layer).addClass('googie_edit_layer').attr('id', 'googie_edit_layer') - .width(width).height(height); + .width('auto').height(height); if (this.text_area.nodeName.toLowerCase() != 'input' || $(this.text_area).val() == '') { $(this.edit_layer).css('overflow', 'auto').height(height-4); @@ -576,8 +578,9 @@ } var ref = this; + if (this.edit_layer_dbl_click) { - $(this.edit_layer).bind('click', function(e) { + $(this.edit_layer).dblclick(function(e) { if (e.target.className != 'googie_link' && !ref.isErrorWindowShown()) { ref.resumeEditing(); var fn1 = function() { @@ -707,7 +710,7 @@ ////// this.createLangWindow = function() { this.language_window = document.createElement('div'); - $(this.language_window).addClass('googie_window') + $(this.language_window).addClass('googie_window popupmenu') .width(100).attr('googie_action_btn', '1'); // Build up the result list @@ -765,11 +768,11 @@ }; this.isLangWindowShown = function() { - return $(this.language_window).is(':hidden'); + return $(this.language_window).is(':visible'); }; this.hideLangWindow = function() { - $(this.language_window).css('visibility', 'hidden'); + $(this.language_window).hide(); $(this.switch_lan_pic).removeClass().addClass('googie_lang_3d_on'); }; @@ -789,7 +792,7 @@ pos.left - 100 + width : pos.left + width, top = pos.top + h < pageheight ? pos.top + height : pos.top - h - 4; - $(this.language_window).css({'visibility': 'visible', 'top' : top+'px','left' : left+'px'}); + $(this.language_window).css({'top' : top+'px','left' : left+'px'}).show(); this.highlightCurSel(); }; @@ -928,7 +931,7 @@ // Misc. functions ///// this.isDefined = function(o) { - return (o != 'undefined' && o != null) + return (o !== undefined && o !== null) }; this.errorFixed = function() { @@ -974,13 +977,13 @@ //$(this.indicator).remove(); // roundcube mod. if (window.rcmail) - rcmail.set_busy(false); + rcmail.set_busy(false, null, this.rc_msg_id); }; this.appendIndicator = function(elm) { // modified by roundcube if (window.rcmail) - rcmail.set_busy(true, 'checking'); + this.rc_msg_id = rcmail.set_busy(true, 'checking'); /* this.indicator = document.createElement('img'); $(this.indicator).attr('src', this.img_dir + 'indicator.gif') -- Gitblit v1.9.1