editor: fix selecting text spanning multiple nodes in Chrome

[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 fc97f99..469d0e4 100644 (file)
--- a/src/editor/modules/rng/rng.js
+++ b/src/editor/modules/rng/rng.js
@@ -2,17 +2,20 @@ define([
 '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(_, 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);


@@ -43,6 +46,7 @@ return function(sandbox) {
             sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
             sandbox.getModule('nodeBreadCrumbs').setNodeElement(nodeElement);
             sandbox.getModule('documentToolbar').setNodeElement(nodeElement);
             sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
             sandbox.getModule('nodeBreadCrumbs').setNodeElement(nodeElement);
             sandbox.getModule('documentToolbar').setNodeElement(nodeElement);

+            sandbox.getModule('metadataEditor').setNodeElement(nodeElement);

         },
         updateCurrentTextElement: function(textElement) {
             sandbox.getModule('nodeFamilyTree').setElement(textElement);
         },
         updateCurrentTextElement: function(textElement) {
             sandbox.getModule('nodeFamilyTree').setElement(textElement);


@@ -98,15 +102,23 @@ return function(sandbox) {
                 documentIsDirty = true;
             });
         },
                 documentIsDirty = true;
             });
         },

-        savingStarted: function() {
+        savingStarted: function(what) {
+            var msg = {
+                remote: gettext('Saving document'),
+                local: gettext('Saving local copy')
+            };

             sandbox.getModule('mainBar').setCommandEnabled('save', false);
             sandbox.getModule('mainBar').setCommandEnabled('save', false);

-            sandbox.getModule('indicator').showMessage(gettext('Saving...'));
+            sandbox.getModule('indicator').showMessage(msg[what] + '...');

         },
         },

-        savingEnded: function(status, current_version) {
+        savingEnded: function(status, what, current_version) {

             void(status);
             void(status);

+            var msg = {
+                remote: gettext('Document saved'),
+                local: gettext('Local copy saved')
+            };

             documentIsDirty = false;
             sandbox.getModule('mainBar').setCommandEnabled('save', true);
             documentIsDirty = false;
             sandbox.getModule('mainBar').setCommandEnabled('save', true);

-            sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
+            sandbox.getModule('indicator').clearMessage({message: msg[what]});

             sandbox.getModule('mainBar').setVersion(current_version);
         },
         restoringStarted: function(event) {
             sandbox.getModule('mainBar').setVersion(current_version);
         },
         restoringStarted: function(event) {


@@ -133,6 +145,11 @@ return function(sandbox) {
             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();
         }
     };


@@ -267,9 +284,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.debug('No event handler for ' + eventRepr);

             }
             }

+

         }
     };
 };
         }
     };
 };