merging

1 files changed, 55 insertions, 55 deletions

diff --git a/lib/scripts/locktimer.js b/lib/scripts/locktimer.js
index 60508a8e7..857002abf 100644
--- a/lib/scripts/locktimer.js
+++ b/lib/scripts/locktimer.js
@@ -1,64 +1,65 @@
 /**
-* 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 === 0 || $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();
-            }
-        );
+        $edit.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;
         }
     },
 
@@ -68,32 +69,29 @@ var locktimer = {
      * Called on keypresses in the edit area
      */
     refresh: function(){
-        var now = new Date();
-        var params = {};
-        // refresh every minute only
-        if(now.getTime() - this.lasttime.getTime() > 30*1000){
-            params['call'] = 'lock';
-            params['id'] = locktimer.pageid;
+        var now = new Date(),
+            params = 'call=lock&id=' + dw_locktimer.pageid + '&';
 
-            if(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();
-                if(jQuery('#dw__editform input[name=date]').length > 0) {
-                    params['date'] = jQuery('#dw__editform input[name=id]').val();
-                }
-            }
+        // refresh every minute only
+        if(now.getTime() - dw_locktimer.lasttime.getTime() <= 30*1000) {
+            return;
+        }
 
-            jQuery.post(
-                DOKU_BASE + 'lib/exe/ajax.php',
-                params,
-                function (data) {
-                    locktimer.refreshed(data);
-                },
-                'html'
-            );
-            this.lasttime = now;
+        // POST everything necessary for draft saving
+        if(dw_locktimer.draft && jQuery('#dw__editform textarea[name=wikitext]').length > 0){
+            params += jQuery('#dw__editform').find('input[name=prefix], ' +
+                                                   'textarea[name=wikitext], ' +
+                                                   'input[name=suffix], ' +
+                                                   'input[name=date]').serialize();
         }
+
+        jQuery.post(
+            DOKU_BASE + 'lib/exe/ajax.php',
+            params,
+            dw_locktimer.refreshed,
+            'html'
+        );
+        dw_locktimer.lasttime = now;
     },
 
     /**
@@ -104,7 +102,9 @@ var locktimer = {
         data = data.substring(1);
 
         jQuery('#draft__status').html(data);
-        if(error != '1') return; // locking failed
-        this.reset();
+        if(error != '1') {
+            return; // locking failed
+        }
+        dw_locktimer.reset();
     }
 };