summaryrefslogtreecommitdiff
path: root/program/js/app.js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-05-27 20:08:36 +0200
committerAleksander Machniak <alec@alec.pl>2014-05-27 20:08:36 +0200
commitb21f8bd3ef368563f2debf4e0debfb319ce763ea (patch)
treec4f6723f3c7dc321d9b3c75c3bb939b918601176 /program/js/app.js
parentf41912e4cb4281358de8c22c72d47b05d2b8ec8f (diff)
Implemented image selector dialog for TinyMCE, css fixes in classic skin for TinyMCE4
Diffstat (limited to 'program/js/app.js')
-rw-r--r--program/js/app.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 43dba1402..b0b2cb15c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -539,12 +539,12 @@ function rcube_webmail()
// execute all foreign onload scripts
// @deprecated
- for (var i in this.onloads) {
- if (typeof this.onloads[i] === 'string')
- eval(this.onloads[i]);
- else if (typeof this.onloads[i] === 'function')
- this.onloads[i]();
- }
+ for (n in this.onloads) {
+ if (typeof this.onloads[n] === 'string')
+ eval(this.onloads[n]);
+ else if (typeof this.onloads[n] === 'function')
+ this.onloads[n]();
+ }
// start keep-alive and refresh intervals
this.start_refresh();
@@ -4010,6 +4010,9 @@ function rcube_webmail()
// called from upload page
this.add2attachment_list = function(name, att, upload_id)
{
+ if (upload_id)
+ this.triggerEvent('fileuploaded', {name: name, attachment: att, id: upload_id});
+
if (!this.gui_objects.attachmentlist)
return false;