undo wip: fixes + smoke test

[fnpeditor.git] / src / editor / modules / data / data.js

diff --git a/src/editor/modules/data/data.js b/src/editor/modules/data/data.js
index c9ecf7d..f3494a0 100644 (file)
--- a/src/editor/modules/data/data.js
+++ b/src/editor/modules/data/data.js
@@ -1,27 +1,37 @@
 define([
 define([

+    'libs/jquery',

     './saveDialog',
     './saveDialog',

-    'wlxml/wlxml'
+    'wlxml/wlxml',
+    'wlxml/extensions/list/list'

 
 

-], function(saveDialog, wlxml) {
+], function($, saveDialog, wlxml, listExtension) {

 
 'use strict';
 
 return function(sandbox) {
 
 'use strict';
 
 return function(sandbox) {

+    /* global gettext */

 
     var document_id = sandbox.getBootstrappedData().document_id;
     var document_version = sandbox.getBootstrappedData().version;
     var history = sandbox.getBootstrappedData().history;
 
     var wlxmlDocument = wlxml.WLXMLDocumentFromXML(sandbox.getBootstrappedData().document);
 
     var document_id = sandbox.getBootstrappedData().document_id;
     var document_version = sandbox.getBootstrappedData().version;
     var history = sandbox.getBootstrappedData().history;
 
     var wlxmlDocument = wlxml.WLXMLDocumentFromXML(sandbox.getBootstrappedData().document);

+
+    wlxmlDocument.registerExtension(listExtension);

      
     
     function readCookie(name) {
      
     
     function readCookie(name) {

-        var nameEQ = escape(name) + "=";
+        /* global escape, unescape */
+        var nameEQ = escape(name) + '=';

         var ca = document.cookie.split(';');
         for (var i = 0; i < ca.length; i++) {
             var c = ca[i];
         var ca = document.cookie.split(';');
         for (var i = 0; i < ca.length; i++) {
             var c = ca[i];

-            while (c.charAt(0) == ' ') c = c.substring(1, c.length);
-            if (c.indexOf(nameEQ) === 0) return unescape(c.substring(nameEQ.length, c.length));
+            while (c.charAt(0) === ' ') {
+                c = c.substring(1, c.length);
+            }
+            if (c.indexOf(nameEQ) === 0) {
+                return unescape(c.substring(nameEQ.length, c.length));
+            }

         }
         return null;
     }
         }
         return null;
     }


@@ -30,7 +40,7 @@ return function(sandbox) {
         crossDomain: false,
         beforeSend: function(xhr, settings) {
             if (!(/^(GET|HEAD|OPTIONS|TRACE)$/.test(settings.type))) {
         crossDomain: false,
         beforeSend: function(xhr, settings) {
             if (!(/^(GET|HEAD|OPTIONS|TRACE)$/.test(settings.type))) {

-                xhr.setRequestHeader("X-CSRFToken", readCookie('csrftoken'));
+                xhr.setRequestHeader('X-CSRFToken', readCookie('csrftoken'));

             }
         }
     });
             }
         }
     });


@@ -40,7 +50,7 @@ return function(sandbox) {
             method: 'get',
             url: '/' + gettext('editor') + '/' + document_id + '/history',
             success: function(data) {
             method: 'get',
             url: '/' + gettext('editor') + '/' + document_id + '/history',
             success: function(data) {

-                history = data; 
+                history = data;

                 sandbox.publish('historyItemAdded', data.slice(-1)[0]);
             },
         });
                 sandbox.publish('historyItemAdded', data.slice(-1)[0]);
             },
         });


@@ -53,10 +63,6 @@ return function(sandbox) {
         getDocument: function() {
             return wlxmlDocument;
         },
         getDocument: function() {
             return wlxmlDocument;
         },

-        commitDocument: function(newDocument, reason) {
-            // doc = newDocument;
-            // sandbox.publish('documentChanged', doc, reason);
-        },

         saveDocument: function() {
 
             var dialog = saveDialog.create();
         saveDocument: function() {
 
             var dialog = saveDialog.create();


@@ -74,7 +80,6 @@ return function(sandbox) {
                     },
                     error: function() {event.error(); sandbox.publish('savingEnded', 'error');}
                 });
                     },
                     error: function() {event.error(); sandbox.publish('savingEnded', 'error');}
                 });

-                console.log('save');

             });
             dialog.on('cancel', function() {
             });
             });
             dialog.on('cancel', function() {
             });


@@ -104,11 +109,12 @@ return function(sandbox) {
                     url: '/' + gettext('editor') + '/' + document_id + '/revert',
                     data: JSON.stringify(options),
                     success: function(data) {
                     url: '/' + gettext('editor') + '/' + document_id + '/revert',
                     data: JSON.stringify(options),
                     success: function(data) {

-                        document_version = data.version;
+                        document_version = data.current_version;

                         reloadHistory();
                         reloadHistory();

+                        wlxmlDocument.loadXML(data.document);

                         sandbox.publish('documentReverted', data);
                     },
                         sandbox.publish('documentReverted', data);
                     },

-                }); 
+                });

             }
         },
         getDocumentId: function() {
             }
         },
         getDocumentId: function() {