merge from ww: fixing how SCB versiondiffer is invoked

LivelyKernel · May 21, 2012 · 5ad54c7 · 5ad54c7
1 parent 87e1df1
commit 5ad54c7
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/core/lively/ide/BrowserCommands.js b/core/lively/ide/BrowserCommands.js
@@ -599,6 +599,7 @@ lively.ide.BrowserCommand.subclass('lively.ide.RunTestMethodCommand', {
     },
 
 });
+
 lively.ide.BrowserCommand.subclass('lively.ide.OpenInFileEditorCommand', {
 
     wantsMenu: Functions.True,
@@ -618,6 +619,7 @@ lively.ide.BrowserCommand.subclass('lively.ide.OpenInFileEditorCommand', {
 
 
 });
+
 lively.ide.BrowserCommand.subclass('lively.ide.OpenDiffViewerCommand', {
 
     wantsMenu: Functions.True,
@@ -631,9 +633,16 @@ lively.ide.BrowserCommand.subclass('lively.ide.OpenDiffViewerCommand', {
         return [['diff versions', this.diffVersions.bind(this)]]
     },
     diffVersions: function() {
-        var url = URL.codeBase.withFilename(this.browser.selectedNode().moduleName);
-        var differ = lively.PartsBin.getPart('VersionDiffer', 'PartsBin/NewWorld');
-        var pos = this.world().visibleBounds().center()
+        var moduleNode = this.browser.getPane1Selection(),
+            moduleName = moduleNode && moduleNode.moduleName;
+        if (!moduleNode || !moduleName) {
+            alert('No module selected');
+            return;
+        }
+        var m = module(moduleName),
+            url = m.uri(),
+            differ = lively.PartsBin.getPart('VersionDiffer', 'PartsBin/Tools'),
+            pos = this.world().visibleBounds().center()
         differ.openInWorld();
         differ.align(differ.bounds().center(), pos)
         differ.targetMorph.setURL(url);