Fixing wrapping text when text not in first node of its parent

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

diff --git a/modules/rng/rng.js b/modules/rng/rng.js
index 6029e7c..4189902 100644 (file)
--- a/modules/rng/rng.js
+++ b/modules/rng/rng.js
@@ -4,10 +4,12 @@ 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
     function addMainTab(title, slug, view) {\r
         views.mainTabs.addTab(title, slug, view);\r


@@ -19,25 +21,66 @@ return function(sandbox) {
         metadataEditor: false,\r
     };\r
     \r
         metadataEditor: false,\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
+            var reason, doc;\r
+            if(slug === 'sourceEditor') {\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
+                reason = 'edit';\r
+                dirty.documentCanvas = dirty.metadataEditor = false;\r
+            }\r
+            sandbox.getModule('data').commitDocument(doc, reason);\r
+        }\r
+    }\r
+    \r

     var commands = {\r
     var commands = {\r

-        highlightDocumentNode: function(wlxmlNode, origin) {\r
+        highlightDocumentNode: function(canvasNode, origin) {\r

             ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {\r
                 if(!origin || moduleName != origin)\r
             ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {\r
                 if(!origin || moduleName != origin)\r

-                    sandbox.getModule(moduleName).highlightNode(wlxmlNode)\r
+                    sandbox.getModule(moduleName).highlightNode(canvasNode)\r

             });\r
         },\r
             });\r
         },\r

-        dimDocumentNode: function(wlxmlNode, origin) {\r
+        dimDocumentNode: function(canvasNode, origin) {\r

             ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {\r
                 if(!origin || moduleName != origin)\r
             ['documentCanvas', 'nodeBreadCrumbs', 'nodeFamilyTree'].forEach(function(moduleName) {\r
                 if(!origin || moduleName != origin)\r

-                    sandbox.getModule(moduleName).dimNode(wlxmlNode)\r
+                    sandbox.getModule(moduleName).dimNode(canvasNode)\r

             });\r
         },\r
             });\r
         },\r

-        selectNode: function(wlxmlNode, origin) {\r
-            sandbox.getModule('documentCanvas').selectNode(wlxmlNode);\r
-            sandbox.getModule('nodePane').setNode(wlxmlNode);\r
-            sandbox.getModule('nodeFamilyTree').setNode(wlxmlNode);\r
-            sandbox.getModule('nodeBreadCrumbs').setNode(wlxmlNode);\r
+        selectNode: function(canvasNode, origin) {\r
+            sandbox.getModule('documentCanvas').selectNode(canvasNode);\r
+            sandbox.getModule('nodePane').setNode(canvasNode);\r
+            sandbox.getModule('nodeFamilyTree').setNode(canvasNode);\r
+            sandbox.getModule('nodeBreadCrumbs').setNode(canvasNode);\r

             \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


@@ -47,11 +90,14 @@ 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
     views.visualEditing.setView('rightColumn', views.visualEditingSidebar.getAsView());\r
     addMainTab('Edytor', 'editor', views.visualEditing.getAsView());\r

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

     \r
     sandbox.getDOM().append(views.mainLayout.getAsView());\r
     \r
     \r
     sandbox.getDOM().append(views.mainLayout.getAsView());\r
     \r


@@ -59,17 +105,7 @@ return function(sandbox) {
 \r
     views.mainTabs.on('tabSelected', function(event) {\r
         if(event.prevSlug) {\r
 \r
     views.mainTabs.on('tabSelected', function(event) {\r
         if(event.prevSlug) {\r

-            if(event.prevSlug === 'sourceEditor' && dirty.sourceEditor) {\r
-                sandbox.getModule('data').commitDocument(sandbox.getModule('sourceEditor').getDocument(), 'source_edit');\r
-            }\r
-            if(event.prevSlug === 'editor' && (dirty.documentCanvas || dirty.metadataEditor)) {\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
-            }\r
-            \r
+            synchronizeTab(event.prevSlug);\r

         }\r
     });\r
     \r
         }\r
     });\r
     \r


@@ -94,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


@@ -115,16 +143,34 @@ 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.reverted_version + ' przywrócona'});\r
+            sandbox.getModule('mainBar').setVersion(event.current_version);\r

         }\r
     }\r
     \r
     eventHandlers.mainBar = {\r
         ready: function() {\r
         }\r
     }\r
     \r
     eventHandlers.mainBar = {\r
         ready: function() {\r

+            sandbox.getModule('mainBar').setVersion(sandbox.getModule('data').getDocumentVersion());\r

             views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());\r
         },\r
         'cmd.save': function() {\r
             views.mainLayout.setView('topPanel', sandbox.getModule('mainBar').getView());\r
         },\r
         'cmd.save': function() {\r

-            sandbox.getModule('data').fakeSave();\r
+            synchronizeTab(views.mainTabs.getCurrentSlug());\r
+            sandbox.getModule('data').saveDocument();\r

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


@@ -145,20 +191,20 @@ return function(sandbox) {
             dirty.documentCanvas = false;\r
         },\r
         \r
             dirty.documentCanvas = false;\r
         },\r
         \r

-        nodeSelected: function(wlxmlNode) {\r
-            commands.selectNode(wlxmlNode);\r
+        nodeSelected: function(canvasNode) {\r
+            commands.selectNode(canvasNode);\r

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

-        nodeHovered: function(wlxmlNode) {\r
-            commands.highlightDocumentNode(wlxmlNode);\r
+        nodeHovered: function(canvasNode) {\r
+            commands.highlightDocumentNode(canvasNode);\r

         },\r
         \r
         },\r
         \r

-        nodeBlured: function(wlxmlNode) {\r
-            commands.dimDocumentNode(wlxmlNode);\r
+        nodeBlured: function(canvasNode) {\r
+            commands.dimDocumentNode(canvasNode);\r

         }\r
     };\r
 \r
         }\r
     };\r
 \r


@@ -189,14 +235,14 @@ return function(sandbox) {
         ready: function() {\r
             views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());\r
         },\r
         ready: function() {\r
             views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());\r
         },\r

-        nodeEntered: function(wlxmlNode) {\r
-            commands.highlightDocumentNode(wlxmlNode, 'nodeFamilyTree');\r
+        nodeEntered: function(canvasNode) {\r
+            commands.highlightDocumentNode(canvasNode, 'nodeFamilyTree');\r

         },\r
         },\r

-        nodeLeft: function(wlxmlNode) {\r
-            commands.dimDocumentNode(wlxmlNode, 'nodeFamilyTree');\r
+        nodeLeft: function(canvasNode) {\r
+            commands.dimDocumentNode(canvasNode, 'nodeFamilyTree');\r

         },\r
         },\r

-        nodeSelected: function(wlxmlNode) {\r
-            commands.selectNode(wlxmlNode);\r
+        nodeSelected: function(canvasNode) {\r
+            commands.selectNode(canvasNode);\r

         }\r
     };\r
     \r
         }\r
     };\r
     \r


@@ -208,11 +254,10 @@ return function(sandbox) {
             sandbox.getModule('documentCanvas').toggleGrid(toggle);\r
         },\r
         newNodeRequested: function(wlxmlTag, wlxmlClass) {\r
             sandbox.getModule('documentCanvas').toggleGrid(toggle);\r
         },\r
         newNodeRequested: function(wlxmlTag, wlxmlClass) {\r

-            if(window.getSelection().isCollapsed) {\r

                 sandbox.getModule('documentCanvas').insertNewNode(wlxmlTag, wlxmlClass);\r
                 sandbox.getModule('documentCanvas').insertNewNode(wlxmlTag, wlxmlClass);\r

-            } else {\r
-                sandbox.getModule('documentCanvas').wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
-            }\r
+        },\r
+        command: function(cmd, meta) {\r
+            sandbox.getModule('documentCanvas').command(cmd, meta);\r

         }\r
     };\r
     \r
         }\r
     };\r
     \r


@@ -220,17 +265,39 @@ return function(sandbox) {
         ready: function() {\r
             views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());\r
         },\r
         ready: function() {\r
             views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());\r
         },\r

-        nodeHighlighted: function(wlxmlNode) {\r
-            commands.highlightDocumentNode(wlxmlNode, 'nodeBreadCrumbs');\r
+        nodeHighlighted: function(canvasNode) {\r
+            commands.highlightDocumentNode(canvasNode, 'nodeBreadCrumbs');\r

         },\r
         },\r

-        nodeDimmed: function(wlxmlNode) {\r
-            commands.dimDocumentNode(wlxmlNode, 'nodeBreadCrumbs');\r
+        nodeDimmed: function(canvasNode) {\r
+            commands.dimDocumentNode(canvasNode, 'nodeBreadCrumbs');\r

         },\r
         },\r

-        nodeSelected: function(wlxmlNode) {\r
-            commands.selectNode(wlxmlNode);\r
+        nodeSelected: function(canvasNode) {\r
+            commands.selectNode(canvasNode);\r

         }        \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