integration wip: restoring document
authorAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Fri, 22 Nov 2013 10:54:53 +0000 (11:54 +0100)
committerAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Mon, 2 Dec 2013 13:50:53 +0000 (14:50 +0100)
src/editor/modules/data/data.js
src/editor/modules/rng/rng.js

index 7f60004..7c9077f 100644 (file)
@@ -108,6 +108,7 @@ return function(sandbox) {
                     success: function(data) {
                         document_version = data.current_version;
                         reloadHistory();
                     success: function(data) {
                         document_version = data.current_version;
                         reloadHistory();
+                        wlxmlDocument.loadXML(data.document);
                         sandbox.publish('documentReverted', data);
                     },
                 });
                         sandbox.publish('documentReverted', data);
                     },
                 });
index b1e091c..b6b103f 100644 (file)
@@ -45,15 +45,6 @@ return function(sandbox) {
         },
         updateCurrentTextElement: function(textElement) {
             sandbox.getModule('nodeFamilyTree').setElement(textElement);
         },
         updateCurrentTextElement: function(textElement) {
             sandbox.getModule('nodeFamilyTree').setElement(textElement);
-        },
-        resetDocument: function(document, reason) {
-            var modules = [];
-            if (reason === 'revert') {
-                modules = ['documentCanvas', 'metadataEditor', 'sourceEditor'];
-            }
-            modules.forEach(function(moduleName) {
-                sandbox.getModule(moduleName).setDocument(document);
-            });
         }
     };
     
         }
     };
     
@@ -116,7 +107,6 @@ return function(sandbox) {
             sandbox.getModule('diffViewer').setDiff(diff);
         },
         documentReverted: function(event) {
             sandbox.getModule('diffViewer').setDiff(diff);
         },
         documentReverted: function(event) {
-            commands.resetDocument(event.document, 'revert');
             sandbox.getModule('mainBar').setCommandEnabled('save', true);
             sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'});
             sandbox.getModule('mainBar').setVersion(event.current_version);
             sandbox.getModule('mainBar').setCommandEnabled('save', true);
             sandbox.getModule('indicator').clearMessage({message:'Wersja ' + event.reverted_version + ' przywrócona'});
             sandbox.getModule('mainBar').setVersion(event.current_version);