From b6cd452bd31bfd4b6b94b23fe54b424fdf901e61 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Aug 2011 14:34:56 -0400
Subject: [PATCH] Backport changes from r5084 to r5090 to release branch
---
program/js/app.js | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 66cae80..d15950d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -642,11 +642,6 @@
if (props == 'reload') {
form.action += '?_reload=1';
}
- else if ((input = $("input[name='_name']", form)) &&input.length && input.val() == '') {
- alert(this.get_label('nonamewarning'));
- input.focus();
- break;
- }
else if (this.task == 'settings' && (this.env.identities_level % 2) == 0 &&
(input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
) {
@@ -1378,12 +1373,12 @@
ul.show();
div.removeClass('collapsed').addClass('expanded');
var reg = new RegExp('&'+urlencode(id)+'&');
- this.set_env('collapsed_folders', this.env.collapsed_folders.replace(reg, ''));
+ this.env.collapsed_folders = this.env.collapsed_folders.replace(reg, '');
}
else {
ul.hide();
div.removeClass('expanded').addClass('collapsed');
- this.set_env('collapsed_folders', this.env.collapsed_folders+'&'+urlencode(id)+'&');
+ this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(id)+'&';
// select parent folder if one of its childs is currently selected
if (this.env.mailbox.indexOf(id + this.env.delimiter) == 0)
@@ -1568,10 +1563,10 @@
}
if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
- this.set_env('flagged_col', found);
+ this.env.flagged_col = found;
if ((found = $.inArray('subject', this.env.coltypes)) >= 0)
- this.set_env('subject_col', found);
+ this.env.subject_col = found;
this.command('save-pref', { name: 'list_cols', value: this.env.coltypes, session: 'list_attrib/columns' });
};
@@ -3258,11 +3253,21 @@
return false;
// get file input field, count files on capable browser
- var field = $('input[type=file]', form).get(0),
+ var i, size = 0, field = $('input[type=file]', form).get(0),
files = field.files ? field.files.length : field.value ? 1 : 0;
// create hidden iframe and post upload form
if (files) {
+ // check file size
+ if (field.files && this.env.max_filesize && this.env.filesizeerror) {
+ for (i=0; i<files; i++)
+ size += field.files[i].size;
+ if (size && size > this.env.max_filesize) {
+ this.display_message(this.env.filesizeerror, 'error');
+ return;
+ }
+ }
+
var frame_name = this.async_upload_form(form, 'upload', function(e) {
var d, content = '';
try {
@@ -3434,10 +3439,8 @@
if (this.gui_objects.qsearchbox)
this.gui_objects.qsearchbox.value = '';
- if (this.env.qsearch) {
- this.set_busy(this.env.qsearch.lock, false);
- this.env.qsearch.request.abort();
- }
+ if (this.env.qsearch)
+ this.abort_request(this.env.qsearch);
this.env.qsearch = null;
this.env.search_request = null;
@@ -3613,6 +3616,8 @@
var old_value = this.ksearch_value;
this.ksearch_value = q;
+ this.ksearch_destroy();
+
// ...string is empty
if (!q.length)
return;
@@ -3620,8 +3625,6 @@
// ...new search value contains old one and previous search result was empty
if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
return;
-
- this.ksearch_destroy();
var i, lock, source, xhr, reqid = new Date().getTime(),
threads = props && props.threads ? props.threads : 1,
@@ -3691,7 +3694,7 @@
li.innerHTML = text.replace(new RegExp('('+RegExp.escape(s_val)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
li.onmouseover = function(){ ref.ksearch_select(this); };
li.onmouseup = function(){ ref.ksearch_click(this) };
- li._rcm_id = i;
+ li._rcm_id = this.env.contacts.length + i;
ul.appendChild(li);
maxlen -= 1;
}
@@ -3760,10 +3763,8 @@
if (!ac)
return;
- for (i=0, len=ac.locks.length; i<len; i++) {
- this.hide_message(ac.locks[i]); // hide loading message
- ac.requests[i].abort(); // abort ajax request
- }
+ for (i=0, len=ac.locks.length; i<len; i++)
+ this.abort_request({request: ac.requests[i], lock: ac.locks[i]});
this.ksearch_data = null;
}
@@ -4431,7 +4432,7 @@
this.set_photo_actions = function(id)
{
var n, buttons = this.buttons['upload-photo'];
- for (n=0; n < buttons.length; n++)
+ for (n=0; buttons && n < buttons.length; n++)
$('#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));
$('#ff_photo').val(id);
@@ -4552,7 +4553,6 @@
$('#mailboxroot')
.mouseover(function(){ p.focus_subscription(this.id); })
.mouseout(function(){ p.unfocus_subscription(this.id); })
- .mouseup(function(){ if (p.drag_active) p.subscription_move_folder(); });
};
this.focus_subscription = function(id)
@@ -4563,22 +4563,16 @@
if (this.drag_active && this.env.mailbox && (row = document.getElementById(id)))
if (this.env.subscriptionrows[id] &&
- (folder = this.env.subscriptionrows[id][0])) {
+ (folder = this.env.subscriptionrows[id][0]) !== null
+ ) {
if (this.check_droptarget(folder) &&
!this.env.subscriptionrows[this.get_folder_row_id(this.env.mailbox)][2] &&
(folder != this.env.mailbox.replace(reg, '')) &&
- (!folder.match(new RegExp('^'+RegExp.escape(this.env.mailbox+this.env.delimiter))))) {
- this.set_env('dstfolder', folder);
+ (!folder.match(new RegExp('^'+RegExp.escape(this.env.mailbox+this.env.delimiter))))
+ ) {
+ this.env.dstfolder = folder;
$(row).addClass('droptarget');
}
- }
- else if (id == 'mailboxroot') {
- this.set_env('dstfolder', '');
- $(row).addClass('droptarget');
- }
- else if (this.env.mailbox.match(new RegExp(delim))) {
- this.set_env('dstfolder', this.env.delimiter);
- $(this.subscription_list.frame).addClass('droptarget');
}
};
@@ -4586,7 +4580,7 @@
{
var row = $('#'+id);
- this.set_env('dstfolder', null);
+ this.env.dstfolder = null;
if (this.env.subscriptionrows[id] && row[0])
row.removeClass('droptarget');
else
@@ -4600,7 +4594,7 @@
if (list && (id = list.get_single_selection()) &&
(folder = this.env.subscriptionrows['rcmrow'+id])
) {
- this.set_env('mailbox', folder[0]);
+ this.env.mailbox = folder[0];
this.show_folder(folder[0]);
this.enable_command('delete-folder', !folder[2]);
}
@@ -4616,12 +4610,12 @@
var delim = RegExp.escape(this.env.delimiter),
reg = RegExp('['+delim+']?[^'+delim+']+$');
- if (this.env.mailbox && this.env.dstfolder && (this.env.dstfolder != this.env.mailbox) &&
+ if (this.env.mailbox && this.env.dstfolder !== null && (this.env.dstfolder != this.env.mailbox) &&
(this.env.dstfolder != this.env.mailbox.replace(reg, ''))
) {
reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
var basename = this.env.mailbox.replace(reg, ''),
- newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
+ newname = this.env.dstfolder === '' ? basename : this.env.dstfolder+this.env.delimiter+basename;
if (newname != this.env.mailbox) {
this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.mailbox)+'&_folder_newname='+urlencode(newname), this.set_busy(true, 'foldermoving'));
@@ -5294,14 +5288,14 @@
this.env.status_col = null;
if ((n = $.inArray('subject', this.env.coltypes)) >= 0) {
- this.set_env('subject_col', n);
+ this.env.subject_col = n;
if (list)
list.subject_col = n;
}
if ((n = $.inArray('flag', this.env.coltypes)) >= 0)
- this.set_env('flagged_col', n);
+ this.env.flagged_col = n;
if ((n = $.inArray('status', this.env.coltypes)) >= 0)
- this.set_env('status_col', n);
+ this.env.status_col = n;
if (list)
list.init_header();
@@ -5664,6 +5658,15 @@
});
};
+ // aborts ajax request
+ this.abort_request = function(r)
+ {
+ if (r.request)
+ r.request.abort();
+ if (r.lock)
+ this.set_busy(false, null, r.lock);
+ };
+
// handle HTTP response
this.http_response = function(response)
{
--
Gitblit v1.9.1