editor: Handle invalid element passed to Canvas.setCurrentElement

[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 ef1c87d..3bb2c2c 100644 (file)
--- a/src/editor/modules/data/data.js
+++ b/src/editor/modules/data/data.js
@@ -1,10 +1,11 @@
 define([
     'libs/jquery',
 define([
     'libs/jquery',

-    './dialog',
+    'views/dialog/dialog',

     'wlxml/wlxml',
     'wlxml/extensions/list/list',
     'fnpjs/logging/logging',
     'wlxml/wlxml',
     'wlxml/extensions/list/list',
     'fnpjs/logging/logging',

-], function($, Dialog, wlxml, listExtension, logging) {
+    'fnpjs/datetime'
+], function($, Dialog, wlxml, listExtension, logging, datetime) {

 
 'use strict';
 /* global gettext, alert, window */
 
 'use strict';
 /* global gettext, alert, window */


@@ -16,14 +17,23 @@ var logger = logging.getLogger('editor.modules.data'),
 return function(sandbox) {
 
     var document_id = sandbox.getBootstrappedData().document_id;
 return function(sandbox) {
 
     var document_id = sandbox.getBootstrappedData().document_id;

-    var document_version = sandbox.getBootstrappedData().version;

     var history = sandbox.getBootstrappedData().history;
     var documentDirty = false;
     var draftDirty = false;
 
     var history = sandbox.getBootstrappedData().history;
     var documentDirty = false;
     var draftDirty = false;
 

+    var documentProperties = {};
+    var data = sandbox.getBootstrappedData();
+    Object.keys(data)
+        .filter(function(key) {
+            return key !== 'history' && key !== 'document';
+        })
+        .forEach(function(key) {
+            documentProperties[key] = data[key];
+        });
+

     var wlxmlDocument, text;
 
     var wlxmlDocument, text;
 

-    var loadDocument = function(text) {
+    var loadDocument = function(text, isDraft, draftTimestamp) {

         logger.debug('loading document');
         try {
             wlxmlDocument = wlxml.WLXMLDocumentFromXML(text);
         logger.debug('loading document');
         try {
             wlxmlDocument = wlxml.WLXMLDocumentFromXML(text);


@@ -56,15 +66,17 @@ return function(sandbox) {
                     return;
                 }
                 if(wlxmlDocument && documentDirty && draftDirty) {
                     return;
                 }
                 if(wlxmlDocument && documentDirty && draftDirty) {

+                    var timestamp = datetime.currentStrfmt();

                     logger.debug('Saving draft to local storage.');
                     sandbox.publish('savingStarted', 'local');
                     logger.debug('Saving draft to local storage.');
                     sandbox.publish('savingStarted', 'local');

-                    window.localStorage.setItem(getLocalStorageKey(), wlxmlDocument.toXML());
-                    sandbox.publish('savingEnded', 'success', 'local');
+                    window.localStorage.setItem(getLocalStorageKey().content, wlxmlDocument.toXML());
+                    window.localStorage.setItem(getLocalStorageKey().contentTimestamp, timestamp);
+                    sandbox.publish('savingEnded', 'success', 'local', {timestamp: timestamp});

                     draftDirty = false;
                 }
             }, sandbox.getConfig().autoSaveInterval || 2500);
         }
                     draftDirty = false;
                 }
             }, sandbox.getConfig().autoSaveInterval || 2500);
         }

-        sandbox.publish('ready');
+        sandbox.publish('ready', isDraft, draftTimestamp);

     };
     
     function readCookie(name) {
     };
     
     function readCookie(name) {


@@ -104,15 +116,21 @@ return function(sandbox) {
     };
 
     var getLocalStorageKey = function() {
     };
 
     var getLocalStorageKey = function() {

-        return 'draft-id:' + document_id + '-ver:' + document_version;
+        var base = 'draft-id:' + document_id + '-ver:' + documentProperties.version;
+        return {
+            content: base,
+            contentTimestamp: base + '-content-timestamp'
+        };

     };
 
    
     return {
         start: function() {
     };
 
    
     return {
         start: function() {

-

             if(window.localStorage) {
             if(window.localStorage) {

-                text = window.localStorage.getItem(getLocalStorageKey());
+                text = window.localStorage.getItem(getLocalStorageKey().content);
+
+                var timestamp = window.localStorage.getItem(getLocalStorageKey().contentTimestamp),
+                    usingDraft;

                 if(text) {
                     logger.debug('Local draft exists');
                     var dialog = Dialog.create({
                 if(text) {
                     logger.debug('Local draft exists');
                     var dialog = Dialog.create({


@@ -123,22 +141,24 @@ return function(sandbox) {
                     });
                     dialog.on('cancel', function() {
                         logger.debug('Bootstrapped version chosen');
                     });
                     dialog.on('cancel', function() {
                         logger.debug('Bootstrapped version chosen');

+                        usingDraft = false;

                         text = sandbox.getBootstrappedData().document;
                         
                     });
                     dialog.on('execute', function(event) {
                         logger.debug('Local draft chosen');
                         text = sandbox.getBootstrappedData().document;
                         
                     });
                     dialog.on('execute', function(event) {
                         logger.debug('Local draft chosen');

+                        usingDraft = true;

                         event.success();
                     });
                     dialog.show();
                     dialog.on('close', function() {
                         event.success();
                     });
                     dialog.show();
                     dialog.on('close', function() {

-                        loadDocument(text);
+                        loadDocument(text, usingDraft, timestamp);

                     });
                 } else {
                     });
                 } else {

-                    loadDocument(sandbox.getBootstrappedData().document);
+                    loadDocument(sandbox.getBootstrappedData().document, false);

                 }
             } else {
                 }
             } else {

-                loadDocument(sandbox.getBootstrappedData().document);
+                loadDocument(sandbox.getBootstrappedData().document, false);

             }
         },
         getDocument: function() {
             }
         },
         getDocument: function() {


@@ -163,7 +183,7 @@ return function(sandbox) {
 
                 var formData = event.formData;
                 formData[documentSaveForm.content_field_name] = wlxmlDocument.toXML();
 
                 var formData = event.formData;
                 formData[documentSaveForm.content_field_name] = wlxmlDocument.toXML();

-                formData[documentSaveForm.version_field_name] = document_version;
+                formData[documentSaveForm.version_field_name] = documentProperties.version;

                 if(sandbox.getConfig().jsonifySentData) {
                     formData = JSON.stringify(formData);
                 }
                 if(sandbox.getConfig().jsonifySentData) {
                     formData = JSON.stringify(formData);
                 }


@@ -175,8 +195,16 @@ return function(sandbox) {
                     data: formData,
                     success: function(data) {
                         event.success();
                     data: formData,
                     success: function(data) {
                         event.success();

-                        sandbox.publish('savingEnded', 'success', 'remote', data.version);
-                        document_version = data.version;
+                        sandbox.publish('savingEnded', 'success', 'remote', data);
+
+                        Object.keys(data)
+                            .filter(function(key) {
+                                return key !== 'text';
+                            })
+                            .forEach(function(key) {
+                                documentProperties[key] = data[key];
+                            });
+

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


@@ -227,7 +255,13 @@ return function(sandbox) {
                     url: sandbox.getConfig().documentRestoreUrl(document_id),
                     data: formData,
                     success: function(data) {
                     url: sandbox.getConfig().documentRestoreUrl(document_id),
                     data: formData,
                     success: function(data) {

-                        document_version = data.version;
+                        Object.keys(data)
+                            .filter(function(key) {
+                                return key !== 'document';
+                            })
+                            .forEach(function(key) {
+                                documentProperties = data[key];
+                            });

                         reloadHistory();
                         wlxmlDocument.loadXML(data.document);
                         documentDirty = false;
                         reloadHistory();
                         wlxmlDocument.loadXML(data.document);
                         documentDirty = false;


@@ -243,12 +277,13 @@ return function(sandbox) {
             wlxmlDocument.loadXML(sandbox.getBootstrappedData().document);
             draftDirty = false;
             logger.debug('Draft dropped');
             wlxmlDocument.loadXML(sandbox.getBootstrappedData().document);
             draftDirty = false;
             logger.debug('Draft dropped');

+            sandbox.publish('draftDropped');

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

-        getDocumentVersion: function() {
-            return document_version;
+        getDocumentProperties: function() {
+            return documentProperties;

         }
     };
 };
         }
     };
 };