X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/29a9bfd9b61771b41ca18de2a53b672cb3c07cf1..0bbec0dc1ee08f4855b030189a4025994150b38c:/src/editor/modules/rng/rng.js?ds=sidebyside

diff --git a/src/editor/modules/rng/rng.js b/src/editor/modules/rng/rng.js
index dba2d2f..5b0fdb0 100644
--- a/src/editor/modules/rng/rng.js
+++ b/src/editor/modules/rng/rng.js
@@ -2,13 +2,12 @@ define([
 './documentSummary',
 'libs/underscore',
 'fnpjs/layout',
-'fnpjs/vbox',
 'fnpjs/logging/logging',
 'views/tabs/tabs',
 'libs/text!./mainLayout.html',
 'libs/text!./editingLayout.html',
 'libs/text!./diffLayout.html',
-], function(documentSummary, _, layout, vbox, logging, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
+], function(documentSummary, _, layout, logging, tabs, mainLayoutTemplate, visualEditingLayoutTemplate, diffLayoutTemplate) {
 
 'use strict';
 
@@ -23,43 +22,9 @@ return function(sandbox) {
     }
      
     var commands = {
-        highlightDocumentElement: function(element, origin) {
-            ///'nodeBreadCrumbs', 'nodeFamilyTree'
-            ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) {
-                if(!origin || moduleName !== origin) {
-                    sandbox.getModule(moduleName).highlightElement(element);
-                }
-            });
-        },
-        dimDocumentElement: function(element, origin) {
-            //'nodeBreadCrumbs', 'nodeFamilyTree'
-            ['documentCanvas', 'nodeFamilyTree'].forEach(function(moduleName) {
-                if(!origin || moduleName !== origin) {
-                    sandbox.getModule(moduleName).dimElement(element);
-                }
-            });
-        },
-        jumpToDocumentElement: function(element) {
-            sandbox.getModule('documentCanvas').jumpToElement(element);
-        },
         refreshCanvasSelection: function(selection) {
-            var fragment = selection.toDocumentFragment(),
-                elementParent;
-            
+            var fragment = selection.toDocumentFragment();
             sandbox.getModule('documentToolbar').setDocumentFragment(fragment);
-            
-            if(fragment && fragment.node) {
-                elementParent = fragment.node.getNearestElementNode();
-                sandbox.getModule('nodePane').setNodeElement(elementParent);
-                sandbox.getModule('nodeFamilyTree').setElement(fragment.node);
-                sandbox.getModule('nodeBreadCrumbs').setNodeElement(elementParent);
-                sandbox.getModule('metadataEditor').setNodeElement(elementParent);
-            } else {
-                sandbox.getModule('nodePane').setNodeElement(null);
-                sandbox.getModule('nodeFamilyTree').setElement(null);
-                sandbox.getModule('nodeBreadCrumbs').setNodeElement(null);
-                sandbox.getModule('metadataEditor').setNodeElement(null);
-            }
         },
     };
     
@@ -68,20 +33,15 @@ return function(sandbox) {
         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(gettext('Editor'), 'editor', views.visualEditing.getAsView());
     addMainTab(gettext('Source'), 'sourceEditor',  '');
     addMainTab(gettext('History'), 'history', views.diffLayout.getAsView());
     
     sandbox.getDOM().append(views.mainLayout.getAsView());
     
-    views.visualEditingSidebar.addTab({icon: 'pencil'}, 'edit', views.currentNodePaneLayout.getAsView());
-
     var wlxmlDocument, documentIsDirty;
     
     /* Events handling */
@@ -96,7 +56,7 @@ return function(sandbox) {
     };
     
     eventHandlers.data = {
-        ready: function(usingDraft, draftTimestamp) {
+        ready: function(usingDraft, draftTimestamp, xmlValid) {
             wlxmlDocument = sandbox.getModule('data').getDocument();
 
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());
@@ -104,12 +64,17 @@ return function(sandbox) {
             documentSummary.init(sandbox.getConfig().documentSummaryView, wlxmlDocument);
             documentSummary.render();
             documentSummary.setDraftField(usingDraft ? (draftTimestamp || '???') : '-');
-            views.currentNodePaneLayout.appendView(documentSummary.dom);
+            sandbox.getModule('mainBar').setSummaryView(documentSummary.dom);
 
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', usingDraft);
             sandbox.getModule('mainBar').setCommandEnabled('save', usingDraft);
 
-            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', 'metadataEditor', 'nodeBreadCrumbs', 'mainBar', 'indicator', 'documentHistory', 'diffViewer', 'statusBar'], function(moduleName) {
+            
+            var toStart = ['sourceEditor', 'documentToolbar', 'mainBar', 'indicator', 'documentHistory', 'diffViewer', 'statusBar'];
+            if(xmlValid) {
+                toStart.push('documentCanvas');
+            }
+            _.each(toStart, function(moduleName) {
                 sandbox.getModule(moduleName).start();
             });
             
@@ -139,20 +104,25 @@ return function(sandbox) {
             void(status);
             var msg = {
                 remote: gettext('Document saved'),
-                local: gettext('Local copy saved')
+                local: gettext('Local copy saved'),
+                error: gettext('Failed to save')
             };
             documentIsDirty = false;
-            
-            sandbox.getModule('indicator').clearMessage({message: msg[what]});
-            if(status === 'success' && what === 'remote') {
-                documentSummary.setDraftField('-');
-                sandbox.getModule('mainBar').setCommandEnabled('drop-draft', false);
-                sandbox.getModule('mainBar').setCommandEnabled('save', false);
-            }
-            if(what === 'local') {
-                documentSummary.setDraftField(data.timestamp);
-                sandbox.getModule('mainBar').setCommandEnabled('drop-draft', true);
-                sandbox.getModule('mainBar').setCommandEnabled('save', true);
+
+            if (status === 'success') {
+                sandbox.getModule('indicator').clearMessage({message: msg[what]});
+                if (what === 'remote') {
+                    documentSummary.setDraftField('-');
+                    sandbox.getModule('mainBar').setCommandEnabled('drop-draft', false);
+                    sandbox.getModule('mainBar').setCommandEnabled('save', false);
+                }
+                if (what === 'local') {
+                    documentSummary.setDraftField(data.timestamp);
+                    sandbox.getModule('mainBar').setCommandEnabled('drop-draft', true);
+                    sandbox.getModule('mainBar').setCommandEnabled('save', true);
+                }
+            } else {
+                sandbox.getModule('indicator').clearMessage({message: msg[status]});
             }
         },
         restoringStarted: function(event) {
@@ -167,7 +137,13 @@ return function(sandbox) {
         },
         documentReverted: function(version) {
             documentIsDirty = false;
-            sandbox.getModule('indicator').clearMessage({message:'Wersja ' + version + ' przywrócona'});
+            sandbox.getModule('indicator').clearMessage({message:'Revision restored'});
+        },
+        publishingStarted: function(version) {
+            sandbox.getModule('indicator').showMessage(gettext('Publishing...'));
+        },
+        documentPublished: function(version) {
+            sandbox.getModule('indicator').clearMessage({message:'Published.'});
         }
     };
     
@@ -202,46 +178,10 @@ return function(sandbox) {
             views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
         },
         
-        nodeHovered: function(canvasNode) {
-            commands.highlightDocumentNode(canvasNode);
-        },
-        
-        nodeBlured: function(canvasNode) {
-            commands.dimDocumentNode(canvasNode);
-        },
-
         selectionChanged: function(selection) {
             commands.refreshCanvasSelection(selection);
         }
     };
-
-    eventHandlers.nodePane = {
-        ready: function() {
-            views.currentNodePaneLayout.appendView(sandbox.getModule('nodePane').getView());
-        }
-    };
-    
-    eventHandlers.metadataEditor = {
-        ready: function() {
-            sandbox.getModule('metadataEditor').setDocument(sandbox.getModule('data').getDocument());
-            views.visualEditingSidebar.addTab({icon: 'info-sign'}, 'metadataEditor', sandbox.getModule('metadataEditor').getView());
-        }
-    };
-    
-    eventHandlers.nodeFamilyTree = {
-        ready: function() {
-            views.currentNodePaneLayout.appendView(sandbox.getModule('nodeFamilyTree').getView());
-        },
-        nodeEntered: function(node) {
-            commands.highlightDocumentElement(node, 'nodeFamilyTree');
-        },
-        nodeLeft: function(node) {
-            commands.dimDocumentElement(node, 'nodeFamilyTree');
-        },
-        nodeClicked: function(node) {
-            commands.jumpToDocumentElement(node);
-        }
-    };
     
     eventHandlers.documentToolbar = {
         ready: function() {
@@ -253,21 +193,6 @@ return function(sandbox) {
         }
     };
     
-    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());
@@ -279,9 +204,13 @@ return function(sandbox) {
         restoreVersion: function(version) {
             sandbox.getModule('data').restoreVersion(version);
         },
-        displayVersion: function(event) {
+        displayVersion: function(revision) {
             /* globals window */
-            window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());
+            //window.open(sandbox.getConfig().documentPreviewUrl(revision), _.uniqueId());
+            window.open(sandbox.getConfig().documentPreviewUrl(revision), 'preview');
+        },
+        publishVersion: function(version) {
+            sandbox.getModule('data').publishVersion(version);
         }
     };
     
@@ -310,9 +239,9 @@ return function(sandbox) {
         var txt = gettext('Do you really want to exit?');
         if(documentIsDirty) {
             txt += ' ' + gettext('Document contains unsaved changes!');
+            event.returnValue = txt; // FF
+            return txt; // Chrome
         }
-        event.returnValue = txt; // FF
-        return txt; // Chrome
     });
     
     /* api */