X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/6b27d5301b4995add87d5734e6de2d974007a196..bb856bb163a586641fe9f6edf7723d3d905f2dfb:/src/editor/modules/rng/rng.js?ds=sidebyside diff --git a/src/editor/modules/rng/rng.js b/src/editor/modules/rng/rng.js index de30e64..63bc2c2 100644 --- a/src/editor/modules/rng/rng.js +++ b/src/editor/modules/rng/rng.js @@ -2,13 +2,12 @@ define([ './documentSummary', 'libs/underscore', 'fnpjs/layout', -'fnpjs/vbox', 'fnpjs/logging/logging', 'views/tabs/tabs', 'libs/text!./mainLayout.html', 'libs/text!./editingLayout.html', 'libs/text!./diffLayout.html', -], function(documentSummary, _, layout, vbox, logging, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) { +], function(documentSummary, _, layout, logging, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) { 'use strict'; @@ -23,43 +22,9 @@ return function(sandbox) { } var commands = { - highlightDocumentElement: function(element, origin) { - ///'nodeBreadCrumbs', 'nodeFamilyTree' - ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) { - if(!origin || moduleName !== origin) { - sandbox.getModule(moduleName).highlightElement(element); - } - }); - }, - dimDocumentElement: function(element, origin) { - //'nodeBreadCrumbs', 'nodeFamilyTree' - ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) { - if(!origin || moduleName !== origin) { - sandbox.getModule(moduleName).dimElement(element); - } - }); - }, - jumpToDocumentElement: function(element) { - sandbox.getModule('documentCanvas').jumpToElement(element); - }, refreshCanvasSelection: function(selection) { - var fragment = selection.toDocumentFragment(), - elementParent; - + var fragment = selection.toDocumentFragment(); sandbox.getModule('documentToolbar').setDocumentFragment(fragment); - - if(fragment && fragment.node) { - elementParent = fragment.node.getNearestElementNode(); - sandbox.getModule('nodePane').setNodeElement(elementParent); - sandbox.getModule('nodeFamilyTree').setElement(fragment.node); - sandbox.getModule('nodeBreadCrumbs').setNodeElement(elementParent); - sandbox.getModule('metadataEditor').setNodeElement(elementParent); - } else { - sandbox.getModule('nodePane').setNodeElement(null); - sandbox.getModule('nodeFamilyTree').setElement(null); - sandbox.getModule('nodeBreadCrumbs').setNodeElement(null); - sandbox.getModule('metadataEditor').setNodeElement(null); - } }, }; @@ -68,20 +33,15 @@ return function(sandbox) { 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(), diffLayout: new layout.Layout(diffLayoutTemplate) }; - views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView()); addMainTab(gettext('Editor'), 'editor', views.visualEditing.getAsView()); addMainTab(gettext('Source'), 'sourceEditor', ''); addMainTab(gettext('History'), 'history', views.diffLayout.getAsView()); sandbox.getDOM().append(views.mainLayout.getAsView()); - views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView()); - var wlxmlDocument, documentIsDirty; /* Events handling */ @@ -96,7 +56,7 @@ return function(sandbox) { }; eventHandlers.data = { - ready: function(usingDraft, draftTimestamp) { + ready: function(usingDraft, draftTimestamp, xmlValid) { wlxmlDocument = sandbox.getModule('data').getDocument(); views.mainLayout.setView('mainView', views.mainTabs.getAsView()); @@ -104,12 +64,17 @@ return function(sandbox) { documentSummary.init(sandbox.getConfig().documentSummaryView, wlxmlDocument); documentSummary.render(); documentSummary.setDraftField(usingDraft ? (draftTimestamp || '???') : '-'); - views.currentNodePaneLayout.appendView(documentSummary.dom); + sandbox.getModule('mainBar').setSummaryView(documentSummary.dom); sandbox.getModule('mainBar').setCommandEnabled('drop-draft', usingDraft); sandbox.getModule('mainBar').setCommandEnabled('save', usingDraft); - _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'metadataEditor', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer', 'statusBar'], function(moduleName) { + + var toStart = ['sourceEditor', 'documentToolbar', 'mainBar', 'indicator', 'documentHistory', 'diffViewer', 'statusBar']; + if(xmlValid) { + toStart.push('documentCanvas'); + } + _.each(toStart, function(moduleName) { sandbox.getModule(moduleName).start(); }); @@ -145,7 +110,6 @@ return function(sandbox) { sandbox.getModule('indicator').clearMessage({message: msg[what]}); if(status === 'success' && what === 'remote') { - sandbox.getModule('mainBar').setVersion(data.version); documentSummary.setDraftField('-'); sandbox.getModule('mainBar').setCommandEnabled('drop-draft', false); sandbox.getModule('mainBar').setCommandEnabled('save', false); @@ -169,13 +133,11 @@ return function(sandbox) { documentReverted: function(version) { documentIsDirty = false; sandbox.getModule('indicator').clearMessage({message:'Wersja ' + version + ' przywrócona'}); - sandbox.getModule('mainBar').setVersion(version); } }; eventHandlers.mainBar = { ready: function() { - sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocument().properties.version); views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView()); }, 'cmd.save': function() { @@ -205,46 +167,10 @@ return function(sandbox) { views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView()); }, - nodeHovered: function(canvasNode) { - commands.highlightDocumentNode(canvasNode); - }, - - nodeBlured: function(canvasNode) { - commands.dimDocumentNode(canvasNode); - }, - selectionChanged: function(selection) { commands.refreshCanvasSelection(selection); } }; - - eventHandlers.nodePane = { - ready: function() { - views.currentNodePaneLayout.appendView(sandbox.getModule('nodePane').getView()); - } - }; - - eventHandlers.metadataEditor = { - ready: function() { - sandbox.getModule('metadataEditor').setDocument(sandbox.getModule('data').getDocument()); - views.visualEditingSidebar.addTab({icon: 'info-sign'}, 'metadataEditor', sandbox.getModule('metadataEditor').getView()); - } - }; - - eventHandlers.nodeFamilyTree = { - ready: function() { - views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView()); - }, - nodeEntered: function(node) { - commands.highlightDocumentElement(node, 'nodeFamilyTree'); - }, - nodeLeft: function(node) { - commands.dimDocumentElement(node, 'nodeFamilyTree'); - }, - nodeClicked: function(node) { - commands.jumpToDocumentElement(node); - } - }; eventHandlers.documentToolbar = { ready: function() { @@ -256,21 +182,6 @@ return function(sandbox) { } }; - eventHandlers.nodeBreadCrumbs = { - ready: function() { - views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView()); - }, - elementEntered: function(element) { - commands.highlightDocumentElement(element, 'nodeBreadCrumbs'); - }, - elementLeft: function(element) { - commands.dimDocumentElement(element, 'nodeBreadCrumbs'); - }, - elementClicked: function(element) { - commands.jumpToDocumentElement(element); - } - }; - eventHandlers.documentHistory = { ready: function() { sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory()); @@ -284,7 +195,14 @@ return function(sandbox) { }, displayVersion: function(event) { /* globals window */ - window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId()); + var config = sandbox.getConfig(), + doc = sandbox.getModule('data').getDocument(); + + if(config.documentUrl) { + window.open(config.documentUrl(doc.properties.document_id, event.version), _.uniqueId()); + } else { + logger.error('Unable to show version ' + event.version + ' of a document - config.documentUrl missing'); + } } }; @@ -313,9 +231,9 @@ return function(sandbox) { var txt = gettext('Do you really want to exit?'); if(documentIsDirty) { txt += ' ' + gettext('Document contains unsaved changes!'); + event.returnValue = txt; // FF + return txt; // Chrome } - event.returnValue = txt; // FF - return txt; // Chrome }); /* api */