fix problem with delete

[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 e330854..fc82fc8 100644 (file)
--- a/src/editor/modules/rng/rng.js
+++ b/src/editor/modules/rng/rng.js
@@ -67,7 +67,7 @@ return function(sandbox) {
             sandbox.getModule('mainBar').setSummaryView(documentSummary.dom);
 
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', usingDraft);
             sandbox.getModule('mainBar').setSummaryView(documentSummary.dom);
 
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', usingDraft);

-            sandbox.getModule('mainBar').setCommandEnabled('save', usingDraft);
+            //sandbox.getModule('mainBar').setCommandEnabled('save', usingDraft);

 
             
             var toStart = ['sourceEditor', 'documentToolbar', 'mainBar', 'indicator', 'documentHistory', 'diffViewer', 'statusBar'];
 
             
             var toStart = ['sourceEditor', 'documentToolbar', 'mainBar', 'indicator', 'documentHistory', 'diffViewer', 'statusBar'];


@@ -81,7 +81,7 @@ return function(sandbox) {
             documentIsDirty = false;
             wlxmlDocument.on('change', function() {
                 documentIsDirty = true;
             documentIsDirty = false;
             wlxmlDocument.on('change', function() {
                 documentIsDirty = true;

-                sandbox.getModule('mainBar').setCommandEnabled('save', true);
+                //sandbox.getModule('mainBar').setCommandEnabled('save', true);

             });
             wlxmlDocument.on('contentSet', function() {
                 documentIsDirty = true;
             });
             wlxmlDocument.on('contentSet', function() {
                 documentIsDirty = true;


@@ -90,38 +90,43 @@ return function(sandbox) {
         draftDropped: function() {
             documentSummary.setDraftField('-');
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', false);
         draftDropped: function() {
             documentSummary.setDraftField('-');
             sandbox.getModule('mainBar').setCommandEnabled('drop-draft', false);

-            sandbox.getModule('mainBar').setCommandEnabled('save', false);
+            //sandbox.getModule('mainBar').setCommandEnabled('save', false);

         },
         savingStarted: function(what) {
             var msg = {
                 remote: gettext('Saving document'),
                 local: gettext('Saving local copy')
             };
         },
         savingStarted: function(what) {
             var msg = {
                 remote: gettext('Saving document'),
                 local: gettext('Saving local copy')
             };

-            sandbox.getModule('mainBar').setCommandEnabled('save', false);
+            //sandbox.getModule('mainBar').setCommandEnabled('save', false);

             sandbox.getModule('indicator').showMessage(msg[what] + '...');
         },
         savingEnded: function(status, what, data) {
             void(status);
             var msg = {
                 remote: gettext('Document saved'),
             sandbox.getModule('indicator').showMessage(msg[what] + '...');
         },
         savingEnded: function(status, what, data) {
             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;
             };
             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) {
             }
         },
         restoringStarted: function(event) {

-            sandbox.getModule('mainBar').setCommandEnabled('save', false);
+            //sandbox.getModule('mainBar').setCommandEnabled('save', false);

             sandbox.getModule('indicator').showMessage(gettext('Restoring version ') + event.version + '...');
         },
         historyItemAdded: function(item) {
             sandbox.getModule('indicator').showMessage(gettext('Restoring version ') + event.version + '...');
         },
         historyItemAdded: function(item) {


@@ -132,7 +137,7 @@ return function(sandbox) {
         },
         documentReverted: function(version) {
             documentIsDirty = false;
         },
         documentReverted: function(version) {
             documentIsDirty = false;

-            sandbox.getModule('indicator').clearMessage({message:'Revision restored'});
+            sandbox.getModule('indicator').clearMessage({message:gettext('Revision restored')});

         },
         publishingStarted: function(version) {
             sandbox.getModule('indicator').showMessage(gettext('Publishing...'));
         },
         publishingStarted: function(version) {
             sandbox.getModule('indicator').showMessage(gettext('Publishing...'));


@@ -234,9 +239,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 */