Merge branch 'master' into stable

Conflicts:
	data/deleted.files
	doku.php
	lib/exe/xmlrpc.php

1 files changed, 14 insertions, 107 deletions

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 01262bcef..e8a59deb9 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -261,13 +261,14 @@ function currentHeadlineLevel(textboxId){
 /**
  * global var used for not saved yet warning
  */
-var textChanged = false;
+window.textChanged = false;
 
 /**
  * Delete the draft before leaving the page
  */
 function deleteDraft() {
     if (is_opera) return;
+    if (window.keepDraft) return;
 
     // remove a possibly saved draft using ajax
     var dwform = $('dw__editform');
@@ -304,27 +305,34 @@ addInitEvent(function (){
     }
 
     var checkfunc = function(){
-        textChanged = true; //global var
+        window.textChanged = true; //global var
         summaryCheck();
     };
     addEvent(editform, 'change', checkfunc);
     addEvent(editform, 'keydown', checkfunc);
 
     window.onbeforeunload = function(){
-        if(textChanged) {
+        if(window.textChanged) {
             return LANG.notsavedyet;
         }
     };
     window.onunload = deleteDraft;
 
     // reset change memory var on submit
-    addEvent($('edbtn__save'), 'click', function(){ textChanged = false; });
-    addEvent($('edbtn__preview'), 'click', function(){ textChanged = false; });
+    addEvent($('edbtn__save'), 'click', function(){
+        window.onbeforeunload = '';
+        window.textChanged = false;
+    });
+    addEvent($('edbtn__preview'), 'click', function(){
+        window.onbeforeunload = '';
+        window.textChanged = false;
+        window.keepDraft = true; // needed to keep draft on page unload
+    });
 
     var summary = $('edit__summary');
     addEvent(summary, 'change', summaryCheck);
     addEvent(summary, 'keyup', summaryCheck);
-    if (textChanged) summaryCheck();
+    if (window.textChanged) summaryCheck();
 });
 
 /**
@@ -341,104 +349,3 @@ function summaryCheck(){
     }
 }
 
-
-/**
- * Class managing the timer to display a warning on a expiring lock
- */
-function locktimer_class(){
-        this.sack     = null;
-        this.timeout  = 0;
-        this.timerID  = null;
-        this.lasttime = null;
-        this.msg      = '';
-        this.pageid   = '';
-};
-var locktimer = new locktimer_class();
-    locktimer.init = function(timeout,msg,draft){
-        // init values
-        locktimer.timeout  = timeout*1000;
-        locktimer.msg      = msg;
-        locktimer.draft    = draft;
-        locktimer.lasttime = new Date();
-
-        if(!$('dw__editform')) return;
-        locktimer.pageid = $('dw__editform').elements.id.value;
-        if(!locktimer.pageid) return;
-
-        // init ajax component
-        locktimer.sack = new sack(DOKU_BASE + 'lib/exe/ajax.php');
-        locktimer.sack.AjaxFailedAlert = '';
-        locktimer.sack.encodeURIString = false;
-        locktimer.sack.onCompletion = locktimer.refreshed;
-
-        // register refresh event
-        addEvent($('dw__editform'),'keypress',function(){locktimer.refresh();});
-        // start timer
-        locktimer.reset();
-    };
-
-    /**
-     * (Re)start the warning timer
-     */
-    locktimer.reset = function(){
-        locktimer.clear();
-        locktimer.timerID = window.setTimeout("locktimer.warning()", locktimer.timeout);
-    };
-
-    /**
-     * Display the warning about the expiring lock
-     */
-    locktimer.warning = function(){
-        locktimer.clear();
-        alert(locktimer.msg);
-    };
-
-    /**
-     * Remove the current warning timer
-     */
-    locktimer.clear = function(){
-        if(locktimer.timerID !== null){
-            window.clearTimeout(locktimer.timerID);
-            locktimer.timerID = null;
-        }
-    };
-
-    /**
-     * Refresh the lock via AJAX
-     *
-     * Called on keypresses in the edit area
-     */
-    locktimer.refresh = function(){
-        var now = new Date();
-        // refresh every minute only
-        if(now.getTime() - locktimer.lasttime.getTime() > 30*1000){ //FIXME decide on time
-            var params = 'call=lock&id='+encodeURIComponent(locktimer.pageid);
-            var dwform = $('dw__editform');
-            if(locktimer.draft && dwform.elements.wikitext){
-                params += '&prefix='+encodeURIComponent(dwform.elements.prefix.value);
-                params += '&wikitext='+encodeURIComponent(dwform.elements.wikitext.value);
-                params += '&suffix='+encodeURIComponent(dwform.elements.suffix.value);
-                if(dwform.elements.date){
-                    params += '&date='+encodeURIComponent(dwform.elements.date.value);
-                }
-            }
-            locktimer.sack.runAJAX(params);
-            locktimer.lasttime = now;
-        }
-    };
-
-
-    /**
-     * Callback. Resets the warning timer
-     */
-    locktimer.refreshed = function(){
-        var data  = this.response;
-        var error = data.charAt(0);
-            data  = data.substring(1);
-
-        $('draft__status').innerHTML=data;
-        if(error != '1') return; // locking failed
-        locktimer.reset();
-    };
-// end of locktimer class functions
-