diff options
| author | Adrian Lang <lang@cosmocode.de> | 2011-09-16 12:27:43 +0200 |
|---|---|---|
| committer | Adrian Lang <lang@cosmocode.de> | 2011-09-16 12:29:09 +0200 |
| commit | 7827dd2afcb37599610894016f2e1e6150e561b7 (patch) | |
| tree | da0e85d3ff8aacaf8f54153eeb03dca2900df213 /lib/scripts | |
| parent | f1ee1b85ca72341ec706e2ca4ba36b3d58b411ba (diff) | |
| download | rpg-7827dd2afcb37599610894016f2e1e6150e561b7.tar.gz rpg-7827dd2afcb37599610894016f2e1e6150e561b7.tar.bz2 | |
Increase locktimer compatibility
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/compatibility.js | 9 | ||||
| -rw-r--r-- | lib/scripts/locktimer.js | 28 |
2 files changed, 31 insertions, 6 deletions
diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js index 5cc8b3011..46cb6ccc2 100644 --- a/lib/scripts/compatibility.js +++ b/lib/scripts/compatibility.js @@ -98,6 +98,15 @@ var linkwiz = { toggle: DEPRECATED_WRAP(dw_linkwiz.toggle, dw_linkwiz) }; +var locktimer = { + init: DEPRECATED_WRAP(dw_locktimer.init, dw_locktimer), + reset: DEPRECATED_WRAP(dw_locktimer.reset, dw_locktimer), + warning: DEPRECATED_WRAP(dw_locktimer.warning, dw_locktimer), + clear: DEPRECATED_WRAP(dw_locktimer.clear, dw_locktimer), + refresh: DEPRECATED_WRAP(dw_locktimer.refresh, dw_locktimer), + refreshed: DEPRECATED_WRAP(dw_locktimer.refreshed, dw_locktimer) +}; + var media_manager = { // treeattach, selectorattach, confirmattach are munched together into // dw_mediamanager.init diff --git a/lib/scripts/locktimer.js b/lib/scripts/locktimer.js index 857002abf..96f963c08 100644 --- a/lib/scripts/locktimer.js +++ b/lib/scripts/locktimer.js @@ -6,17 +6,33 @@ var dw_locktimer = { draft: false, timerID: null, lasttime: null, - msg: '', + msg: LANG.willexpire, pageid: '', /** * Initialize the lock timer * - * @param int timeout Lenght of timeout in seconds - * @param bool draft save drafts + * @param int timeout Length of timeout in seconds + * @param string msg Deprecated; The expiry message + * @param bool draft Whether to save drafts + * @param string edid Optional; ID of an edit object which has to be present */ - init: function(timeout,draft){ //FIXME which elements to pass here? - var $edit = jQuery('#wiki__text'); + init: function(timeout,msg,draft,edid){ + var $edit; + + switch (arguments.length) { + case 4: + DEPRECATED('Setting the locktimer expiry message is deprecated'); + dw_locktimer.msg = msg; + break; + case 3: + edid = draft; + case 2: + draft = msg; + } + edid = edid || 'wiki__text'; + + $edit = jQuery('#' + edid); if($edit.length === 0 || $edit.attr('readonly')) { return; } @@ -50,7 +66,7 @@ var dw_locktimer = { */ warning: function(){ dw_locktimer.clear(); - alert(LANG.willexpire.replace(/\\n/,"\n")); + alert(fixtxt(dw_locktimer.msg)); }, /** |