integration wip: ctrl + enter

[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 6b10293..52aaa51 100644 (file)
--- a/src/editor/modules/rng/rng.js
+++ b/src/editor/modules/rng/rng.js
@@ -14,52 +14,18 @@ return function(sandbox) {
     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) {
+            ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) {

                 if(!origin || moduleName != origin)
                     sandbox.getModule(moduleName).highlightElement(element);
             });
         },
         dimDocumentElement: function(element, origin) {
             //'nodeBreadCrumbs', 'nodeFamilyTree'
                 if(!origin || moduleName != origin)
                     sandbox.getModule(moduleName).highlightElement(element);
             });
         },
         dimDocumentElement: function(element, origin) {
             //'nodeBreadCrumbs', 'nodeFamilyTree'

-            ['documentCanvas'].forEach(function(moduleName) {
+            ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) {

                 if(!origin || moduleName != origin)
                     sandbox.getModule(moduleName).dimElement(element);
             });
                 if(!origin || moduleName != origin)
                     sandbox.getModule(moduleName).dimElement(element);
             });


@@ -109,11 +75,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 +84,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;

         }
     };
     
         }
     };
     


@@ -190,12 +145,9 @@ return function(sandbox) {
     
     eventHandlers.documentCanvas = {
         ready: function() {
     
     eventHandlers.documentCanvas = {
         ready: function() {

-            sandbox.getModule('documentCanvas').setDocument2(sandbox.getModule('data').getDocument2());
+            sandbox.getModule('documentCanvas').setDocument(sandbox.getModule('data').getDocument());

             views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
         },
             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 +159,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 +184,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);

         }
     };
     
         }
     };