From 701b9a7c6b22a912ce7312b684b130e2066b0ddd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 15 Oct 2008 13:27:52 -0400
Subject: [PATCH] - Add feedback and set busy when moving folder (#1485497)
---
CHANGELOG | 4 ++++
program/localization/en_US/messages.inc | 1 +
program/localization/pl_PL/messages.inc | 1 +
program/steps/settings/manage_folders.inc | 2 +-
program/js/app.js | 4 +++-
program/localization/en_GB/messages.inc | 1 +
6 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2524a82..8de421b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/10/15 (alec)
+----------
+- Add feedback and set busy when moving folder (#1485497)
+
2008/10/10 (alec)
----------
- Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489)
diff --git a/program/js/app.js b/program/js/app.js
index 53a869f..bea1dc4 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2827,7 +2827,9 @@
var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
var basename = this.env.folder.replace(reg, '');
var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname));
+
+ this.set_busy(true, 'foldermoving');
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), true);
}
this.drag_active = false;
this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 5181548..70b8f46 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -52,6 +52,7 @@
$messages['foldercreating'] = 'Creating folder...';
$messages['folderdeleting'] = 'Deleting folder...';
$messages['folderrenaming'] = 'Renaming folder...';
+$messages['foldermoving'] = 'Moving folder...';
$messages['formincomplete'] = 'The form was not completely filled out';
$messages['noemailwarning'] = 'Please enter a valid email address';
$messages['nonamewarning'] = 'Please enter a name';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index 8a64943..568decc 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -52,6 +52,7 @@
$messages['foldercreating'] = 'Creating folder...';
$messages['folderdeleting'] = 'Deleting folder...';
$messages['folderrenaming'] = 'Renaming folder...';
+$messages['foldermoving'] = 'Moving folder...';
$messages['formincomplete'] = 'The form was not completely filled out';
$messages['noemailwarning'] = 'Please enter a valid email address';
$messages['nonamewarning'] = 'Please enter a name';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index be07e22..7918b8a 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -57,6 +57,7 @@
$messages['foldercreating'] = 'Dodawanie folderu...';
$messages['folderdeleting'] = 'Usuwanie folderu...';
$messages['folderrenaming'] = 'Zmiana nazwy folderu...';
+$messages['foldermoving'] = 'Przenoszenie folderu...';
$messages['formincomplete'] = 'Uzupełnij formularz!';
$messages['noemailwarning'] = 'Podaj poprawny adres e-mail!';
$messages['nonamewarning'] = 'Podaj nazwę!';
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 05a9acb..d44550e 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -346,7 +346,7 @@
));
// add some labels to client
-$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating');
+$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating','foldermoving');
$OUTPUT->send('managefolders');
?>
--
Gitblit v1.9.1