Increase locktimer compatibility

dokuwiki · Sep 16, 2011 · 7827dd2 · 7827dd2
1 parent f1ee1b8
commit 7827dd2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git 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
@@ -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));
     },
 
     /**