list fixes: headers, invalid elements, easier ending

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

diff --git a/src/editor/modules/rng/rng.js b/src/editor/modules/rng/rng.js
index 032fea4..63bc2c2 100644 (file)
--- a/src/editor/modules/rng/rng.js
+++ b/src/editor/modules/rng/rng.js
@@ -22,21 +22,9 @@ return function(sandbox) {
     }
      
     var commands = {
     }
      
     var commands = {

-        jumpToDocumentElement: function(element) {
-            sandbox.getModule('documentCanvas').jumpToElement(element);
-        },

         refreshCanvasSelection: function(selection) {
         refreshCanvasSelection: function(selection) {

-            var fragment = selection.toDocumentFragment(),
-                elementParent;
-            
+            var fragment = selection.toDocumentFragment();

             sandbox.getModule('documentToolbar').setDocumentFragment(fragment);
             sandbox.getModule('documentToolbar').setDocumentFragment(fragment);

-            
-            if(fragment && fragment.node) {
-                elementParent = fragment.node.getNearestElementNode();
-                sandbox.getModule('nodeBreadCrumbs').setNodeElement(elementParent);
-            } else {
-                sandbox.getModule('nodeBreadCrumbs').setNodeElement(null);
-            }

         },
     };
     
         },
     };
     


@@ -68,7 +56,7 @@ return function(sandbox) {
     };
     
     eventHandlers.data = {
     };
     
     eventHandlers.data = {

-        ready: function(usingDraft, draftTimestamp) {
+        ready: function(usingDraft, draftTimestamp, xmlValid) {

             wlxmlDocument = sandbox.getModule('data').getDocument();
 
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());
             wlxmlDocument = sandbox.getModule('data').getDocument();
 
             views.mainLayout.setView('mainView', views.mainTabs.getAsView());


@@ -81,7 +69,12 @@ return function(sandbox) {
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', usingDraft);
             sandbox.getModule('mainBar').setCommandEnabled('save', usingDraft);
 
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', usingDraft);
             sandbox.getModule('mainBar').setCommandEnabled('save', usingDraft);
 

-            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', '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();
             });
             
                 sandbox.getModule(moduleName).start();
             });
             


@@ -174,14 +167,6 @@ return function(sandbox) {
             views.visualEditing.setView('leftColumn', sandbox.getModule('documentCanvas').getView());
         },
         
             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);
         }
         selectionChanged: function(selection) {
             commands.refreshCanvasSelection(selection);
         }


@@ -197,15 +182,6 @@ return function(sandbox) {
         }
     };
     
         }
     };
     

-    eventHandlers.nodeBreadCrumbs = {
-        ready: function() {
-            views.visualEditing.setView('statusBar', sandbox.getModule('nodeBreadCrumbs').getView());
-        },
-        elementClicked: function(element) {
-            commands.jumpToDocumentElement(element);
-        }
-    };
-    

     eventHandlers.documentHistory = {
         ready: function() {
             sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());
     eventHandlers.documentHistory = {
         ready: function() {
             sandbox.getModule('documentHistory').addHistory(sandbox.getModule('data').getHistory());


@@ -219,7 +195,14 @@ return function(sandbox) {
         },
         displayVersion: function(event) {
             /* globals window */
         },
         displayVersion: function(event) {
             /* globals window */

-            window.open('/' + gettext('editor') + '/' + sandbox.getModule('data').getDocumentId() + '?version=' + event.version, _.uniqueId());
+            var config = sandbox.getConfig(),
+                doc = sandbox.getModule('data').getDocument();
+
+            if(config.documentUrl) {
+                window.open(config.documentUrl(doc.properties.document_id, event.version), _.uniqueId());
+            } else {
+                logger.error('Unable to show version ' + event.version + ' of a document - config.documentUrl missing');
+            }

         }
     };
     
         }
     };
     


@@ -248,9 +231,9 @@ return function(sandbox) {
         var txt = gettext('Do you really want to exit?');
         if(documentIsDirty) {
             txt += ' ' + gettext('Document contains unsaved changes!');
         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 */
     });
     
     /* api */