smartxml: Document.transaction now returns value from a callback

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

-    './saveDialog',
+    './dialog',

     'wlxml/wlxml',
     'wlxml/wlxml',

-    'wlxml/extensions/list/list'
-
-], function($, saveDialog, wlxml, listExtension) {
+    '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) {
 


@@ -14,7 +19,14 @@ return function(sandbox) {
     var document_version = sandbox.getBootstrappedData().version;
     var history = sandbox.getBootstrappedData().history;
 
     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) {
 
     wlxmlDocument.registerExtension(listExtension);
     sandbox.getPlugins().forEach(function(plugin) {


@@ -75,7 +87,11 @@ return function(sandbox) {
                     },
                     sandbox.getConfig().documentSaveForm
                 ),
                     },
                     sandbox.getConfig().documentSaveForm
                 ),

-                dialog = saveDialog.create({fields: documentSaveForm.fields});
+                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');


@@ -120,22 +136,41 @@ return function(sandbox) {
                 },
             });
         },
                 },
             });
         },

-        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',
                     url: sandbox.getConfig().documentRestoreUrl(document_id),
                 $.ajax({
                     method: 'post',
                     dataType: 'json',
                     url: sandbox.getConfig().documentRestoreUrl(document_id),

-                    data: JSON.stringify(options),
+                    data: formData,

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

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

                         reloadHistory();
                         wlxmlDocument.loadXML(data.document);
                         reloadHistory();
                         wlxmlDocument.loadXML(data.document);

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

                     },
                 });
                     },
                 });

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

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