editor: canvas - styling for aside.comment nodes

[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 896fc56..8757389 100644 (file)
--- a/src/editor/modules/data/data.js
+++ b/src/editor/modules/data/data.js
@@ -1,41 +1,42 @@
 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 doc = 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);
     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);

-    
-    if(doc === '') {
-        doc = '<section\n\
-        xmlns="http://nowoczesnapolska.org.pl/sst#"\n\
-        xmlns:xlink="http://www.w3.org/1999/xlink"\n\
-        xmlns:dc="http://purl.org/dc/elements/1.1/"\n\
-        xmlns:dcterms="http://purl.org/dc/terms/"\n\
-    >\n\
-        <metadata>\n\
-        </metadata>\n\
-        <div class="p"></div>\n\
-    </section>';
-    }
-    
+
+    wlxmlDocument.registerExtension(listExtension);
+    sandbox.getPlugins().forEach(function(plugin) {
+        if(plugin.documentExtension) {
+            wlxmlDocument.registerExtension(plugin.documentExtension);
+        }
+    });
+     

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

-        var nameEQ = escape(name) + "=";
+        /* global escape, unescape, document */
+        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;
     }


@@ -44,7 +45,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'));

             }
         }
     });
             }
         }
     });


@@ -52,9 +53,9 @@ return function(sandbox) {
     var reloadHistory = function() {
         $.ajax({
             method: 'get',
     var reloadHistory = function() {
         $.ajax({
             method: 'get',

-            url: '/' + gettext('editor') + '/' + document_id + '/history',
+            url: sandbox.getConfig().documentHistoryUrl(document_id),

             success: function(data) {
             success: function(data) {

-                history = data; 
+                history = data;

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


@@ -65,33 +66,41 @@ return function(sandbox) {
             sandbox.publish('ready');
         },
         getDocument: function() {
             sandbox.publish('ready');
         },
         getDocument: function() {

-            return doc;
-        },
-        getDocument2: function() {

             return wlxmlDocument;
         },
             return wlxmlDocument;
         },

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

         saveDocument: function() {
         saveDocument: function() {

-
-            var dialog = saveDialog.create();
+            var documentSaveForm = $.extend({
+                        fields: [],
+                        content_field_name: 'text',
+                        version_field_name: 'version'
+                    },
+                    sandbox.getConfig().documentSaveForm
+                ),
+                dialog = saveDialog.create({fields: documentSaveForm.fields});
+            

             dialog.on('save', function(event) {
                 sandbox.publish('savingStarted');
             dialog.on('save', function(event) {
                 sandbox.publish('savingStarted');

+
+                var formData = event.formData;
+                formData[documentSaveForm.content_field_name] = wlxmlDocument.toXML();
+                formData[documentSaveForm.version_field_name] = document_version;
+                if(sandbox.getConfig().jsonifySentData) {
+                    formData = JSON.stringify(formData);
+                }
+

                 dialog.toggleButtons(false);
                 $.ajax({
                     method: 'post',
                 dialog.toggleButtons(false);
                 $.ajax({
                     method: 'post',

-                    url: '/' + gettext('editor') + '/' + document_id,
-                    data: JSON.stringify({document:doc, description: event.data.description}),
-                    success: function() {
+                    url: sandbox.getConfig().documentSaveUrl(document_id),
+                    data: formData,
+                    success: function(data) {

                         event.success();
                         event.success();

-                        sandbox.publish('savingEnded', 'success');
+                        sandbox.publish('savingEnded', 'success', data.version);
+                        document_version = data.version;

                         reloadHistory();
                     },
                     error: function() {event.error(); sandbox.publish('savingEnded', 'error');}
                 });
                         reloadHistory();
                     },
                     error: function() {event.error(); sandbox.publish('savingEnded', 'error');}
                 });

-                console.log('save');

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


@@ -105,7 +114,7 @@ return function(sandbox) {
         fetchDiff: function(ver1, ver2) {
             $.ajax({
                 method: 'get',
         fetchDiff: function(ver1, ver2) {
             $.ajax({
                 method: 'get',

-                url: '/' + gettext('editor') + '/' + document_id + '/diff',
+                url: '/' + gettext('editor') + '/diff/' + document_id,

                 data: {from: ver1, to: ver2},
                 success: function(data) {
                     sandbox.publish('diffFetched', {table: data, ver1: ver1, ver2: ver2});
                 data: {from: ver1, to: ver2},
                 success: function(data) {
                     sandbox.publish('diffFetched', {table: data, ver1: ver1, ver2: ver2});


@@ -121,12 +130,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) {

-                        doc = data.document;
-                        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() {