X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/6384a81fa481cb43fddca23742e37761592be66d..b20691e774cac0cbf2ee174472a1b1dbc94fa61b:/modules/rng/rng.js?ds=sidebyside

diff --git a/modules/rng/rng.js b/modules/rng/rng.js
index 8202346..4189902 100644
--- a/modules/rng/rng.js
+++ b/modules/rng/rng.js
@@ -4,23 +4,17 @@ define([
 'views/tabs/tabs',
 'libs/text!./mainLayout.html',
 'libs/text!./editingLayout.html',
-], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate) {
+'libs/text!./diffLayout.html',
+], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
+
+'use strict';
 
 return function(sandbox) {
-    'use strict';
     
     function addMainTab(title, slug, view) {
         views.mainTabs.addTab(title, slug, view);
     }
     
-    function tabIsDirty(slug) {
-        if(slug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor))
-            return true;
-        if(slug === 'sourceEditor' && dirty.sourceEditor)
-            return true;
-        return false;
-    }
-    
     var dirty = {
         sourceEditor: false,
         documentCanvas: false,
@@ -28,39 +22,65 @@ return function(sandbox) {
     };
     
     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') {
-                sandbox.getModule('data').commitDocument(sandbox.getModule('sourceEditor').getDocument(), 'source_edit');
+                doc = sandbox.getModule('sourceEditor').getDocument();
+                reason = 'source_edit';
+                dirty.sourceEditor = false;
             }
             if(slug === 'editor') {
                 var doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();
                 if(dirty.metadataEditor) {
                     doc = sandbox.getModule('metadataEditor').attachMetadata(doc);
                 }
-                sandbox.getModule('data').commitDocument(doc, 'edit');
+                reason = 'edit';
+                dirty.documentCanvas = dirty.metadataEditor = false;
             }
+            sandbox.getModule('data').commitDocument(doc, reason);
         }
     }
     
     var commands = {
-        highlightDocumentNode: function(wlxmlNode, origin) {
+        highlightDocumentNode: function(canvasNode, origin) {
             ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {
                 if(!origin || moduleName != origin)
-                    sandbox.getModule(moduleName).highlightNode(wlxmlNode)
+                    sandbox.getModule(moduleName).highlightNode(canvasNode)
             });
         },
-        dimDocumentNode: function(wlxmlNode, origin) {
+        dimDocumentNode: function(canvasNode, origin) {
             ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {
                 if(!origin || moduleName != origin)
-                    sandbox.getModule(moduleName).dimNode(wlxmlNode)
+                    sandbox.getModule(moduleName).dimNode(canvasNode)
             });
         },
-        selectNode: function(wlxmlNode, origin) {
-            sandbox.getModule('documentCanvas').selectNode(wlxmlNode);
-            sandbox.getModule('nodePane').setNode(wlxmlNode);
-            sandbox.getModule('nodeFamilyTree').setNode(wlxmlNode);
-            sandbox.getModule('nodeBreadCrumbs').setNode(wlxmlNode);
+        selectNode: function(canvasNode, origin) {
+            sandbox.getModule('documentCanvas').selectNode(canvasNode);
+            sandbox.getModule('nodePane').setNode(canvasNode);
+            sandbox.getModule('nodeFamilyTree').setNode(canvasNode);
+            sandbox.getModule('nodeBreadCrumbs').setNode(canvasNode);
             
+        },
+        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);
+            });
         }
     }
     
@@ -70,11 +90,14 @@ return function(sandbox) {
         mainTabs: (new tabs.View()).render(),
         visualEditing: new layout.Layout(visualEditingLayoutTemplate),
         visualEditingSidebar: (new tabs.View({stacked: true})).render(),
-        currentNodePaneLayout: new vbox.VBox()
+        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());
     
@@ -107,20 +130,12 @@ return function(sandbox) {
         ready: function() {
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());
             
-            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator'], function(moduleName) {
+            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], 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);
-            });
+            commands.resetDocument(document, reason);
         },
         savingStarted: function() {
             sandbox.getModule('mainBar').setCommandEnabled('save', false);
@@ -128,12 +143,29 @@ return function(sandbox) {
         },
         savingEnded: function(status) {
             sandbox.getModule('mainBar').setCommandEnabled('save', true);
-            sandbox.getModule('indicator').clearMessage();
+            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() {
@@ -159,20 +191,20 @@ return function(sandbox) {
             dirty.documentCanvas = false;
         },
         
-        nodeSelected: function(wlxmlNode) {
-            commands.selectNode(wlxmlNode);
+        nodeSelected: function(canvasNode) {
+            commands.selectNode(canvasNode);
         },
         
         contentChanged: function() {
             dirty.documentCanvas = true;
         },
         
-        nodeHovered: function(wlxmlNode) {
-            commands.highlightDocumentNode(wlxmlNode);
+        nodeHovered: function(canvasNode) {
+            commands.highlightDocumentNode(canvasNode);
         },
         
-        nodeBlured: function(wlxmlNode) {
-            commands.dimDocumentNode(wlxmlNode);
+        nodeBlured: function(canvasNode) {
+            commands.dimDocumentNode(canvasNode);
         }
     };
 
@@ -203,14 +235,14 @@ return function(sandbox) {
         ready: function() {
             views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
         },
-        nodeEntered: function(wlxmlNode) {
-            commands.highlightDocumentNode(wlxmlNode, 'nodeFamilyTree');
+        nodeEntered: function(canvasNode) {
+            commands.highlightDocumentNode(canvasNode, 'nodeFamilyTree');
         },
-        nodeLeft: function(wlxmlNode) {
-            commands.dimDocumentNode(wlxmlNode, 'nodeFamilyTree');
+        nodeLeft: function(canvasNode) {
+            commands.dimDocumentNode(canvasNode, 'nodeFamilyTree');
         },
-        nodeSelected: function(wlxmlNode) {
-            commands.selectNode(wlxmlNode);
+        nodeSelected: function(canvasNode) {
+            commands.selectNode(canvasNode);
         }
     };
     
@@ -222,11 +254,10 @@ return function(sandbox) {
             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);
-            }
+        },
+        command: function(cmd, meta) {
+            sandbox.getModule('documentCanvas').command(cmd, meta);
         }
     };
     
@@ -234,17 +265,39 @@ return function(sandbox) {
         ready: function() {
             views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());
         },
-        nodeHighlighted: function(wlxmlNode) {
-            commands.highlightDocumentNode(wlxmlNode, 'nodeBreadCrumbs');
+        nodeHighlighted: function(canvasNode) {
+            commands.highlightDocumentNode(canvasNode, 'nodeBreadCrumbs');
         },
-        nodeDimmed: function(wlxmlNode) {
-            commands.dimDocumentNode(wlxmlNode, 'nodeBreadCrumbs');
+        nodeDimmed: function(canvasNode) {
+            commands.dimDocumentNode(canvasNode, 'nodeBreadCrumbs');
         },
-        nodeSelected: function(wlxmlNode) {
-            commands.selectNode(wlxmlNode);
+        nodeSelected: function(canvasNode) {
+            commands.selectNode(canvasNode);
         }        
     }
     
+    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 {