logging: change default formatter to noop, fixes tests

[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 a8144cb..db17955 100644 (file)
--- a/src/editor/modules/data/data.js
+++ b/src/editor/modules/data/data.js
@@ -1,24 +1,43 @@
 define([
     'libs/jquery',
 define([
     'libs/jquery',

-    './saveDialog',
-    'wlxml/wlxml'
-
-], function($, saveDialog, wlxml) {
+    './dialog',
+    'wlxml/wlxml',
+    'wlxml/extensions/list/list',
+    'fnpjs/logging/logging',
+], function($, Dialog, wlxml, listExtension, logging) {

 
 'use strict';
 
 'use strict';

+/* global gettext, alert */
+
+var logger = logging.getLogger('editor.modules.data'),
+    stubDocument = '<section><div>' + gettext('This is an empty document.') + '</div></section>';
+

 
 return function(sandbox) {
 
 return function(sandbox) {

-    /* global gettext */

 
     var document_id = sandbox.getBootstrappedData().document_id;
     var document_version = sandbox.getBootstrappedData().version;
     var history = sandbox.getBootstrappedData().history;
 
 
     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 wlxmlDocument;
+    try {
+        wlxmlDocument = wlxml.WLXMLDocumentFromXML(sandbox.getBootstrappedData().document);
+    } catch(e) {
+        logger.exception(e);
+        alert(gettext('This document contains errors and can\'t be loaded. :(')); // TODO
+        wlxmlDocument = wlxml.WLXMLDocumentFromXML(stubDocument);
+    }
+
+    wlxmlDocument.registerExtension(listExtension);
+    sandbox.getPlugins().forEach(function(plugin) {
+        if(plugin.documentExtension) {
+            wlxmlDocument.registerExtension(plugin.documentExtension);
+        }
+    });

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

-        /* global escape, unescape */
+        /* global escape, unescape, document */

         var nameEQ = escape(name) + '=';
         var ca = document.cookie.split(';');
         for (var i = 0; i < ca.length; i++) {
         var nameEQ = escape(name) + '=';
         var ca = document.cookie.split(';');
         for (var i = 0; i < ca.length; i++) {


@@ -45,7 +64,7 @@ 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) {
                 history = data;
                 sandbox.publish('historyItemAdded', data.slice(-1)[0]);
             success: function(data) {
                 history = data;
                 sandbox.publish('historyItemAdded', data.slice(-1)[0]);


@@ -61,18 +80,38 @@ return function(sandbox) {
             return wlxmlDocument;
         },
         saveDocument: function() {
             return wlxmlDocument;
         },
         saveDocument: function() {

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

             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:wlxmlDocument.toXML(), 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');}


@@ -90,28 +129,48 @@ return function(sandbox) {
         fetchDiff: function(ver1, ver2) {
             $.ajax({
                 method: 'get',
         fetchDiff: function(ver1, ver2) {
             $.ajax({
                 method: 'get',

-                url: '/' + gettext('editor') + '/' + document_id + '/diff',
+                url: sandbox.getConfig().documentDiffUrl(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});
                 },
             });
         },

-        restoreVersion: function(options) {
-            if(options.version && options.description) {
-                sandbox.publish('restoringStarted', {version: options.version});
+        restoreVersion: function(version) {
+            var documentRestoreForm = $.extend({
+                        fields: [],
+                        version_field_name: 'version'
+                    },
+                    sandbox.getConfig().documentRestoreForm
+                ),
+                dialog = Dialog.create({
+                    fields: documentRestoreForm.fields,
+                    title: gettext('Restore Version'),
+                    submitButtonText: gettext('Restore')
+                });
+
+            dialog.on('save', function(event) {
+                var formData = event.formData;
+                formData[documentRestoreForm.version_field_name] = version;
+                sandbox.publish('restoringStarted', {version: version});
+                if(sandbox.getConfig().jsonifySentData) {
+                    formData = JSON.stringify(formData);
+                }

                 $.ajax({
                     method: 'post',
                     dataType: 'json',
                 $.ajax({
                     method: 'post',
                     dataType: 'json',

-                    url: '/' + gettext('editor') + '/' + document_id + '/revert',
-                    data: JSON.stringify(options),
+                    url: sandbox.getConfig().documentRestoreUrl(document_id),
+                    data: formData,

                     success: function(data) {
                         document_version = data.version;
                         reloadHistory();
                     success: function(data) {
                         document_version = data.version;
                         reloadHistory();

-                        sandbox.publish('documentReverted', data);
+                        wlxmlDocument.loadXML(data.document);
+                        sandbox.publish('documentReverted', data.version);
+                        event.success();

                     },
                 });
                     },
                 });

-            }
+            });
+            dialog.show();

         },
         getDocumentId: function() {
             return document_id;
         },
         getDocumentId: function() {
             return document_id;