editor: small fix

[fnpeditor.git] / src / editor / modules / rng / rng.js

diff --git a/src/editor/modules/rng/rng.js b/src/editor/modules/rng/rng.js
index e15c94b..032fea4 100644 (file)
--- 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,22 +22,6 @@ 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);
         },
@@ -50,15 +33,9 @@ return function(sandbox) {
             
             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 +45,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 */
@@ -97,21 +69,22 @@ return function(sandbox) {
     
     eventHandlers.data = {
         ready: function(usingDraft, draftTimestamp) {
+            wlxmlDocument = sandbox.getModule('data').getDocument();
+
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());
             
-            documentSummary.init(sandbox.getConfig().documentSummaryView);
-            documentSummary.render(sandbox.getModule('data').getDocumentProperties());
+            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'], function(moduleName) {
+            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'mainBar', 'indicator', 'documentHistory', 'diffViewer', 'statusBar'], function(moduleName) {
                 sandbox.getModule(moduleName).start();
             });
             
-            wlxmlDocument = sandbox.getModule('data').getDocument();
             documentIsDirty = false;
             wlxmlDocument.on('change', function() {
                 documentIsDirty = true;
@@ -144,8 +117,6 @@ return function(sandbox) {
             
             sandbox.getModule('indicator').clearMessage({message: msg[what]});
             if(status === 'success' && what === 'remote') {
-                sandbox.getModule('mainBar').setVersion(data.version);
-                documentSummary.render(data);
                 documentSummary.setDraftField('-');
                 sandbox.getModule('mainBar').setCommandEnabled('drop-draft', false);
                 sandbox.getModule('mainBar').setCommandEnabled('save', false);
@@ -169,13 +140,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').getDocumentProperties().version);
             views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
         },
         'cmd.save': function() {
@@ -217,34 +186,6 @@ return function(sandbox) {
             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() {
@@ -260,12 +201,6 @@ return function(sandbox) {
         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);
         }
@@ -294,6 +229,21 @@ return function(sandbox) {
         }
     };
 
+    eventHandlers.statusBar = {
+        ready: function() {
+            views.mainLayout.setView('bottomPanel', sandbox.getModule('statusBar').getView());
+        }
+    };
+
+    eventHandlers.__all__ = {
+        actionHovered: function(action) {
+            sandbox.getModule('statusBar').showAction(action);
+        },
+        actionOff: function() {
+            sandbox.getModule('statusBar').clearAction();
+        }
+    };
+
     window.addEventListener('beforeunload', function(event) {
         var txt = gettext('Do you really want to exit?');
         if(documentIsDirty) {
@@ -319,10 +269,16 @@ return function(sandbox) {
             if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
                 logger.debug('Handling event ' + eventRepr);
                 eventHandlers[moduleName][eventName].apply(eventHandlers, args);
-            } else {
-                logger.warning('No event handler for ' + eventRepr);
+                return;
+            }
+
+            if(eventHandlers.__all__[eventName]) {
+                logger.debug('Handling event ' + eventRepr);
+                eventHandlers.__all__[eventName].apply(eventHandlers.__all__, args);
+                return;
             }
 
+            logger.warning('No event handler for ' + eventRepr);
         }
     };
 };