From 2c200021fdf9b5d1c73e39e7c46e7db1e4152e91 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 15 Nov 2010 04:26:24 -0500
Subject: [PATCH] - Fix focused elements aren't unfocused when clicking on the list (#1487123)
---
program/js/app.js | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 069c59f..7c38b14 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -37,7 +37,7 @@
// webmail client settings
this.dblclick_time = 500;
- this.message_time = 3000;
+ this.message_time = 1500;
this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
@@ -1802,30 +1802,28 @@
if (!id)
return;
- var add_url = '',
- target = window,
- action = preview ? 'preview': 'show';
+ var target = window,
+ action = preview ? 'preview': 'show',
+ url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox);
if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
target = window.frames[this.env.contentframe];
- add_url = '&_framed=1';
+ url += '&_framed=1';
}
if (safe)
- add_url = '&_safe=1';
+ url += '&_safe=1';
// also send search request to get the right messages
if (this.env.search_request)
- add_url += '&_search='+this.env.search_request;
+ url += '&_search='+this.env.search_request;
- var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
this.show_contentframe(true);
else {
- if (!this.env.frame_lock)
- this.env.frame_lock = this.set_busy(true, 'loading');
- if (preview)
- url += '&_unlock='+this.env.frame_lock;
+ if (!this.env.frame_lock) {
+ (parent.rcmail ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
+ }
target.location.href = this.env.comm_path+url;
// mark as read and change mbox unread counter
@@ -3481,7 +3479,7 @@
min = this.env.autocomplete_min_length;
// trim query string
- q = q.replace(/(^\s+|\s+$)/g, '');
+ q = $.trim(q);
// Don't (re-)search if the last results are still active
if (q == this.ksearch_value)
@@ -4058,7 +4056,8 @@
this.focus_subscription = function(id)
{
var row, folder,
- reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ delim = RegExp.escape(this.env.delimiter),
+ reg = RegExp('['+delim+']?[^'+delim+']+$');
if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
if (this.env.subscriptionrows[id] &&
@@ -4071,7 +4070,7 @@
$(row).addClass('droptarget');
}
}
- else if (this.env.folder.match(new RegExp(RegExp.escape(this.env.delimiter)))) {
+ else if (this.env.folder.match(new RegExp(delim))) {
this.set_env('dstfolder', this.env.delimiter);
$(this.subscription_list.frame).addClass('droptarget');
}
@@ -4104,10 +4103,12 @@
this.subscription_move_folder = function(list)
{
- var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ var delim = RegExp.escape(this.env.delimiter),
+ reg = RegExp('['+delim+']?[^'+delim+']+$');
+
if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
(this.env.dstfolder != this.env.folder.replace(reg, ''))) {
- var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
+ var reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
var basename = this.env.folder.replace(reg, '');
var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
@@ -4157,12 +4158,14 @@
}
if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id))) {
- var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
+ var delim = RegExp.escape(this.env.delimiter),
+ reg = new RegExp('.*['+delim+']');
+
this.name_input = document.createElement('input');
this.name_input.type = 'text';
this.name_input.value = this.env.subscriptionrows[id][0].replace(reg, '');
- reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+ reg = new RegExp('['+delim+']?[^'+delim+']+$');
this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
this.name_input.onkeydown = function(e){ rcmail.name_input_keydown(e); };
@@ -4632,8 +4635,9 @@
return id;
}
else {
- obj.appendTo(cont).bind('mousedown', function(){ return ref.hide_message(obj); });
- window.setTimeout(function(){ ref.hide_message(obj, true); }, this.message_time);
+ obj.appendTo(cont).bind('mousedown', function() { return ref.hide_message(obj); });
+ window.setTimeout(function() { ref.hide_message(obj, true); },
+ this.message_time * (type == 'error' ? 2 : 1));
return obj;
}
};
--
Gitblit v1.9.1