empty text nodes after spans

[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 459dcc1..5b0fdb0 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 = {
-        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('nodeBreadCrumbs').setNodeElement(elementParent);
-            } else {
-                sandbox.getModule('nodeBreadCrumbs').setNodeElement(null);
-            }
         },
     };
     
@@ -68,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());
@@ -81,7 +69,12 @@ return function(sandbox) {
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', usingDraft);
             sandbox.getModule('mainBar').setCommandEnabled('save', usingDraft);
 
-            _.each(['sourceEditor', 'documentCanvas', 'documentToolbar', '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();
             });
             
@@ -111,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) {
@@ -139,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.'});
         }
     };
     
@@ -174,14 +178,6 @@ 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);
         }
@@ -197,15 +193,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());
@@ -217,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);
         }
     };
     
@@ -248,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 */