X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/2a66af7ee0ee2d9943f58db45417b78764a43483..7db05b4e147b27b77a9fde2638a72e3c2d61a7fa:/modules/rng/rng.js

diff --git a/modules/rng/rng.js b/modules/rng/rng.js
index 43216bd..1ecdc4e 100644
--- a/modules/rng/rng.js
+++ b/modules/rng/rng.js
@@ -1,278 +1,325 @@
-define([
-'fnpjs/layout',
-'fnpjs/vbox',
-'views/tabs/tabs',
-'libs/text!./mainLayout.html',
-'libs/text!./editingLayout.html',
-], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate) {
-
-'use strict';
-
-return function(sandbox) {
-    
-    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';
-            }
-            if(slug === 'editor') {
-                var doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();
-                if(dirty.metadataEditor) {
-                    doc = sandbox.getModule('metadataEditor').attachMetadata(doc);
-                }
-                reason = 'edit';
-            }
-            sandbox.getModule('data').commitDocument(doc, reason);
-        }
-    }
-    
-    var commands = {
-        highlightDocumentNode: function(wlxmlNode, origin) {
-            ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {
-                if(!origin || moduleName != origin)
-                    sandbox.getModule(moduleName).highlightNode(wlxmlNode)
-            });
-        },
-        dimDocumentNode: function(wlxmlNode, origin) {
-            ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {
-                if(!origin || moduleName != origin)
-                    sandbox.getModule(moduleName).dimNode(wlxmlNode)
-            });
-        },
-        selectNode: function(wlxmlNode, origin) {
-            sandbox.getModule('documentCanvas').selectNode(wlxmlNode);
-            sandbox.getModule('nodePane').setNode(wlxmlNode);
-            sandbox.getModule('nodeFamilyTree').setNode(wlxmlNode);
-            sandbox.getModule('nodeBreadCrumbs').setNode(wlxmlNode);
-            
-        }
-    }
-    
-
-    var views = {
-        mainLayout: new layout.Layout(mainLayoutTemplate),
-        mainTabs: (new tabs.View()).render(),
-        visualEditing: new layout.Layout(visualEditingLayoutTemplate),
-        visualEditingSidebar: (new tabs.View({stacked: true})).render(),
-        currentNodePaneLayout: new vbox.VBox()
-    }
-    
-    views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());
-    addMainTab('Edytor', 'editor', views.visualEditing.getAsView());
-    
-    sandbox.getDOM().append(views.mainLayout.getAsView());
-    
-    views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
-
-    views.mainTabs.on('tabSelected', function(event) {
-        if(event.prevSlug) {
-            synchronizeTab(event.prevSlug);
-        }
-    });
-    
-    /* Events handling */
-    
-    var eventHandlers = {};
-     
-    eventHandlers.sourceEditor = {
-        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;
-        }
-    };
-    
-    eventHandlers.data = {
-        ready: function() {
-            views.mainLayout.setView('mainView', views.mainTabs.getAsView());
-            
-            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory'], function(moduleName) {
-                sandbox.getModule(moduleName).start();
-            });
-        },
-        documentChanged: function(document, reason) {
-            var modules = [];
-            if(reason === 'source_edit')
-                modules = ['documentCanvas', 'metadataEditor'];
-            else if (reason === 'edit')
-                modules = ['sourceEditor'];
-                
-            modules.forEach(function(moduleName) {
-                sandbox.getModule(moduleName).setDocument(document);
-            });
-        },
-        savingStarted: function() {
-            sandbox.getModule('mainBar').setCommandEnabled('save', false);
-            sandbox.getModule('indicator').showMessage(gettext('Saving...'));
-        },
-        savingEnded: function(status) {
-            sandbox.getModule('mainBar').setCommandEnabled('save', true);
-            sandbox.getModule('indicator').clearMessage();
-        },
-        historyItemAdded: function(item) {
-            sandbox.getModule('documentHistory').addHistory([item], {animate: true});
-        }
-    }
-    
-    eventHandlers.mainBar = {
-        ready: function() {
-            views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
-        },
-        'cmd.save': function() {
-            synchronizeTab(views.mainTabs.getCurrentSlug());
-            sandbox.getModule('data').saveDocument();
-        }
-    }
-    
-    eventHandlers.indicator = {
-        ready: function() {
-            views.mainLayout.setView('messages', sandbox.getModule('indicator').getView());
-        }
-    };
-    
-
-    
-    eventHandlers.documentCanvas = {
-        ready: function() {
-            sandbox.getModule('documentCanvas').setDocument(sandbox.getModule('data').getDocument());
-            views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
-        },
-        documentSet: function() {
-            dirty.documentCanvas = false;
-        },
-        
-        nodeSelected: function(wlxmlNode) {
-            commands.selectNode(wlxmlNode);
-        },
-        
-        contentChanged: function() {
-            dirty.documentCanvas = true;
-        },
-        
-        nodeHovered: function(wlxmlNode) {
-            commands.highlightDocumentNode(wlxmlNode);
-        },
-        
-        nodeBlured: function(wlxmlNode) {
-            commands.dimDocumentNode(wlxmlNode);
-        }
-    };
-
-    eventHandlers.nodePane = {
-        ready: function() {
-            views.currentNodePaneLayout.appendView(sandbox.getModule('nodePane').getView());
-        },
-        
-        nodeChanged: function(attr, value) {
-            sandbox.getModule('documentCanvas').modifyCurrentNode(attr, value);
-        }
-    };
-    
-    eventHandlers.metadataEditor = {
-        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());
-        },
-        nodeEntered: function(wlxmlNode) {
-            commands.highlightDocumentNode(wlxmlNode, 'nodeFamilyTree');
-        },
-        nodeLeft: function(wlxmlNode) {
-            commands.dimDocumentNode(wlxmlNode, 'nodeFamilyTree');
-        },
-        nodeSelected: function(wlxmlNode) {
-            commands.selectNode(wlxmlNode);
-        }
-    };
-    
-    eventHandlers.documentToolbar = {
-        ready: function() {
-            views.visualEditing.setView('toolbar', sandbox.getModule('documentToolbar').getView());
-        },
-        toggleGrid: function(toggle) {
-            sandbox.getModule('documentCanvas').toggleGrid(toggle);
-        },
-        newNodeRequested: function(wlxmlTag, wlxmlClass) {
-            if(window.getSelection().isCollapsed) {
-                sandbox.getModule('documentCanvas').insertNewNode(wlxmlTag, wlxmlClass);
-            } else {
-                sandbox.getModule('documentCanvas').wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);
-            }
-        }
-    };
-    
-    eventHandlers.nodeBreadCrumbs = {
-        ready: function() {
-            views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());
-        },
-        nodeHighlighted: function(wlxmlNode) {
-            commands.highlightDocumentNode(wlxmlNode, 'nodeBreadCrumbs');
-        },
-        nodeDimmed: function(wlxmlNode) {
-            commands.dimDocumentNode(wlxmlNode, 'nodeBreadCrumbs');
-        },
-        nodeSelected: function(wlxmlNode) {
-            commands.selectNode(wlxmlNode);
-        }        
-    }
-    
-    eventHandlers.documentHistory = {
-        ready: function() {
-            sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());
-            addMainTab('Historia', 'history', sandbox.getModule('documentHistory').getView());
-        }
-    }
-    
-    /* api */
-    
-    return {
-        start: function() {
-            sandbox.getModule('data').start();
-        },
-        handleEvent: function(moduleName, eventName, args) {
-            if('')
-                wysiwigHandler.handleEvent(moduleName, eventName, args);
-            else if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
-                eventHandlers[moduleName][eventName].apply(eventHandlers, args);
-            }
-        }
-    }
-};
-
+define([
+'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) {
+
+'use strict';
+
+return function(sandbox) {
+    
+    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'
+            ['documentCanvas', ].forEach(function(moduleName) {
+                if(!origin || moduleName != origin)
+                    sandbox.getModule(moduleName).highlightElement(element);
+            });
+        },
+        dimDocumentElement: function(element, origin) {
+            //'nodeBreadCrumbs', 'nodeFamilyTree'
+            ['documentCanvas'].forEach(function(moduleName) {
+                if(!origin || moduleName != origin)
+                    sandbox.getModule(moduleName).dimElement(element);
+            });
+        },
+        jumpToDocumentElement: function(element) {
+            sandbox.getModule('documentCanvas').jumpToElement(element);
+        },
+        updateCurrentNodeElement: function(nodeElement) {
+            sandbox.getModule('nodePane').setNodeElement(nodeElement);
+            sandbox.getModule('nodeFamilyTree').setElement(nodeElement);
+            sandbox.getModule('nodeBreadCrumbs').setNodeElement(nodeElement);
+        },
+        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);
+            });
+        }
+    };
+    
+
+    var views = {
+        mainLayout: new layout.Layout(mainLayoutTemplate),
+        mainTabs: (new tabs.View()).render(),
+        visualEditing: new layout.Layout(visualEditingLayoutTemplate),
+        visualEditingSidebar: (new tabs.View({stacked: true})).render(),
+        currentNodePaneLayout: new vbox.VBox(),
+        diffLayout: new layout.Layout(diffLayoutTemplate)
+    };
+    
+    views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());
+    addMainTab('Edytor', 'editor', views.visualEditing.getAsView());
+    addMainTab(gettext('Source'), 'sourceEditor',  '');
+    addMainTab('Historia', 'history', views.diffLayout.getAsView());
+    
+    sandbox.getDOM().append(views.mainLayout.getAsView());
+    
+    views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
+
+    views.mainTabs.on('tabSelected', function(event) {
+        if(event.prevSlug) {
+            synchronizeTab(event.prevSlug);
+        }
+    });
+    
+    /* Events handling */
+    
+    var eventHandlers = {};
+     
+    eventHandlers.sourceEditor = {
+        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;
+        }
+    };
+    
+    eventHandlers.data = {
+        ready: function() {
+            views.mainLayout.setView('mainView', views.mainTabs.getAsView());
+            
+            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {
+                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) {
+            sandbox.getModule('mainBar').setCommandEnabled('save', true);
+            sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});
+        },
+        restoringStarted: function(event) {
+            sandbox.getModule('mainBar').setCommandEnabled('save', false);
+            sandbox.getModule('indicator').showMessage(gettext('Restoring version ') + event.version + '...');
+        },
+        historyItemAdded: function(item) {
+            sandbox.getModule('documentHistory').addHistory([item], {animate: true});
+        },
+        diffFetched: function(diff) {
+            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);
+        }
+    };
+    
+    eventHandlers.mainBar = {
+        ready: function() {
+            sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocumentVersion());
+            views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());
+        },
+        'cmd.save': function() {
+            synchronizeTab(views.mainTabs.getCurrentSlug());
+            sandbox.getModule('data').saveDocument();
+        }
+    };
+    
+    eventHandlers.indicator = {
+        ready: function() {
+            views.mainLayout.setView('messages', sandbox.getModule('indicator').getView());
+        }
+    };
+    
+
+    
+    eventHandlers.documentCanvas = {
+        ready: function() {
+            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);
+        },
+
+        currentNodeElementSet: function(nodeElement) {
+            commands.updateCurrentNodeElement(nodeElement);
+        },
+        
+        currentNodeElementChanged: function(nodeElement) {
+            commands.updateCurrentNodeElement(nodeElement);
+        },
+
+        contentChanged: function() {
+            dirty.documentCanvas = true;
+        },
+
+        nodeHovered: function(canvasNode) {
+            commands.highlightDocumentNode(canvasNode);
+        },
+        
+        nodeBlured: function(canvasNode) {
+            commands.dimDocumentNode(canvasNode);
+        }
+    };
+
+    eventHandlers.nodePane = {
+        ready: function() {
+            views.currentNodePaneLayout.appendView(sandbox.getModule('nodePane').getView());
+        },
+        
+        nodeElementChange: function(attr, value) {
+            sandbox.getModule('documentCanvas').modifyCurrentNodeElement(attr, value);
+        }
+    };
+    
+    eventHandlers.metadataEditor = {
+        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());
+        },
+        elementEntered: function(element) {
+            commands.highlightDocumentElement(element, 'nodeFamilyTree');
+        },
+        elementLeft: function(element) {
+            commands.dimDocumentElement(element, 'nodeFamilyTree');
+        },
+        elementClicked: function(element) {
+            commands.jumpToDocumentElement(element);
+        }
+    };
+    
+    eventHandlers.documentToolbar = {
+        ready: function() {
+            views.visualEditing.setView('toolbar', sandbox.getModule('documentToolbar').getView());
+        },
+        command: function(cmd, params) {
+            sandbox.getModule('documentCanvas').command(cmd, params);
+        }
+    };
+    
+    eventHandlers.nodeBreadCrumbs = {
+        ready: function() {
+            views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());
+        },
+        elementEntered: function(element) {
+            commands.highlightDocumentElement(element, 'nodeBreadCrumbs');
+        },
+        elementLeft: function(element) {
+            commands.dimDocumentElement(element, 'nodeBreadCrumbs');
+        },
+        elementClicked: function(element) {
+            commands.jumpToDocumentElement(element);
+        }        
+    };
+    
+    eventHandlers.documentHistory = {
+        ready: function() {
+            sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());
+            views.diffLayout.setView('left', sandbox.getModule('documentHistory').getView());
+        },
+        compare: function(ver1, ver2) {
+            sandbox.getModule('data').fetchDiff(ver1, ver2);
+        },
+        restoreVersion: function(event) {
+            sandbox.getModule('data').restoreVersion(event);
+        },
+        displayVersion: function(event) {
+            window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());
+        }
+    };
+    
+    eventHandlers.diffViewer = {
+        ready: function() {
+            views.diffLayout.setView('right', sandbox.getModule('diffViewer').getView());
+        }
+    };
+    
+    /* api */
+    
+    return {
+        start: function() {
+            sandbox.getModule('data').start();
+        },
+        handleEvent: function(moduleName, eventName, args) {
+            if('')
+                wysiwigHandler.handleEvent(moduleName, eventName, args);
+            else if(eventHandlers[moduleName] && eventHandlers[moduleName][eventName]) {
+                eventHandlers[moduleName][eventName].apply(eventHandlers, args);
+            }
+        }
+    };
+};
+
 });
\ No newline at end of file