define([
'libs/jquery',
- './dialog',
+ 'views/dialog/dialog',
'wlxml/wlxml',
'wlxml/extensions/list/list',
'fnpjs/logging/logging',
-], function($, Dialog, wlxml, listExtension, logging) {
+ 'fnpjs/datetime',
+ './document'
+], function($, Dialog, wlxml, listExtension, logging, datetime, Document) {
'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) {
- 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 data = sandbox.getBootstrappedData(),
+ documentDirty = false,
+ draftDirty = false,
+ wlxmlDocument;
- var wlxmlDocument, text;
- var loadDocument = function(text) {
+ var loadDocument = function(text, isDraft, draftTimestamp) {
logger.debug('loading document');
+ var xmlValid = true;
try {
- wlxmlDocument = wlxml.WLXMLDocumentFromXML(text);
+ wlxmlDocument = wlxml.WLXMLDocumentFromXML(text, {editorConfig: sandbox.getConfig()}, Document.Document);
} 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) {
if(window.localStorage) {
window.setInterval(function() {
+ var timestamp = datetime.currentStrfmt(),
+ key = getLocalStorageKey();
if(modificationFlag) {
modificationFlag = false;
return;
if(wlxmlDocument && documentDirty && draftDirty) {
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(key.content, wlxmlDocument.toXML());
+ window.localStorage.setItem(key.contentTimestamp, timestamp);
+ sandbox.publish('savingEnded', 'success', 'local', {timestamp: timestamp});
draftDirty = false;
}
}, sandbox.getConfig().autoSaveInterval || 2500);
}
- sandbox.publish('ready');
+ sandbox.publish('ready', isDraft, draftTimestamp, xmlValid);
};
function readCookie(name) {
var reloadHistory = function() {
$.ajax({
method: 'get',
- url: sandbox.getConfig().documentHistoryUrl(document_id),
- success: function(data) {
- history = data;
- sandbox.publish('historyItemAdded', data.slice(-1)[0]);
+ url: sandbox.getConfig().documentHistoryUrl(data.document_id),
+ success: function(history) {
+ data.history = history;
+ sandbox.publish('historyItemAdded', history.slice(-1)[0]);
},
});
};
- var getLocalStorageKey = function() {
- return 'draft-id:' + document_id + '-ver:' + document_version;
+ var getLocalStorageKey = function(forVersion) {
+ var base = 'draft-id:' + data.document_id + '-ver:' + (forVersion || wlxmlDocument.properties.version);
+ return {
+ content: base,
+ contentTimestamp: base + '-content-timestamp'
+ };
};
return {
start: function() {
-
+ var text;
if(window.localStorage) {
- text = window.localStorage.getItem(getLocalStorageKey());
+ text = window.localStorage.getItem(getLocalStorageKey(data.version).content);
+
+ var timestamp = window.localStorage.getItem(getLocalStorageKey(data.version).contentTimestamp),
+ usingDraft;
if(text) {
logger.debug('Local draft exists');
var dialog = Dialog.create({
});
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');
+ usingDraft = true;
event.success();
});
dialog.show();
dialog.on('close', function() {
- loadDocument(text);
+ loadDocument(text, usingDraft, timestamp);
});
} else {
- loadDocument(sandbox.getBootstrappedData().document);
+ loadDocument(sandbox.getBootstrappedData().document, false);
}
} else {
- loadDocument(sandbox.getBootstrappedData().document);
+ loadDocument(sandbox.getBootstrappedData().document, false);
}
},
getDocument: function() {
dialog = Dialog.create({
fields: documentSaveForm.fields,
title: gettext('Save Document'),
- executeButtonText: gettext('Save')
+ executeButtonText: gettext('Save'),
+ cancelButtonText: gettext('Cancel')
});
dialog.on('execute', function(event) {
var formData = event.formData;
formData[documentSaveForm.content_field_name] = wlxmlDocument.toXML();
- formData[documentSaveForm.version_field_name] = document_version;
+ formData[documentSaveForm.version_field_name] = wlxmlDocument.properties.version;
if(sandbox.getConfig().jsonifySentData) {
formData = JSON.stringify(formData);
}
dialog.toggleButtons(false);
$.ajax({
method: 'post',
- url: sandbox.getConfig().documentSaveUrl(document_id),
+ url: sandbox.getConfig().documentSaveUrl(data.document_id),
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) {
+ wlxmlDocument.setProperty(key, data[key]);
+ });
+
reloadHistory();
},
error: function() {event.error(); sandbox.publish('savingEnded', 'error', 'remote');}
},
getHistory: function() {
- return history;
+ return data.history;
},
fetchDiff: function(ver1, ver2) {
$.ajax({
method: 'get',
- url: sandbox.getConfig().documentDiffUrl(document_id),
+ url: sandbox.getConfig().documentDiffUrl(data.document_id),
data: {from: ver1, to: ver2},
success: function(data) {
sandbox.publish('diffFetched', {table: data, ver1: ver1, ver2: ver2});
dialog = Dialog.create({
fields: documentRestoreForm.fields,
title: gettext('Restore Version'),
- executeButtonText: gettext('Restore')
+ executeButtonText: gettext('Restore'),
+ cancelButtonText: gettext('Cancel')
});
dialog.on('execute', function(event) {
$.ajax({
method: 'post',
dataType: 'json',
- url: sandbox.getConfig().documentRestoreUrl(document_id),
+ url: sandbox.getConfig().documentRestoreUrl(data.document_id),
data: formData,
success: function(data) {
- document_version = data.version;
+ Object.keys(data)
+ .filter(function(key) {
+ return key !== 'document';
+ })
+ .forEach(function(key) {
+ wlxmlDocument.setProperty(key, data[key]);
+ });
reloadHistory();
wlxmlDocument.loadXML(data.document);
documentDirty = false;
wlxmlDocument.loadXML(sandbox.getBootstrappedData().document);
draftDirty = false;
logger.debug('Draft dropped');
- },
- getDocumentId: function() {
- return document_id;
- },
- getDocumentVersion: function() {
- return document_version;
+ sandbox.publish('draftDropped');
}
};
};
fnp / fnpeditor.git / blobdiff