Removing unnecessary element detach logic from Canvas DocumentNodeElement

[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 59652a7..bc4ea7f 100644 (file)
--- a/src/editor/modules/rng/rng.js
+++ b/src/editor/modules/rng/rng.js
@@ -1,67 +1,38 @@
 define([
 define([

+'libs/underscore',

 'fnpjs/layout',
 'fnpjs/vbox',
 'views/tabs/tabs',
 'libs/text!./mainLayout.html',
 'libs/text!./editingLayout.html',
 'libs/text!./diffLayout.html',
 'fnpjs/layout',
 'fnpjs/vbox',
 '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, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {

 
 'use strict';
 
 return function(sandbox) {
 
 'use strict';
 
 return function(sandbox) {

+
+    /* globals gettext */

     
     function addMainTab(title, slug, view) {
         views.mainTabs.addTab(title, slug, view);
     }
     
     function addMainTab(title, slug, view) {
         views.mainTabs.addTab(title, slug, view);
     }

-    
-    var dirty = {
-        sourceEditor: false,
-        documentCanvas: false,
-        metadataEditor: false,
-    };
-    
-    var synchronizeTab = function(slug) {
-        function tabIsDirty(slug) {
-            if(slug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor))
-                return true;
-            if(slug === 'sourceEditor' && dirty.sourceEditor)
-                return true;
-            return false;
-        }
-    
-        if(tabIsDirty(slug)) {
-            var reason, doc;
-            if(slug === 'sourceEditor') {
-                doc = sandbox.getModule('sourceEditor').getDocument();
-                reason = 'source_edit';
-                dirty.sourceEditor = false;
-            }
-            if(slug === 'editor') {
-                doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();
-                if(dirty.metadataEditor) {
-                    doc = sandbox.getModule('metadataEditor').attachMetadata(doc);
-                }
-                reason = 'edit';
-                dirty.documentCanvas = dirty.metadataEditor = false;
-            }
-            sandbox.getModule('data').commitDocument(doc, reason);
-        }
-    };
-    
+     

     var commands = {
         highlightDocumentElement: function(element, origin) {
             ///'nodeBreadCrumbs', 'nodeFamilyTree'
     var commands = {
         highlightDocumentElement: function(element, origin) {
             ///'nodeBreadCrumbs', 'nodeFamilyTree'

-            ['documentCanvas', ].forEach(function(moduleName) {
-                if(!origin || moduleName != origin)
+            ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) {
+                if(!origin || moduleName !== origin) {

                     sandbox.getModule(moduleName).highlightElement(element);
                     sandbox.getModule(moduleName).highlightElement(element);

+                }

             });
         },
         dimDocumentElement: function(element, origin) {
             //'nodeBreadCrumbs', 'nodeFamilyTree'
             });
         },
         dimDocumentElement: function(element, origin) {
             //'nodeBreadCrumbs', 'nodeFamilyTree'

-            ['documentCanvas'].forEach(function(moduleName) {
-                if(!origin || moduleName != origin)
+            ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) {
+                if(!origin || moduleName !== origin) {

                     sandbox.getModule(moduleName).dimElement(element);
                     sandbox.getModule(moduleName).dimElement(element);

+                }

             });
         },
         jumpToDocumentElement: function(element) {
             });
         },
         jumpToDocumentElement: function(element) {


@@ -74,19 +45,6 @@ return function(sandbox) {
         },
         updateCurrentTextElement: function(textElement) {
             sandbox.getModule('nodeFamilyTree').setElement(textElement);
         },
         updateCurrentTextElement: function(textElement) {
             sandbox.getModule('nodeFamilyTree').setElement(textElement);

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

         }
     };
     
         }
     };
     


@@ -109,11 +67,6 @@ return function(sandbox) {
     
     views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
 
     
     views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
 

-    views.mainTabs.on('tabSelected', function(event) {
-        if(event.prevSlug) {
-            synchronizeTab(event.prevSlug);
-        }
-    });

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


@@ -123,12 +76,6 @@ return function(sandbox) {
         ready: function() {
             addMainTab(gettext('Source'), 'sourceEditor',  sandbox.getModule('sourceEditor').getView());
             sandbox.getModule('sourceEditor').setDocument(sandbox.getModule('data').getDocument());
         ready: function() {
             addMainTab(gettext('Source'), 'sourceEditor',  sandbox.getModule('sourceEditor').getView());
             sandbox.getModule('sourceEditor').setDocument(sandbox.getModule('data').getDocument());

-        },
-        xmlChanged: function() {
-            dirty.sourceEditor = true;
-        },
-        documentSet: function() {
-            dirty.sourceEditor = false;

         }
     };
     
         }
     };
     


@@ -140,14 +87,12 @@ return function(sandbox) {
                 sandbox.getModule(moduleName).start();
             });
         },
                 sandbox.getModule(moduleName).start();
             });
         },

-        documentChanged: function(document, reason) {
-            commands.resetDocument(document, reason);
-        },

         savingStarted: function() {
             sandbox.getModule('mainBar').setCommandEnabled('save', false);
             sandbox.getModule('indicator').showMessage(gettext('Saving...'));
         },
         savingEnded: function(status) {
         savingStarted: function() {
             sandbox.getModule('mainBar').setCommandEnabled('save', false);
             sandbox.getModule('indicator').showMessage(gettext('Saving...'));
         },
         savingEnded: function(status) {

+            void(status);

             sandbox.getModule('mainBar').setCommandEnabled('save', true);
             sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
         },
             sandbox.getModule('mainBar').setCommandEnabled('save', true);
             sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
         },


@@ -162,7 +107,6 @@ return function(sandbox) {
             sandbox.getModule('diffViewer').setDiff(diff);
         },
         documentReverted: function(event) {
             sandbox.getModule('diffViewer').setDiff(diff);
         },
         documentReverted: function(event) {

-            commands.resetDocument(event.document, 'revert');

             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('mainBar').setCommandEnabled('save', true);
             sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'});
             sandbox.getModule('mainBar').setVersion(event.current_version);


@@ -175,7 +119,6 @@ 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() {

-            synchronizeTab(views.mainTabs.getCurrentSlug());

             sandbox.getModule('data').saveDocument();
         }
     };
             sandbox.getModule('data').saveDocument();
         }
     };


@@ -193,9 +136,6 @@ return function(sandbox) {
             sandbox.getModule('documentCanvas').setDocument(sandbox.getModule('data').getDocument());
             views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
         },
             sandbox.getModule('documentCanvas').setDocument(sandbox.getModule('data').getDocument());
             views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
         },

-        documentSet: function() {
-            dirty.documentCanvas = false;
-        },

         
         currentTextElementSet: function(textElement) {
             commands.updateCurrentTextElement(textElement);
         
         currentTextElementSet: function(textElement) {
             commands.updateCurrentTextElement(textElement);


@@ -207,11 +147,6 @@ return function(sandbox) {
         
         currentNodeElementChanged: function(nodeElement) {
             commands.updateCurrentNodeElement(nodeElement);
         
         currentNodeElementChanged: function(nodeElement) {
             commands.updateCurrentNodeElement(nodeElement);

-            dirty.documentCanvas = true;
-        },
-
-        contentChanged: function() {
-            dirty.documentCanvas = true;

         },
 
         nodeHovered: function(canvasNode) {
         },
 
         nodeHovered: function(canvasNode) {


@@ -237,27 +172,21 @@ return function(sandbox) {
         ready: function() {
             sandbox.getModule('metadataEditor').setDocument(sandbox.getModule('data').getDocument());
             views.visualEditingSidebar.addTab({icon: 'info-sign'}, 'metadataEditor', sandbox.getModule('metadataEditor').getView());
         ready: function() {
             sandbox.getModule('metadataEditor').setDocument(sandbox.getModule('data').getDocument());
             views.visualEditingSidebar.addTab({icon: 'info-sign'}, 'metadataEditor', sandbox.getModule('metadataEditor').getView());

-        },
-        metadataChanged: function(metadata) {
-            dirty.metadataEditor = true;
-        },
-        metadataSet: function() {
-            dirty.metadataEditor = false;
-        },
+        }

     };
     
     eventHandlers.nodeFamilyTree = {
         ready: function() {
             views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
         },
     };
     
     eventHandlers.nodeFamilyTree = {
         ready: function() {
             views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
         },

-        elementEntered: function(element) {
-            commands.highlightDocumentElement(element, 'nodeFamilyTree');
+        nodeEntered: function(node) {
+            commands.highlightDocumentElement(node, 'nodeFamilyTree');

         },
         },

-        elementLeft: function(element) {
-            commands.dimDocumentElement(element, 'nodeFamilyTree');
+        nodeLeft: function(node) {
+            commands.dimDocumentElement(node, 'nodeFamilyTree');

         },
         },

-        elementClicked: function(element) {
-            commands.jumpToDocumentElement(element);
+        nodeClicked: function(node) {
+            commands.jumpToDocumentElement(node);

         }
     };
     
         }
     };
     


@@ -282,7 +211,7 @@ return function(sandbox) {
         },
         elementClicked: function(element) {
             commands.jumpToDocumentElement(element);
         },
         elementClicked: function(element) {
             commands.jumpToDocumentElement(element);

-        }        
+        }

     };
     
     eventHandlers.documentHistory = {
     };
     
     eventHandlers.documentHistory = {


@@ -297,6 +226,7 @@ return function(sandbox) {
             sandbox.getModule('data').restoreVersion(event);
         },
         displayVersion: function(event) {
             sandbox.getModule('data').restoreVersion(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());
         }
     };


@@ -314,9 +244,7 @@ return function(sandbox) {
             sandbox.getModule('data').start();
         },
         handleEvent: function(moduleName, eventName, args) {
             sandbox.getModule('data').start();
         },
         handleEvent: function(moduleName, eventName, args) {

-            if('')
-                wysiwigHandler.handleEvent(moduleName, eventName, args);
-            else if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
+            if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {

                 eventHandlers[moduleName][eventName].apply(eventHandlers, args);
             }
         }
                 eventHandlers[moduleName][eventName].apply(eventHandlers, args);
             }
         }