extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clear intervals assigned to window after submit compose dialog

Browse Source
This commit is contained in:
Hadi Nategh 2014-12-16 10:26:44 +00:00
parent bf89266ddc
commit f529a4fae6
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_compose.inc.php
View File

@ -376,7 +376,9 @@ class mail_compose
} }
if ($sendOK == false) if ($sendOK == false)
{ {
$response = egw_json_response::get();
egw_framework::message(lang('Message send failed: %1',$message),'error');// maybe error is more appropriate egw_framework::message(lang('Message send failed: %1',$message),'error');// maybe error is more appropriate
$response->call('app.mail.clearIntevals');
} }
} }

24
mail/js/app.js
View File

@ -38,7 +38,7 @@ app.classes.mail = AppJS.extend(
nm_index: 'nm', // nm name of index nm_index: 'nm', // nm name of index
mail_fileSelectorWindow: null, mail_fileSelectorWindow: null,
mail_isMainWindow: true, mail_isMainWindow: true,
// Some state variables to track preview pre-loading // Some state variables to track preview pre-loading
preview_preload: { preview_preload: {
timeout: null, timeout: null,
@ -57,6 +57,12 @@ app.classes.mail = AppJS.extend(
* *
*/ */
aclRights:['l','r','s','w','i','p','c','d','a'], aclRights:['l','r','s','w','i','p','c','d','a'],
/**
* In order to store Intervals assigned to window
* @array of setted intervals
*/
W_INTERVALS:[],
/** /**
* Initialize javascript for this application * Initialize javascript for this application
@ -184,9 +190,9 @@ app.classes.mail = AppJS.extend(
this.subject2title(); this.subject2title();
// Set autosaving interval to 2 minutes for compose message // Set autosaving interval to 2 minutes for compose message
window.setInterval(function (){ this.W_INTERVALS.push(window.setInterval(function (){
that.saveAsDraft(null,that.et2.getWidgetById('button[saveAsDraft]'),'autosaving'); that.saveAsDraft(null,that.et2.getWidgetById('button[saveAsDraft]'),'autosaving');
}, 120000); }, 120000));
/* Control focus actions on subject to handle expanders properly.*/ /* Control focus actions on subject to handle expanders properly.*/
jQuery("#mail-compose_subject").on({ jQuery("#mail-compose_subject").on({
@ -4176,5 +4182,17 @@ app.classes.mail = AppJS.extend(
{ {
document.title = _widget.get_value(); document.title = _widget.get_value();
} }
},
/**
* Clear intervals stored in W_INTERVALS which assigned to window
*/
clearIntevals: function ()
{
for(var i=0;i<this.W_INTERVALS.length;i++)
{
clearInterval(this.W_INTERVALS[i]);
delete this.W_INTERVALS[i];
}
} }
}); });