X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/a98948280a27e20a66c70d51c814956d2850c357..daeb3efce48907831ac2fc1b756845c9cb83cd41:/modules/rng/rng.js?ds=inline
diff --git a/modules/rng/rng.js b/modules/rng/rng.js
index 0322ca2..643b683 100644
--- a/modules/rng/rng.js
+++ b/modules/rng/rng.js
@@ -4,32 +4,110 @@ define([
'views/tabs/tabs',
'libs/text!./mainLayout.html',
'libs/text!./editingLayout.html',
-], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate) {
+'libs/text!./diffLayout.html',
+], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
+
+'use strict';
return function(sandbox) {
- 'use strict';
function addMainTab(title, slug, view) {
views.mainTabs.addTab(title, slug, view);
}
+ var dirty = {
+ sourceEditor: false,
+ documentCanvas: false,
+ metadataEditor: false,
+ };
+
+ var synchronizeTab = function(slug) {
+ function tabIsDirty(slug) {
+ if(slug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor))
+ return true;
+ if(slug === 'sourceEditor' && dirty.sourceEditor)
+ return true;
+ return false;
+ }
+
+ if(tabIsDirty(slug)) {
+ var reason, doc;
+ if(slug === 'sourceEditor') {
+ doc = sandbox.getModule('sourceEditor').getDocument();
+ reason = 'source_edit';
+ dirty.sourceEditor = false;
+ }
+ if(slug === 'editor') {
+ var doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();
+ if(dirty.metadataEditor) {
+ doc = sandbox.getModule('metadataEditor').attachMetadata(doc);
+ }
+ reason = 'edit';
+ dirty.documentCanvas = dirty.metadataEditor = false;
+ }
+ sandbox.getModule('data').commitDocument(doc, reason);
+ }
+ }
+
+ var commands = {
+ highlightDocumentNode: function(wlxmlNode, origin) {
+ ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {
+ if(!origin || moduleName != origin)
+ sandbox.getModule(moduleName).highlightNode(wlxmlNode)
+ });
+ },
+ dimDocumentNode: function(wlxmlNode, origin) {
+ ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {
+ if(!origin || moduleName != origin)
+ sandbox.getModule(moduleName).dimNode(wlxmlNode)
+ });
+ },
+ selectNode: function(wlxmlNode, origin) {
+ sandbox.getModule('documentCanvas').selectNode(wlxmlNode);
+ sandbox.getModule('nodePane').setNode(wlxmlNode);
+ sandbox.getModule('nodeFamilyTree').setNode(wlxmlNode);
+ sandbox.getModule('nodeBreadCrumbs').setNode(wlxmlNode);
+
+ },
+ resetDocument: function(document, reason) {
+ var modules = [];
+ if(reason === 'source_edit')
+ modules = ['documentCanvas', 'metadataEditor'];
+ else if (reason === 'edit')
+ modules = ['sourceEditor'];
+ else if (reason === 'revert')
+ modules = ['documentCanvas', 'metadataEditor', 'sourceEditor'];
+
+ modules.forEach(function(moduleName) {
+ sandbox.getModule(moduleName).setDocument(document);
+ });
+ }
+ }
+
+
var views = {
mainLayout: new layout.Layout(mainLayoutTemplate),
mainTabs: (new tabs.View()).render(),
visualEditing: new layout.Layout(visualEditingLayoutTemplate),
visualEditingSidebar: (new tabs.View({stacked: true})).render(),
- currentNodePaneLayout: new vbox.VBox()
+ currentNodePaneLayout: new vbox.VBox(),
+ diffLayout: new layout.Layout(diffLayoutTemplate)
}
views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());
- addMainTab('rng2 test', 'rng2test', views.visualEditing.getAsView());
+ addMainTab('Edytor', 'editor', views.visualEditing.getAsView());
+ addMainTab(gettext('Source'), 'sourceEditor', '');
+ addMainTab('Historia', 'history', views.diffLayout.getAsView());
sandbox.getDOM().append(views.mainLayout.getAsView());
views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
-
-
+ views.mainTabs.on('tabSelected', function(event) {
+ if(event.prevSlug) {
+ synchronizeTab(event.prevSlug);
+ }
+ });
/* Events handling */
@@ -37,16 +115,14 @@ return function(sandbox) {
eventHandlers.sourceEditor = {
ready: function() {
- addMainTab(gettext('Source'), 'source', sandbox.getModule('sourceEditor').getView());
+ addMainTab(gettext('Source'), 'sourceEditor', sandbox.getModule('sourceEditor').getView());
sandbox.getModule('sourceEditor').setDocument(sandbox.getModule('data').getDocument());
- }
- };
-
- eventHandlers.visualEditor = {
- ready: function() {
- sandbox.getModule('visualEditor').setDocument(sandbox.getModule('data').getDocument());
- addMainTab(gettext('Visual'), 'visual', sandbox.getModule('visualEditor').getView());
-
+ },
+ xmlChanged: function() {
+ dirty.sourceEditor = true;
+ },
+ documentSet: function() {
+ dirty.sourceEditor = false;
}
};
@@ -54,13 +130,12 @@ return function(sandbox) {
ready: function() {
views.mainLayout.setView('mainView', views.mainTabs.getAsView());
- _.each(['visualEditor', 'sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator'], function(moduleName) {
+ _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {
sandbox.getModule(moduleName).start();
});
},
documentChanged: function(document, reason) {
- var slug = (reason === 'visual_edit' ? 'source' : 'visual');
- sandbox.getModule(slug+'Editor').setDocument(document);
+ commands.resetDocument(document, reason);
},
savingStarted: function() {
sandbox.getModule('mainBar').setCommandEnabled('save', false);
@@ -68,23 +143,34 @@ return function(sandbox) {
},
savingEnded: function(status) {
sandbox.getModule('mainBar').setCommandEnabled('save', true);
- sandbox.getModule('indicator').clearMessage();
- }
- }
-
- eventHandlers.rng2 = {
- ready: function() {
- addMainTab('rng2 test', 'rng2test', sandbox.getModule('rng2').getView());
-
+ sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
+ },
+ restoringStarted: function(event) {
+ sandbox.getModule('mainBar').setCommandEnabled('save', false);
+ sandbox.getModule('indicator').showMessage(gettext('Restoring version ') + event.version + '...');
+ },
+ historyItemAdded: function(item) {
+ sandbox.getModule('documentHistory').addHistory([item], {animate: true});
+ },
+ diffFetched: function(diff) {
+ sandbox.getModule('diffViewer').setDiff(diff);
+ },
+ documentReverted: function(event) {
+ commands.resetDocument(event.document, 'revert');
+ sandbox.getModule('mainBar').setCommandEnabled('save', true);
+ sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'});
+ sandbox.getModule('mainBar').setVersion(event.current_version);
}
}
eventHandlers.mainBar = {
ready: function() {
+ sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocumentVersion());
views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
},
'cmd.save': function() {
- sandbox.getModule('data').fakeSave();
+ synchronizeTab(views.mainTabs.getCurrentSlug());
+ sandbox.getModule('data').saveDocument();
}
}
@@ -101,28 +187,24 @@ return function(sandbox) {
sandbox.getModule('documentCanvas').setDocument(sandbox.getModule('data').getDocument());
views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
},
+ documentSet: function() {
+ dirty.documentCanvas = false;
+ },
- nodeSelected: function(node) {
- sandbox.getModule('nodePane').setNode(node);
- sandbox.getModule('nodeFamilyTree').setNode(node);
- sandbox.getModule('nodeBreadCrumbs').setNode(node);
+ nodeSelected: function(wlxmlNode) {
+ commands.selectNode(wlxmlNode);
},
contentChanged: function() {
-
+ dirty.documentCanvas = true;
},
- nodeHovered: function(node) {
- sandbox.getModule('documentCanvas').highlightNode(node.attr('id'));
- sandbox.getModule('nodeFamilyTree').highlightNode(node.attr('id'));
- sandbox.getModule('nodeBreadCrumbs').highlightNode(node.attr('id'));
-
+ nodeHovered: function(wlxmlNode) {
+ commands.highlightDocumentNode(wlxmlNode);
},
- nodeBlured: function(node) {
- sandbox.getModule('documentCanvas').dimNode(node.attr('id'));
- sandbox.getModule('nodeFamilyTree').dimNode(node.attr('id'));
- sandbox.getModule('nodeBreadCrumbs').dimNode(node.attr('id'));
+ nodeBlured: function(wlxmlNode) {
+ commands.dimDocumentNode(wlxmlNode);
}
};
@@ -138,23 +220,29 @@ return function(sandbox) {
eventHandlers.metadataEditor = {
ready: function() {
- sandbox.getModule('metadataEditor').setMetadata(sandbox.getModule('data').getDocument());
+ sandbox.getModule('metadataEditor').setDocument(sandbox.getModule('data').getDocument());
views.visualEditingSidebar.addTab({icon: 'info-sign'}, 'metadataEditor', sandbox.getModule('metadataEditor').getView());
- }
+ },
+ metadataChanged: function(metadata) {
+ dirty.metadataEditor = true;
+ },
+ metadataSet: function() {
+ dirty.metadataEditor = false;
+ },
};
eventHandlers.nodeFamilyTree = {
ready: function() {
views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
},
- nodeEntered: function(id) {
- sandbox.getModule('documentCanvas').highlightNode(id);
+ nodeEntered: function(wlxmlNode) {
+ commands.highlightDocumentNode(wlxmlNode, 'nodeFamilyTree');
},
- nodeLeft: function(id) {
- sandbox.getModule('documentCanvas').dimNode(id);
+ nodeLeft: function(wlxmlNode) {
+ commands.dimDocumentNode(wlxmlNode, 'nodeFamilyTree');
},
- nodeSelected: function(id) {
- sandbox.getModule('documentCanvas').selectNode(id);
+ nodeSelected: function(wlxmlNode) {
+ commands.selectNode(wlxmlNode);
}
};
@@ -178,17 +266,39 @@ return function(sandbox) {
ready: function() {
views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());
},
- nodeHighlighted: function(id) {
- sandbox.getModule('documentCanvas').highlightNode(id);
+ nodeHighlighted: function(wlxmlNode) {
+ commands.highlightDocumentNode(wlxmlNode, 'nodeBreadCrumbs');
},
- nodeDimmed: function(id) {
- sandbox.getModule('documentCanvas').dimNode(id);
+ nodeDimmed: function(wlxmlNode) {
+ commands.dimDocumentNode(wlxmlNode, 'nodeBreadCrumbs');
},
- nodeSelected: function(id) {
- sandbox.getModule('documentCanvas').selectNode(id);
+ nodeSelected: function(wlxmlNode) {
+ commands.selectNode(wlxmlNode);
}
}
+ eventHandlers.documentHistory = {
+ ready: function() {
+ sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());
+ views.diffLayout.setView('left', sandbox.getModule('documentHistory').getView());
+ },
+ compare: function(ver1, ver2) {
+ sandbox.getModule('data').fetchDiff(ver1, ver2);
+ },
+ restoreVersion: function(event) {
+ sandbox.getModule('data').restoreVersion(event);
+ },
+ displayVersion: function(event) {
+ window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());
+ }
+ }
+
+ eventHandlers.diffViewer = {
+ ready: function() {
+ views.diffLayout.setView('right', sandbox.getModule('diffViewer').getView());
+ }
+ }
+
/* api */
return {