Stricter linting

[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 b1e091c..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);


@@ -42,18 +45,11 @@ return function(sandbox) {
             sandbox.getModule('nodePane').setNodeElement(nodeElement);
             sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
             sandbox.getModule('nodeBreadCrumbs').setNodeElement(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);

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

-        },
-        resetDocument: function(document, reason) {
-            var modules = [];
-            if (reason === 'revert') {
-                modules = ['documentCanvas', 'metadataEditor', 'sourceEditor'];
-            }
-            modules.forEach(function(moduleName) {
-                sandbox.getModule(moduleName).setDocument(document);
-            });

         }
     };
     
         }
     };
     


@@ -68,14 +64,15 @@ return function(sandbox) {
     };
     
     views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());
     };
     
     views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());

-    addMainTab('Edytor', 'editor', views.visualEditing.getAsView());
+    addMainTab(gettext('Editor'), 'editor', views.visualEditing.getAsView());

     addMainTab(gettext('Source'), 'sourceEditor',  '');
     addMainTab(gettext('Source'), 'sourceEditor',  '');

-    addMainTab('Historia', 'history', views.diffLayout.getAsView());
+    addMainTab(gettext('History'), 'history', views.diffLayout.getAsView());

     
     sandbox.getDOM().append(views.mainLayout.getAsView());
     
     views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
 
     
     sandbox.getDOM().append(views.mainLayout.getAsView());
     
     views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
 

+    var wlxmlDocument, documentIsDirty;

     
     /* Events handling */
     
     
     /* Events handling */
     


@@ -95,15 +92,34 @@ return function(sandbox) {
             _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {
                 sandbox.getModule(moduleName).start();
             });
             _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {
                 sandbox.getModule(moduleName).start();
             });

+            
+            wlxmlDocument = sandbox.getModule('data').getDocument();
+            documentIsDirty = false;
+            wlxmlDocument.on('change', function() {
+                documentIsDirty = true;
+            });
+            wlxmlDocument.on('contentSet', function() {
+                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) {
+        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);
             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').setCommandEnabled('save', false);
         },
         restoringStarted: function(event) {
             sandbox.getModule('mainBar').setCommandEnabled('save', false);


@@ -115,11 +131,11 @@ return function(sandbox) {
         diffFetched: function(diff) {
             sandbox.getModule('diffViewer').setDiff(diff);
         },
         diffFetched: function(diff) {
             sandbox.getModule('diffViewer').setDiff(diff);
         },

-        documentReverted: function(event) {
-            commands.resetDocument(event.document, 'revert');
+        documentReverted: function(version) {
+            documentIsDirty = false;

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

-            sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'});
-            sandbox.getModule('mainBar').setVersion(event.current_version);
+            sandbox.getModule('indicator').clearMessage({message:'Wersja ' + version + ' przywrócona'});
+            sandbox.getModule('mainBar').setVersion(version);

         }
     };
     
         }
     };
     


@@ -129,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();
         }
     };


@@ -232,10 +253,11 @@ return function(sandbox) {
         compare: function(ver1, ver2) {
             sandbox.getModule('data').fetchDiff(ver1, ver2);
         },
         compare: function(ver1, ver2) {
             sandbox.getModule('data').fetchDiff(ver1, ver2);
         },

-        restoreVersion: function(event) {
-            sandbox.getModule('data').restoreVersion(event);
+        restoreVersion: function(version) {
+            sandbox.getModule('data').restoreVersion(version);

         },
         displayVersion: function(event) {
         },
         displayVersion: function(event) {

+            /* globals window */

             window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());
         }
     };
             window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());
         }
     };


@@ -245,6 +267,15 @@ return function(sandbox) {
             views.diffLayout.setView('right', sandbox.getModule('diffViewer').getView());
         }
     };
             views.diffLayout.setView('right', sandbox.getModule('diffViewer').getView());
         }
     };

+
+    window.addEventListener('beforeunload', function(event) {
+        var txt = gettext('Do you really want to exit?');
+        if(documentIsDirty) {
+            txt += ' ' + gettext('Document contains unsaved changes!');
+        }
+        event.returnValue = txt; // FF
+        return txt; // Chrome
+    });

     
     /* api */
     
     
     /* api */
     


@@ -253,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);

             }
             }

+

         }
     };
 };
         }
     };
 };