Look for the appropriate runtime ( and window_id ) in the resource_display_broker

Author: p01

src/resource-manager/resource_detail_view.js

@@ -123,14 +123,14 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
 
   this.go_to_line = function(container, data)
   {
-    if (!data || !data.lines || !data.lines.length)
+    if (!data || data.line == null)
       return;
 
     this._root_ele = container.querySelector("." + RESOURCE_DETAIL_CONTAINER_CLASSNAME);
     if (this._root_ele)
     {
       this.clear_line_highlight(this._root_ele);
-      this._target_line = Number(data.lines[0]);
+      this._target_line = data.line;
       this._highlight_line(this._root_ele);
     }
   };
@@ -161,7 +161,7 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
 
     var url = resource ? resource.url : key;
 
-    if (!this._show_resource(resource, data))
+    if (!resource || !this._show_resource(resource, data))
       service.request_resource_data(url, this.show_resource.bind(this), data, resource);
   };
 

src/resource-manager/resource_display_broker.js

@@ -9,18 +9,13 @@ cls.ResourceDisplayBroker = function()
 
   cls.ResourceDisplayBroker.instance = this;
 
-  this._show_resource = function(id_or_url, line)
+  this._show_resource = function(id_or_url, data)
   {
-    var data = {};
     var manager = window.services["resource-manager"];
     var view = window.views.resource_detail_view;
     if (manager && view)
     {
-      if (line)
-        data.lines = [line];
-
       view.show_resource(id_or_url, data);
-
       return true;
     }
     return false;
@@ -37,22 +32,26 @@ cls.ResourceDisplayBroker = function()
     var url = ele.getAttribute("data-resource-url");
     var line = ele.getAttribute("data-resource-line-number");
     var id_or_url = id;
-    var rt_id;
+    var runtime;
+    var data = {};
+
+    runtime = runtimes.getRuntime(ele.get_attr("parent-node-chain", "rt-id"));
+    if (runtime)
+      data.window_id = runtime.window_id;
 
     if (url)
     {
       // resolve the URL based on that of the runtime if we only have a relative path
-      if (url.indexOf("://") == -1)
-      {
-        rt_id = ele.get_attr("parent-node-chain", "rt-id");
-        if (rt_id)
-          url = window.helpers.resolveURLS(runtimes.getURI(rt_id), url);
-      }
+      if (runtime && url.contains("://"))
+        url = window.helpers.resolveURLS(runtime.uri, url);
 
       id_or_url = url;
     }
 
-    if (!this._show_resource(id_or_url, line) && url)
+    if(line)
+      data.line = Number(line);
+
+    if (!this._show_resource(id_or_url, data) && url)
       window.open(url);
   };
 

src/resource-manager/resource_service.js

@@ -385,7 +385,7 @@ cls.ResourceRequest = function(url, callback, data, resourceInfo)
   {
     this.url = url;
     this.resourceInfo = resourceInfo;
-    this._callback_data = data;
+    this._data = data;
     this._callback = callback;
     this._retries = 0;
 
@@ -408,7 +408,7 @@ cls.ResourceRequest = function(url, callback, data, resourceInfo)
   {
     if (this._resource_manager.requestCreateRequest)
     {
-      var windowID = window.window_manager_data.get_debug_context();
+      var windowID = this._data.window_id || window.window_manager_data.get_debug_context();
       var tag = window.tag_manager.set_callback(this, this._on_request_resource_id);
       this._resource_manager.requestCreateRequest(tag, [windowID, this.url, "GET"]);
     }
@@ -463,7 +463,7 @@ cls.ResourceRequest = function(url, callback, data, resourceInfo)
         window.messages.post("resource-request-resource", {resource_id: this.resource_id});
 
         // aaaand callback
-        this._callback(this.resourceInfo, this._callback_data);
+        this._callback(this.resourceInfo, this._data);
       }
       else
       {