diff options
| author | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2015-08-10 10:03:27 +0200 |
| commit | 53a57d16b9c741bb44099fd93bf79efa06796341 (patch) | |
| tree | 24a90a50afe9325926c8ebaa2ed90f9fa093e5b9 /lib/scripts/locktimer.js | |
| parent | cf6e6645c31a9f185cef3fb9452fb188882ede47 (diff) | |
| parent | a060d9973e7c1d5051f2cc426937881826e4972e (diff) | |
| download | rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.gz rpg-53a57d16b9c741bb44099fd93bf79efa06796341.tar.bz2 | |
Merge branch master into stable
Diffstat (limited to 'lib/scripts/locktimer.js')
| -rw-r--r-- | lib/scripts/locktimer.js | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/lib/scripts/locktimer.js b/lib/scripts/locktimer.js index 96f963c08..f83b6334e 100644 --- a/lib/scripts/locktimer.js +++ b/lib/scripts/locktimer.js @@ -12,24 +12,13 @@ var dw_locktimer = { /** * Initialize the lock timer * - * @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 + * @param {int} timeout Length of timeout in seconds + * @param {bool} draft Whether to save drafts + * @param {string} edid Optional; ID of an edit object which has to be present */ - init: function(timeout,msg,draft,edid){ + init: function(timeout,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); @@ -42,7 +31,7 @@ var dw_locktimer = { dw_locktimer.draft = draft; dw_locktimer.lasttime = new Date(); - dw_locktimer.pageid = jQuery('#dw__editform input[name=id]').val(); + dw_locktimer.pageid = jQuery('#dw__editform').find('input[name=id]').val(); if(!dw_locktimer.pageid) { return; } @@ -94,7 +83,7 @@ var dw_locktimer = { } // POST everything necessary for draft saving - if(dw_locktimer.draft && jQuery('#dw__editform textarea[name=wikitext]').length > 0){ + if(dw_locktimer.draft && jQuery('#dw__editform').find('textarea[name=wikitext]').length > 0){ params += jQuery('#dw__editform').find('input[name=prefix], ' + 'textarea[name=wikitext], ' + 'input[name=suffix], ' + |