X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/2981e2d70a5e01cea54e6204e5690285a28e2d91..b53d709d888332da35d991ef449ddfc60633273f:/src/editor/modules/data/data.js?ds=inline diff --git a/src/editor/modules/data/data.js b/src/editor/modules/data/data.js index af8c053..793d7b4 100644 --- a/src/editor/modules/data/data.js +++ b/src/editor/modules/data/data.js @@ -1,10 +1,12 @@ 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 */ @@ -16,23 +18,34 @@ 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(); + var document_version = data.version; + + var wlxmlDocument, text; - var loadDocument = function(text) { + var loadDocument = function(text, isDraft, draftTimestamp) { logger.debug('loading document'); try { - wlxmlDocument = wlxml.WLXMLDocumentFromXML(text); + wlxmlDocument = wlxml.WLXMLDocumentFromXML(text, {editorConfig: sandbox.getConfig()}, Document); } catch(e) { logger.exception(e); alert(gettext('This document contains errors and can\'t be loaded. :(')); // TODO - wlxmlDocument = wlxml.WLXMLDocumentFromXML(stubDocument); + wlxmlDocument = wlxml.WLXMLDocumentFromXML(stubDocument, {}, Document); } + 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) { @@ -41,11 +54,14 @@ return function(sandbox) { }); var modificationFlag = true; - wlxmlDocument.on('change', function() { + var handleChange = function() { documentDirty = true; draftDirty = true; modificationFlag = true; - }); + }; + wlxmlDocument.on('change', handleChange); + wlxmlDocument.on('contentSet', handleChange); + if(window.localStorage) { window.setInterval(function() { if(modificationFlag) { @@ -53,15 +69,17 @@ return function(sandbox) { return; } if(wlxmlDocument && documentDirty && draftDirty) { + var timestamp = datetime.currentStrfmt(); logger.debug('Saving draft to local storage.'); - sandbox.publish('savingStarted'); - window.localStorage.setItem(getLocalStorageKey(), wlxmlDocument.toXML()); - sandbox.publish('savingEnded', 'success'); + sandbox.publish('savingStarted', '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); } - sandbox.publish('ready'); + sandbox.publish('ready', isDraft, draftTimestamp); }; function readCookie(name) { @@ -100,42 +118,50 @@ return function(sandbox) { }); }; - var getLocalStorageKey = function() { - return 'draft-id:' + document_id + '-ver:' + document_version; + var getLocalStorageKey = function(forVersion) { + var base = 'draft-id:' + document_id + '-ver:' + (forVersion || wlxmlDocument.properties.version); + return { + content: base, + contentTimestamp: base + '-content-timestamp' + }; }; return { start: function() { - if(window.localStorage) { - text = window.localStorage.getItem(getLocalStorageKey()); + text = window.localStorage.getItem(getLocalStorageKey(document_version).content); + + var timestamp = window.localStorage.getItem(getLocalStorageKey(document_version).contentTimestamp), + usingDraft; if(text) { logger.debug('Local draft exists'); var dialog = Dialog.create({ title: gettext('Local draft of a document exists'), text: gettext('Unsaved local draft of this version of the document exists in your browser. Do you want to load it instead?'), - submitButtonText: gettext('Yes, restore local draft'), + executeButtonText: gettext('Yes, restore local draft'), cancelButtonText: gettext('No, use version loaded from the server') }); dialog.on('cancel', function() { logger.debug('Bootstrapped version chosen'); + usingDraft = false; text = sandbox.getBootstrappedData().document; }); - dialog.on('save', function(event) { + 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() { @@ -152,15 +178,16 @@ return function(sandbox) { dialog = Dialog.create({ fields: documentSaveForm.fields, title: gettext('Save Document'), - submitButtonText: gettext('Save') + executeButtonText: gettext('Save'), + cancelButtonText: gettext('Cancel') }); - dialog.on('save', function(event) { - sandbox.publish('savingStarted'); + dialog.on('execute', function(event) { + sandbox.publish('savingStarted', 'remote'); 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); } @@ -172,11 +199,19 @@ return function(sandbox) { data: formData, success: function(data) { event.success(); - sandbox.publish('savingEnded', 'success', 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');} + error: function() {event.error(); sandbox.publish('savingEnded', 'error', 'remote');} }); }); dialog.on('cancel', function() { @@ -208,10 +243,11 @@ return function(sandbox) { dialog = Dialog.create({ fields: documentRestoreForm.fields, title: gettext('Restore Version'), - submitButtonText: gettext('Restore') + executeButtonText: gettext('Restore'), + cancelButtonText: gettext('Cancel') }); - dialog.on('save', function(event) { + dialog.on('execute', function(event) { var formData = event.formData; formData[documentRestoreForm.version_field_name] = version; sandbox.publish('restoringStarted', {version: version}); @@ -224,7 +260,13 @@ return function(sandbox) { 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) { + wlxmlDocument.setProperty(key, data[key]); + }); reloadHistory(); wlxmlDocument.loadXML(data.document); documentDirty = false; @@ -235,11 +277,15 @@ return function(sandbox) { }); dialog.show(); }, + dropDraft: function() { + logger.debug('Dropping a draft...'); + wlxmlDocument.loadXML(sandbox.getBootstrappedData().document); + draftDirty = false; + logger.debug('Draft dropped'); + sandbox.publish('draftDropped'); + }, getDocumentId: function() { return document_id; - }, - getDocumentVersion: function() { - return document_version; } }; };