holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove references to old refreshTime preference

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-14 08:35:22 +00:00
parent 21bb9ef481
commit c23a3f5524
2 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -939,9 +939,6 @@ class mail_compose
$this->t->set_var("focusElement",$_focusElement); $this->t->set_var("focusElement",$_focusElement);
// the editorobject is needed all the time (since we use CKEDITOR
$this->t->set_var('refreshTimeOut', 3*60*1000); // 3 minutes till a compose messages will be saved as draft;
*/ */
/* /*

75
mail/js/app.js
View File

@ -23,9 +23,7 @@ app.classes.mail = AppJS.extend(
*/ */
et2: null, et2: null,
doStatus: null, doStatus: null,
mail_doTimedRefresh: false,
mail_refreshTimeOut: 1000*60*3, // initial call
mail_queuedFolders: [], mail_queuedFolders: [],
mail_queuedFoldersIndex: 0, mail_queuedFoldersIndex: 0,
@ -57,17 +55,6 @@ app.classes.mail = AppJS.extend(
*/ */
init: function() { init: function() {
this._super.apply(this,arguments); this._super.apply(this,arguments);
// Set refresh from preferences
this.mail_refreshTimeOut = 1000 * (
// Nextmatch setting
egw.preference('nextmatch-mail.index.rows-autorefresh','mail') ||
// Preference setting copied from felamimail
egw.preference('refreshTime','mail') ||
0
);
//window.register_app_refresh("mail", this.app_refresh);
}, },
/** /**
@ -671,28 +658,6 @@ app.classes.mail = AppJS.extend(
IframeHandle.set_value(''); IframeHandle.set_value('');
}, },
/**
* mail_startTimerFolderStatusUpdate, timer functions, if the counter changes for the current folder
* refresh the message list
* @param timeout
*/
mail_startTimerFolderStatusUpdate: function(_refreshTimeOut) {
if (typeof _refreshTimeOut == 'undefined')
{
_refreshTimeOut = this.mail_refreshTimeOut;
}
if (this.mail_refreshTimeOut > _refreshTimeOut) _refreshTimeOut = this.mail_refreshTimeOut;
if(this.mail_doTimedRefresh || _refreshTimeOut == 0) {
window.clearTimeout(this.mail_doTimedRefresh);
}
if(_refreshTimeOut > 9999) {//we do not set _refreshTimeOut's less than 10 seconds
//var self = this;
//this.mail_doTimedRefresh = window.setInterval(function() {
// self.mail_refreshFolderStatus.call(self,undefined,undefined,true);
//},_refreshTimeOut);
}
},
/** /**
* mail_refreshFolderStatus, function to call to read the counters of a folder and apply them * mail_refreshFolderStatus, function to call to read the counters of a folder and apply them
* *
@ -893,44 +858,6 @@ app.classes.mail = AppJS.extend(
nm.applyFilters(); // this should refresh the active folder nm.applyFilters(); // this should refresh the active folder
}, },
/**
* Refresh given application _targetapp display of entry _app _id, incl. outputting _msg
*
* Default implementation here only reloads window with it's current url with an added msg=_msg attached
*
* @param string _msg message (already translated) to show, eg. 'Entry deleted'
* @param string _app application name
* @param string|int _id=null id of entry to refresh
* @param string _type=null either 'edit', 'delete', 'add' or null
*/
/*
app_refresh: function(_msg, _app, _id, _type)
{
var bufferExists = false;
window.clearInterval(this.doStatus); // whatever message was up to be activated
//alert("app_refresh(\'"+_msg+"\',\'"+_app+"\',\'"+_id+"\',\'"+_type+"\')");
//myCurrentMsg = mail_getMsg();
//if (myCurrentMsg.length) {
// clear message after some time
myMessageBuffer = ""; //myCurrentMsg;
bufferExists = true;
//}
//this.mail_setMsg('<span style="font-weight: bold;">' +_msg+ '</span>');
egw_message(_msg,_type);
app.mail.mail_setMsg('');//without that applyFilters is not refreshing the index page
if (_app=='mail')
{
//we may want to trigger some actions, like modifying the grid, disable preview and stuff
// TODO: more actions
}
if (bufferExists)
{
//this.doStatus = window.setInterval("app.mail.mail_setMsg(myMessageBuffer);", 10000);
}
},
*/
/** /**
* mail_getMsg - gets the current Message * mail_getMsg - gets the current Message
* @return string * @return string
@ -1138,7 +1065,6 @@ app.classes.mail = AppJS.extend(
// Changing dataset entirely, force a reset // Changing dataset entirely, force a reset
nm.controller.reset(); nm.controller.reset();
} }
window.clearInterval(this.doStatus);
displayname = _widget.getSelectedLabel(); displayname = _widget.getSelectedLabel();
inBraket = displayname.search(/\(/); inBraket = displayname.search(/\(/);
if (inBraket!=-1) if (inBraket!=-1)
@ -1157,7 +1083,6 @@ app.classes.mail = AppJS.extend(
//mail_refreshMessageGrid();// its done in refreshFolderStatus already //mail_refreshMessageGrid();// its done in refreshFolderStatus already
this.mail_refreshFolderStatus(folder,'forced'); this.mail_refreshFolderStatus(folder,'forced');
this.mail_refreshQuotaDisplay(server[0]); this.mail_refreshQuotaDisplay(server[0]);
this.mail_startTimerFolderStatusUpdate(this.mail_refreshTimeOut);
this.mail_fetchCurrentlyFocussed(null,true); this.mail_fetchCurrentlyFocussed(null,true);
this.mail_preview(); this.mail_preview();
}, },