jqueryized locktimer

2 files changed, 35 insertions, 39 deletions

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 0e0a22d42..e96d45ee6 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -109,7 +109,7 @@ function js_out(){
     js_runonstart("addEvent(document,'click',closePopups)");
     js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)");
     if($conf['locktime'] != 0){
-        js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].", 'wiki__text')");
+        js_runonstart("dw_locktimer.init(".($conf['locktime'] - 60).",".$conf['usedraft'].")");
     }
     // init hotkeys - must have been done after init of toolbar
 # disabled for FS#1958    js_runonstart('initializeHotkeys()');
diff --git a/lib/scripts/locktimer.js b/lib/scripts/locktimer.js
index 60508a8e7..b83840557 100644
--- a/lib/scripts/locktimer.js
+++ b/lib/scripts/locktimer.js
@@ -1,64 +1,62 @@
 /**
-* Class managing the timer to display a warning on a expiring lock
-*/
-var locktimer = {
-    sack: null,
+ * Class managing the timer to display a warning on a expiring lock
+ */
+var dw_locktimer = {
     timeout: 0,
+    draft: false,
     timerID: null,
     lasttime: null,
     msg: '',
     pageid: '',
 
-    init: function(timeout,msg,draft,edid){
-        var edit = $(edid);
-        if(!edit) return;
-        if(edit.readOnly) return;
+    /**
+     * Initialize the lock timer
+     *
+     * @param int timeout Lenght of timeout in seconds
+     * @param bool draft  save drafts
+     */
+    init: function(timeout,draft){ //FIXME which elements to pass here?
+        var $edit = jQuery('#wiki__text');
+        if(!$edit.length) return;
+        if($edit.attr('readonly')) return;
 
         // init values
-        this.timeout = timeout*1000;
-        this.msg = msg;
-        this.draft = draft;
-        this.lasttime = new Date();
+        dw_locktimer.timeout  = timeout*1000;
+        dw_locktimer.draft    = draft;
+        dw_locktimer.lasttime = new Date();
 
-        if(jQuery('#dw__editform').length == 0) return;
-        this.pageid = jQuery('#dw__editform input[name=id]').val();
-        if(!this.pageid) return;
-
-        if(jQuery('#wiki__text').attr('readonly')) return;
+        dw_locktimer.pageid   = jQuery('#dw__editform input[name=id]').val();
+        if(!dw_locktimer.pageid) return;
 
         // register refresh event
-        jQuery('#dw__editform').keypress(
-            function() {
-                locktimer.refresh();
-            }
-        );
+        jQuery('#wiki__text').keypress(dw_locktimer.refresh);
         // start timer
-        this.reset();
+        dw_locktimer.reset();
     },
 
     /**
      * (Re)start the warning timer
      */
     reset: function(){
-        this.clear();
-        this.timerID = window.setTimeout("locktimer.warning()", this.timeout);
+        dw_locktimer.clear();
+        dw_locktimer.timerID = window.setTimeout(dw_locktimer.warning, dw_locktimer.timeout);
     },
 
     /**
      * Display the warning about the expiring lock
      */
     warning: function(){
-        this.clear();
-        alert(this.msg);
+        dw_locktimer.clear();
+        alert(LANG.willexpire.replace(/\\n/,"\n"));
     },
 
     /**
      * Remove the current warning timer
      */
     clear: function(){
-        if(this.timerID !== null){
-            window.clearTimeout(this.timerID);
-            this.timerID = null;
+        if(dw_locktimer.timerID !== null){
+            window.clearTimeout(dw_locktimer.timerID);
+            dw_locktimer.timerID = null;
         }
     },
 
@@ -71,11 +69,11 @@ var locktimer = {
         var now = new Date();
         var params = {};
         // refresh every minute only
-        if(now.getTime() - this.lasttime.getTime() > 30*1000){
+        if(now.getTime() - dw_locktimer.lasttime.getTime() > 30*1000){
             params['call'] = 'lock';
-            params['id'] = locktimer.pageid;
+            params['id'] = dw_locktimer.pageid;
 
-            if(locktimer.draft && jQuery('#dw__editform textarea[name=wikitext]').length > 0){
+            if(dw_locktimer.draft && jQuery('#dw__editform textarea[name=wikitext]').length > 0){
                 params['prefix'] = jQuery('#dw__editform input[name=prefix]').val();
                 params['wikitext'] = jQuery('#dw__editform textarea[name=wikitext]').val();
                 params['suffix'] = jQuery('#dw__editform input[name=suffix]').val();
@@ -87,12 +85,10 @@ var locktimer = {
             jQuery.post(
                 DOKU_BASE + 'lib/exe/ajax.php',
                 params,
-                function (data) {
-                    locktimer.refreshed(data);
-                },
+                dw_locktimer.refreshed,
                 'html'
             );
-            this.lasttime = now;
+            dw_locktimer.lasttime = now;
         }
     },
 
@@ -105,6 +101,6 @@ var locktimer = {
 
         jQuery('#draft__status').html(data);
         if(error != '1') return; // locking failed
-        this.reset();
+        dw_locktimer.reset();
     }
 };