smartxml/wlxml: Merge in document node instances caching

[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 7d0837b..b3b9fe4 100644 (file)
--- a/src/editor/modules/data/data.js
+++ b/src/editor/modules/data/data.js
@@ -11,8 +11,7 @@ define([
 'use strict';
 /* global gettext, alert, window */
 
 'use strict';
 /* global gettext, alert, window */
 

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

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


@@ -22,28 +21,32 @@ return function(sandbox) {
     var documentDirty = false;
     var draftDirty = false;
 
     var documentDirty = false;
     var draftDirty = false;
 

-    var documentProperties = {};

     var data = sandbox.getBootstrappedData();
     var data = sandbox.getBootstrappedData();

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

 
     var wlxmlDocument, text;
 
     var loadDocument = function(text, isDraft, draftTimestamp) {
         logger.debug('loading document');
 
     var wlxmlDocument, text;
 
     var loadDocument = function(text, isDraft, draftTimestamp) {
         logger.debug('loading document');

+        var xmlValid = true;

         try {
         try {

-            wlxmlDocument = wlxml.WLXMLDocumentFromXML(text, {editorConfig: sandbox.getConfig()}, Document);
+            wlxmlDocument = wlxml.WLXMLDocumentFromXML(text, {editorConfig: sandbox.getConfig()}, Document.Document);

         } catch(e) {
             logger.exception(e);
         } catch(e) {
             logger.exception(e);

-            alert(gettext('This document contains errors and can\'t be loaded. :(')); // TODO
-            wlxmlDocument = wlxml.WLXMLDocumentFromXML(stubDocument, {}, Document);
+            alert(gettext('The content of this document seems to be invalid - only XML source editing will be possible. :(')); // TODO
+            wlxmlDocument = wlxml.WLXMLDocumentFromXML(text, {}, Document.DumbDocument);
+            xmlValid = false;

         }
 
         }
 

+        Object.keys(data)
+            .filter(function(key) {
+                return key !== 'history' && key !== 'document';
+            })
+            .forEach(function(key) {
+                wlxmlDocument.setProperty(key, data[key]);
+            });
+

         wlxmlDocument.registerExtension(listExtension);
         sandbox.getPlugins().forEach(function(plugin) {
             if(plugin.documentExtension) {
         wlxmlDocument.registerExtension(listExtension);
         sandbox.getPlugins().forEach(function(plugin) {
             if(plugin.documentExtension) {


@@ -77,7 +80,7 @@ return function(sandbox) {
                 }
             }, sandbox.getConfig().autoSaveInterval || 2500);
         }
                 }
             }, sandbox.getConfig().autoSaveInterval || 2500);
         }

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

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


@@ -116,8 +119,8 @@ return function(sandbox) {
         });
     };
 
         });
     };
 

-    var getLocalStorageKey = function() {
-        var base = 'draft-id:' + document_id + '-ver:' + documentProperties.version;
+    var getLocalStorageKey = function(forVersion) {
+        var base = 'draft-id:' + document_id + '-ver:' + (forVersion || wlxmlDocument.properties.version);

         return {
             content: base,
             contentTimestamp: base + '-content-timestamp'
         return {
             content: base,
             contentTimestamp: base + '-content-timestamp'


@@ -128,9 +131,9 @@ return function(sandbox) {
     return {
         start: function() {
             if(window.localStorage) {
     return {
         start: function() {
             if(window.localStorage) {

-                text = window.localStorage.getItem(getLocalStorageKey().content);
+                text = window.localStorage.getItem(getLocalStorageKey(document_version).content);

 
 

-                var timestamp = window.localStorage.getItem(getLocalStorageKey().contentTimestamp),
+                var timestamp = window.localStorage.getItem(getLocalStorageKey(document_version).contentTimestamp),

                     usingDraft;
                 if(text) {
                     logger.debug('Local draft exists');
                     usingDraft;
                 if(text) {
                     logger.debug('Local draft exists');


@@ -185,7 +188,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] = documentProperties.version;
+                formData[documentSaveForm.version_field_name] = wlxmlDocument.properties.version;

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


@@ -204,7 +207,7 @@ return function(sandbox) {
                                 return key !== 'text';
                             })
                             .forEach(function(key) {
                                 return key !== 'text';
                             })
                             .forEach(function(key) {

-                                documentProperties[key] = data[key];
+                                wlxmlDocument.setProperty(key, data[key]);

                             });
 
                         reloadHistory();
                             });
 
                         reloadHistory();


@@ -263,7 +266,7 @@ return function(sandbox) {
                                 return key !== 'document';
                             })
                             .forEach(function(key) {
                                 return key !== 'document';
                             })
                             .forEach(function(key) {

-                                documentProperties[key] = data[key];
+                                wlxmlDocument.setProperty(key, data[key]);

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


@@ -284,9 +287,6 @@ return function(sandbox) {
         },
         getDocumentId: function() {
             return document_id;
         },
         getDocumentId: function() {
             return document_id;

-        },
-        getDocumentProperties: function() {
-            return documentProperties;

         }
     };
 };
         }
     };
 };