fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
42e46f8
..
b3b9fe4
100644
(file)
--- a/
src/editor/modules/data/data.js
+++ b/
src/editor/modules/data/data.js
@@
-1,17
+1,17
@@
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',
- 'fnpjs/datetime'
-], function($, Dialog, wlxml, listExtension, logging, datetime) {
+ 'fnpjs/datetime',
+ './document'
+], function($, Dialog, wlxml, listExtension, logging, datetime, Document) {
'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) {
@@
-21,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);
+ 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);
+ 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) {
@@
-76,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) {
@@
-115,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'
@@
-127,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');
@@
-175,7
+179,8
@@
return function(sandbox) {
dialog = Dialog.create({
fields: documentSaveForm.fields,
title: gettext('Save Document'),
dialog = Dialog.create({
fields: documentSaveForm.fields,
title: gettext('Save Document'),
- executeButtonText: gettext('Save')
+ executeButtonText: gettext('Save'),
+ cancelButtonText: gettext('Cancel')
});
dialog.on('execute', function(event) {
});
dialog.on('execute', function(event) {
@@
-183,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] =
documentP
roperties.version;
+ formData[documentSaveForm.version_field_name] =
wlxmlDocument.p
roperties.version;
if(sandbox.getConfig().jsonifySentData) {
formData = JSON.stringify(formData);
}
if(sandbox.getConfig().jsonifySentData) {
formData = JSON.stringify(formData);
}
@@
-202,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();
@@
-239,7
+244,8
@@
return function(sandbox) {
dialog = Dialog.create({
fields: documentRestoreForm.fields,
title: gettext('Restore Version'),
dialog = Dialog.create({
fields: documentRestoreForm.fields,
title: gettext('Restore Version'),
- executeButtonText: gettext('Restore')
+ executeButtonText: gettext('Restore'),
+ cancelButtonText: gettext('Cancel')
});
dialog.on('execute', function(event) {
});
dialog.on('execute', function(event) {
@@
-260,7
+266,7
@@
return function(sandbox) {
return key !== 'document';
})
.forEach(function(key) {
return key !== 'document';
})
.forEach(function(key) {
-
documentProperties = data[key]
;
+
wlxmlDocument.setProperty(key, data[key])
;
});
reloadHistory();
wlxmlDocument.loadXML(data.document);
});
reloadHistory();
wlxmlDocument.loadXML(data.document);
@@
-281,9
+287,6
@@
return function(sandbox) {
},
getDocumentId: function() {
return document_id;
},
getDocumentId: function() {
return document_id;
- },
- getDocumentProperties: function() {
- return documentProperties;
}
};
};
}
};
};