From 4315b0086b14cd5266b4cb824c3bd95aa550240c Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Mon, 10 Dec 2007 23:20:01 -0500
Subject: [PATCH] added ability to insert attached images in HTML editor
---
program/js/app.js | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index c758846..5c2aecd 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -223,6 +223,16 @@
this.gui_objects.folderlist = this.gui_objects.mailboxlist;
this.http_request('getunread', '');
}
+
+ // ask user to send MDN
+ if (this.env.mdn_request && this.env.uid)
+ {
+ var mdnurl = '_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox);
+ if (confirm(this.get_label('mdnrequest')))
+ this.http_post('sendmdn', mdnurl);
+ else
+ this.http_post('mark', mdnurl+'&_flag=mdnsent');
+ }
break;
@@ -820,7 +830,7 @@
if (!this.check_compose_input())
break;
-
+
// Reset the auto-save timer
self.clearTimeout(this.save_timer);
@@ -1143,6 +1153,8 @@
this.command('show');
else if (list.key_pressed == list.DELETE_KEY)
this.command('delete');
+ else
+ list.shiftkey = false;
};
@@ -1672,7 +1684,7 @@
var input_message = rcube_find_object('_message');
// check for empty recipient
- if (input_to && !rcube_check_email(input_to.value, true))
+ if (input_to && !rcube_check_email(input_to.value.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true))
{
alert(this.get_label('norecipientwarning'));
input_to.focus();
@@ -1872,7 +1884,6 @@
// upload attachment file
this.upload_file = function(form)
{
-
if (!form)
return false;
@@ -2416,9 +2427,9 @@
{
var anchors = row.obj.getElementsByTagName('A');
if (anchors[0])
- anchors[0].onclick = function() { p.rename_folder(row.id); };
+ anchors[0].onclick = function() { p.rename_folder(row.id); return false; };
if (anchors[1])
- anchors[1].onclick = function() { p.delete_folder(row.id); };
+ anchors[1].onclick = function() { p.delete_folder(row.id); return false; };
row.obj.onmouseover = function() { p.focus_subscription(row.id); };
row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
}
@@ -2562,7 +2573,6 @@
this.rename_folder = function(id)
{
var temp, row, form;
- var folder = this.env.subscriptionrows[id][0];
// reset current renaming
if (temp = this.edit_folder)
@@ -2572,14 +2582,15 @@
return;
}
- if (id && (row = document.getElementById(id)))
+ if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id)))
{
var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
this.name_input = document.createElement('INPUT');
- this.name_input.value = folder.replace(reg, '');
+ this.name_input.value = this.env.subscriptionrows[id][1].replace(reg, '');
this.name_input.style.width = '100%';
+
reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
- this.name_input.setAttribute('parent', folder.replace(reg, ''));
+ this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
@@ -2617,9 +2628,9 @@
var newname = this.name_input ? this.name_input.value : null;
if (this.edit_folder && newname)
{
- if (this.name_input.getAttribute('parent') && this.name_input.getAttribute('parent')!='')
- newname = this.name_input.getAttribute('parent')+this.env.delimiter+newname;
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
+ if (this.name_input.__parent)
+ newname = this.name_input.__parent + this.env.delimiter + newname;
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
}
}
// escape
@@ -3483,7 +3494,7 @@
}
this.set_busy(true, 'checkingmail');
- this.http_request('check-recent', '_t='+(new Date().getTime()), true);
+ this.http_request('check-recent', (this.env.search_request ? '_search='+this.env.search_request+'&' : '') + '_t='+(new Date().getTime()), true);
};
--
Gitblit v1.9.1