🏗 Use json for the response to dw_locktimer

1 files changed, 11 insertions, 6 deletions

diff --git a/lib/scripts/locktimer.js b/lib/scripts/locktimer.js
index 7f1c7fb23..7bc8a3969 100644
--- a/lib/scripts/locktimer.js
+++ b/lib/scripts/locktimer.js
@@ -104,7 +104,7 @@ var dw_locktimer = {
         var now = new Date(),
             params = 'call=lock&id=' + dw_locktimer.pageid + '&';
 
-        // refresh every minute only
+        // refresh every half minute only
         if(now.getTime() - dw_locktimer.lasttime.getTime() <= 30*1000) {
             return;
         }
@@ -118,7 +118,7 @@ var dw_locktimer = {
             DOKU_BASE + 'lib/exe/ajax.php',
             params,
             null,
-            'html'
+            'json'
         ).done(function dwLocktimerRefreshDoneHandler(data) {
             dw_locktimer.callbacks.forEach(
                 function (callback) {
@@ -133,11 +133,16 @@ var dw_locktimer = {
      * Callback. Resets the warning timer
      */
     refreshed: function(data){
-        var error = data.charAt(0);
-        data = data.substring(1);
+        if (data.errors.length) {
+            data.errors.forEach(function(error) {
+                jQuery('#draft__status').after(
+                    jQuery('<div class="error"></div>').text(error)
+                );
+            })
+        }
 
-        jQuery('#draft__status').html(data);
-        if(error != '1') {
+        jQuery('#draft__status').html(data.draft);
+        if(data.lock !== '1') {
             return; // locking failed
         }
         dw_locktimer.reset();