editor: tweaking canvas appearance - tweaking element borders

[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 05e0620..c9514f8 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);


@@ -83,10 +87,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'], function(moduleName) {

                 sandbox.getModule(moduleName).start();
             });
             
                 sandbox.getModule(moduleName).start();
             });
             


@@ -94,11 +106,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 +125,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 +159,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,15 +166,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() {
             var sourceEditor = sandbox.getModule('sourceEditor');
             if(!sourceEditor.changesCommited()) {
             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();
                 sourceEditor.commitChanges();
             }
             sandbox.getModule('data').saveDocument();

+        },
+        'cmd.drop-draft': function() {
+            sandbox.getModule('data').dropDraft();

         }
     };
     
         }
     };
     


@@ -280,9 +312,14 @@ return function(sandbox) {
             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);

+            } else {
+                logger.warning('No event handler for ' + eventRepr);

             }
             }

+

         }
     };
 };
         }
     };
 };