Clean up: removing unused template

[fnpeditor.git] / modules / rng / rng.js

diff --git a/modules/rng/rng.js b/modules/rng/rng.js
index 8202346..3b41394 100644 (file)
--- a/modules/rng/rng.js
+++ b/modules/rng/rng.js
@@ -4,23 +4,17 @@ define([
 'views/tabs/tabs',\r
 'libs/text!./mainLayout.html',\r
 'libs/text!./editingLayout.html',\r
 'views/tabs/tabs',\r
 'libs/text!./mainLayout.html',\r
 'libs/text!./editingLayout.html',\r

-], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate) {\r
+'libs/text!./diffLayout.html',\r
+], function(layout, vbox, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {\r
+\r
+'use strict';\r

 \r
 return function(sandbox) {\r
 \r
 return function(sandbox) {\r

-    'use strict';\r

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

-    function tabIsDirty(slug) {\r
-        if(slug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor))\r
-            return true;\r
-        if(slug === 'sourceEditor' && dirty.sourceEditor)\r
-            return true;\r
-        return false;\r
-    }\r
-    \r

     var dirty = {\r
         sourceEditor: false,\r
         documentCanvas: false,\r
     var dirty = {\r
         sourceEditor: false,\r
         documentCanvas: false,\r


@@ -28,17 +22,30 @@ return function(sandbox) {
     };\r
     \r
     var synchronizeTab = function(slug) {\r
     };\r
     \r
     var synchronizeTab = function(slug) {\r

+        function tabIsDirty(slug) {\r
+            if(slug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor))\r
+                return true;\r
+            if(slug === 'sourceEditor' && dirty.sourceEditor)\r
+                return true;\r
+            return false;\r
+        }\r
+    \r

         if(tabIsDirty(slug)) {\r
         if(tabIsDirty(slug)) {\r

+            var reason, doc;\r

             if(slug === 'sourceEditor') {\r
             if(slug === 'sourceEditor') {\r

-                sandbox.getModule('data').commitDocument(sandbox.getModule('sourceEditor').getDocument(), 'source_edit');\r
+                doc = sandbox.getModule('sourceEditor').getDocument();\r
+                reason = 'source_edit';\r
+                dirty.sourceEditor = false;\r

             }\r
             if(slug === 'editor') {\r
                 var doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();\r
                 if(dirty.metadataEditor) {\r
                     doc = sandbox.getModule('metadataEditor').attachMetadata(doc);\r
                 }\r
             }\r
             if(slug === 'editor') {\r
                 var doc = dirty.documentCanvas ? sandbox.getModule('documentCanvas').getDocument() : sandbox.getModule('data').getDocument();\r
                 if(dirty.metadataEditor) {\r
                     doc = sandbox.getModule('metadataEditor').attachMetadata(doc);\r
                 }\r

-                sandbox.getModule('data').commitDocument(doc, 'edit');\r
+                reason = 'edit';\r
+                dirty.documentCanvas = dirty.metadataEditor = false;\r

             }\r
             }\r

+            sandbox.getModule('data').commitDocument(doc, reason);\r

         }\r
     }\r
     \r
         }\r
     }\r
     \r


@@ -61,6 +68,19 @@ return function(sandbox) {
             sandbox.getModule('nodeFamilyTree').setNode(wlxmlNode);\r
             sandbox.getModule('nodeBreadCrumbs').setNode(wlxmlNode);\r
             \r
             sandbox.getModule('nodeFamilyTree').setNode(wlxmlNode);\r
             sandbox.getModule('nodeBreadCrumbs').setNode(wlxmlNode);\r
             \r

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

         }\r
     }\r
     \r
         }\r
     }\r
     \r


@@ -70,12 +90,15 @@ return function(sandbox) {
         mainTabs: (new tabs.View()).render(),\r
         visualEditing: new layout.Layout(visualEditingLayoutTemplate),\r
         visualEditingSidebar: (new tabs.View({stacked: true})).render(),\r
         mainTabs: (new tabs.View()).render(),\r
         visualEditing: new layout.Layout(visualEditingLayoutTemplate),\r
         visualEditingSidebar: (new tabs.View({stacked: true})).render(),\r

-        currentNodePaneLayout: new vbox.VBox()\r
+        currentNodePaneLayout: new vbox.VBox(),\r
+        diffLayout: new layout.Layout(diffLayoutTemplate)\r

     }\r
     \r
     views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());\r
     addMainTab('Edytor', 'editor', views.visualEditing.getAsView());\r
     \r
     }\r
     \r
     views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());\r
     addMainTab('Edytor', 'editor', views.visualEditing.getAsView());\r
     \r

+    addMainTab('Historia', 'history', views.diffLayout.getAsView());\r
+    \r

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


@@ -107,20 +130,12 @@ return function(sandbox) {
         ready: function() {\r
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());\r
             \r
         ready: function() {\r
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());\r
             \r

-            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator'], function(moduleName) {\r
+            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'nodePane', 'metadataEditor', 'nodeFamilyTree', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer'], function(moduleName) {\r

                 sandbox.getModule(moduleName).start();\r
             });\r
         },\r
         documentChanged: function(document, reason) {\r
                 sandbox.getModule(moduleName).start();\r
             });\r
         },\r
         documentChanged: function(document, reason) {\r

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

         },\r
         savingStarted: function() {\r
             sandbox.getModule('mainBar').setCommandEnabled('save', false);\r
         },\r
         savingStarted: function() {\r
             sandbox.getModule('mainBar').setCommandEnabled('save', false);\r


@@ -128,7 +143,22 @@ return function(sandbox) {
         },\r
         savingEnded: function(status) {\r
             sandbox.getModule('mainBar').setCommandEnabled('save', true);\r
         },\r
         savingEnded: function(status) {\r
             sandbox.getModule('mainBar').setCommandEnabled('save', true);\r

-            sandbox.getModule('indicator').clearMessage();\r
+            sandbox.getModule('indicator').clearMessage({message:'Dokument zapisany'});\r
+        },\r
+        restoringStarted: function(event) {\r
+            sandbox.getModule('mainBar').setCommandEnabled('save', false);\r
+            sandbox.getModule('indicator').showMessage(gettext('Restoring version ' + event.version + '...'));\r
+        },\r
+        historyItemAdded: function(item) {\r
+            sandbox.getModule('documentHistory').addHistory([item], {animate: true});\r
+        },\r
+        diffFetched: function(diff) {\r
+            sandbox.getModule('diffViewer').setDiff(diff);\r
+        },\r
+        documentReverted: function(event) {\r
+            commands.resetDocument(event.document, 'revert');\r
+            sandbox.getModule('mainBar').setCommandEnabled('save', true);\r
+            sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.version + ' przywrócona'});\r

         }\r
     }\r
     \r
         }\r
     }\r
     \r


@@ -245,6 +275,28 @@ return function(sandbox) {
         }        \r
     }\r
     \r
         }        \r
     }\r
     \r

+    eventHandlers.documentHistory = {\r
+        ready: function() {\r
+            sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());\r
+            views.diffLayout.setView('left', sandbox.getModule('documentHistory').getView());\r
+        },\r
+        compare: function(ver1, ver2) {\r
+            sandbox.getModule('data').fetchDiff(ver1, ver2);\r
+        },\r
+        restoreVersion: function(event) {\r
+            sandbox.getModule('data').restoreVersion(event);\r
+        },\r
+        displayVersion: function(event) {\r
+            window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());\r
+        }\r
+    }\r
+    \r
+    eventHandlers.diffViewer = {\r
+        ready: function() {\r
+            views.diffLayout.setView('right', sandbox.getModule('diffViewer').getView());\r
+        }\r
+    }\r
+    \r

     /* api */\r
     \r
     return {\r
     /* api */\r
     \r
     return {\r