fnp / fnpeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
editor: minor usability tweak
[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 801473b..6a3271b 100644 (file)
--- a/src/editor/modules/rng/rng.js
+++ b/src/editor/modules/rng/rng.js
@@ -1,18 +1,22 @@
 define([
 define([
+'./documentSummary',
 'libs/underscore',
 'fnpjs/layout',
 'fnpjs/vbox',
 'libs/underscore',
 'fnpjs/layout',
 'fnpjs/vbox',
+'fnpjs/logging/logging',
 'views/tabs/tabs',
 'libs/text!./mainLayout.html',
 'libs/text!./editingLayout.html',
 'libs/text!./diffLayout.html',
 'views/tabs/tabs',
 'libs/text!./mainLayout.html',
 'libs/text!./editingLayout.html',
 'libs/text!./diffLayout.html',
-], function(_, layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
+], function(documentSummary, _, layout, vbox, logging, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
 
 'use strict';
 
 return function(sandbox) {
 
     /* globals gettext */
 
 'use strict';
 
 return function(sandbox) {
 
     /* globals gettext */
+
+    var logger = logging.getLogger('editor.modules.rng');
     
     function addMainTab(title, slug, view) {
         views.mainTabs.addTab(title, slug, view);
     
     function addMainTab(title, slug, view) {
         views.mainTabs.addTab(title, slug, view);
@@ -38,16 +42,25 @@ return function(sandbox) {
         jumpToDocumentElement: function(element) {
             sandbox.getModule('documentCanvas').jumpToElement(element);
         },
         jumpToDocumentElement: function(element) {
             sandbox.getModule('documentCanvas').jumpToElement(element);
         },
-        updateCurrentNodeElement: function(nodeElement) {
-            sandbox.getModule('nodePane').setNodeElement(nodeElement);
-            sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
-            sandbox.getModule('nodeBreadCrumbs').setNodeElement(nodeElement);
-            sandbox.getModule('documentToolbar').setNodeElement(nodeElement);
-            sandbox.getModule('metadataEditor').setNodeElement(nodeElement);
+        refreshCanvasSelection: function(selection) {
+            var fragment = selection.toDocumentFragment(),
+                elementParent;
+            
+            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);
+            }
         },
         },
-        updateCurrentTextElement: function(textElement) {
-            sandbox.getModule('nodeFamilyTree').setElement(textElement);
-        }
     };
     
 
     };
     
 
@@ -83,10 +96,18 @@ return function(sandbox) {
     };
     
     eventHandlers.data = {
     };
     
     eventHandlers.data = {
-        ready: function() {
+        ready: function(usingDraft, draftTimestamp) {
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());
             
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());
             
-            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {
+            documentSummary.init(sandbox.getConfig().documentSummaryView);
+            documentSummary.render(sandbox.getModule('data').getDocumentProperties());
+            documentSummary.setDraftField(usingDraft ? (draftTimestamp || '???') : '-');
+            views.currentNodePaneLayout.appendView(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) {
                 sandbox.getModule(moduleName).start();
             });
             
                 sandbox.getModule(moduleName).start();
             });
             
@@ -94,11 +115,17 @@ return function(sandbox) {
             documentIsDirty = false;
             wlxmlDocument.on('change', function() {
                 documentIsDirty = true;
             documentIsDirty = false;
             wlxmlDocument.on('change', function() {
                 documentIsDirty = true;
+                sandbox.getModule('mainBar').setCommandEnabled('save', true);
             });
             wlxmlDocument.on('contentSet', function() {
                 documentIsDirty = true;
             });
         },
             });
             wlxmlDocument.on('contentSet', function() {
                 documentIsDirty = true;
             });
         },
+        draftDropped: function() {
+            documentSummary.setDraftField('-');
+            sandbox.getModule('mainBar').setCommandEnabled('drop-draft', false);
+            sandbox.getModule('mainBar').setCommandEnabled('save', false);
+        },
         savingStarted: function(what) {
             var msg = {
                 remote: gettext('Saving document'),
         savingStarted: function(what) {
             var msg = {
                 remote: gettext('Saving document'),
@@ -107,16 +134,27 @@ return function(sandbox) {
             sandbox.getModule('mainBar').setCommandEnabled('save', false);
             sandbox.getModule('indicator').showMessage(msg[what] + '...');
         },
             sandbox.getModule('mainBar').setCommandEnabled('save', false);
             sandbox.getModule('indicator').showMessage(msg[what] + '...');
         },
-        savingEnded: function(status, what, current_version) {
+        savingEnded: function(status, what, data) {
             void(status);
             var msg = {
                 remote: gettext('Document saved'),
                 local: gettext('Local copy saved')
             };
             documentIsDirty = false;
             void(status);
             var msg = {
                 remote: gettext('Document saved'),
                 local: gettext('Local copy saved')
             };
             documentIsDirty = false;
-            sandbox.getModule('mainBar').setCommandEnabled('save', true);
+            
             sandbox.getModule('indicator').clearMessage({message: msg[what]});
             sandbox.getModule('indicator').clearMessage({message: msg[what]});
-            sandbox.getModule('mainBar').setVersion(current_version);
+            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);
+            }
+            if(what === 'local') {
+                documentSummary.setDraftField(data.timestamp);
+                sandbox.getModule('mainBar').setCommandEnabled('drop-draft', true);
+                sandbox.getModule('mainBar').setCommandEnabled('save', true);
+            }
         },
         restoringStarted: function(event) {
             sandbox.getModule('mainBar').setCommandEnabled('save', false);
         },
         restoringStarted: function(event) {
             sandbox.getModule('mainBar').setCommandEnabled('save', false);
@@ -130,7 +168,6 @@ return function(sandbox) {
         },
         documentReverted: function(version) {
             documentIsDirty = false;
         },
         documentReverted: function(version) {
             documentIsDirty = false;
-            sandbox.getModule('mainBar').setCommandEnabled('save', true);
             sandbox.getModule('indicator').clearMessage({message:'Wersja ' + version + ' przywrócona'});
             sandbox.getModule('mainBar').setVersion(version);
         }
             sandbox.getModule('indicator').clearMessage({message:'Wersja ' + version + ' przywrócona'});
             sandbox.getModule('mainBar').setVersion(version);
         }
@@ -138,11 +175,19 @@ return function(sandbox) {
     
     eventHandlers.mainBar = {
         ready: function() {
     
     eventHandlers.mainBar = {
         ready: function() {
-            sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocumentVersion());
+            sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocumentProperties().version);
             views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
         },
         'cmd.save': function() {
             views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
         },
         'cmd.save': function() {
+            var sourceEditor = sandbox.getModule('sourceEditor');
+            if(!sourceEditor.changesCommited()) {
+                logger.debug('Source editor has uncommited changes, commiting...');
+                sourceEditor.commitChanges();
+            }
             sandbox.getModule('data').saveDocument();
             sandbox.getModule('data').saveDocument();
+        },
+        'cmd.drop-draft': function() {
+            sandbox.getModule('data').dropDraft();
         }
     };
     
         }
     };
     
@@ -160,34 +205,22 @@ return function(sandbox) {
             views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
         },
         
             views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
         },
         
-        currentTextElementSet: function(textElement) {
-            commands.updateCurrentTextElement(textElement);
-        },
-
-        currentNodeElementSet: function(nodeElement) {
-            commands.updateCurrentNodeElement(nodeElement);
-        },
-        
-        currentNodeElementChanged: function(nodeElement) {
-            commands.updateCurrentNodeElement(nodeElement);
-        },
-
         nodeHovered: function(canvasNode) {
             commands.highlightDocumentNode(canvasNode);
         },
         
         nodeBlured: function(canvasNode) {
             commands.dimDocumentNode(canvasNode);
         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.nodePane = {
         ready: function() {
             views.currentNodePaneLayout.appendView(sandbox.getModule('nodePane').getView());
-        },
-        
-        nodeElementChange: function(attr, value) {
-            sandbox.getModule('documentCanvas').modifyCurrentNodeElement(attr, value);
         }
     };
     
         }
     };
     
@@ -216,9 +249,10 @@ return function(sandbox) {
     eventHandlers.documentToolbar = {
         ready: function() {
             views.visualEditing.setView('toolbar', sandbox.getModule('documentToolbar').getView());
     eventHandlers.documentToolbar = {
         ready: function() {
             views.visualEditing.setView('toolbar', sandbox.getModule('documentToolbar').getView());
+            sandbox.getModule('documentToolbar').setCanvas(sandbox.getModule('documentCanvas').getCanvas());
         },
         },
-        command: function(cmd, params) {
-            sandbox.getModule('documentCanvas').command(cmd, params);
+        actionExecuted: function(action, ret) {
+            sandbox.getModule('documentCanvas').onAfterActionExecuted(action, ret);
         }
     };
     
         }
     };
     
@@ -260,6 +294,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) {
     window.addEventListener('beforeunload', function(event) {
         var txt = gettext('Do you really want to exit?');
         if(documentIsDirty) {
@@ -273,12 +322,28 @@ return function(sandbox) {
     
     return {
         start: function() {
     
     return {
         start: function() {
+            sandbox.registerActionsAppObject({
+                getUser: function() {
+                    return sandbox.getConfig().user;
+                }
+            });
             sandbox.getModule('data').start();
         },
         handleEvent: function(moduleName, eventName, args) {
             sandbox.getModule('data').start();
         },
         handleEvent: function(moduleName, eventName, args) {
+            var eventRepr = moduleName + '.' + eventName;
             if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
             if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
+                logger.debug('Handling event ' + eventRepr);
                 eventHandlers[moduleName][eventName].apply(eventHandlers, args);
                 eventHandlers[moduleName][eventName].apply(eventHandlers, args);
+                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);
         }
     };
 };
         }
     };
 };