No more ResourceManager singleton.

Author: p01

src/build-application/build_resource_manager_1_0.js

@@ -3,17 +3,20 @@
 window.app.builders.ResourceManager["1.0"] = function(service)
 {
   var network_logger = new cls.NetworkLogger();
+  var resource_inspector = new cls.ResourceInspector(network_logger);
+
   new cls.ResourceTreeView("resource_tree_view",
-                           "Tree View",
                            "",
                            "",
                            "",
-                           network_logger);
+                           "",
+                           resource_inspector);
   new cls.ResourceDetailView("resource_detail_view",
-                             "Detail",
                              "",
                              "",
-                             network_logger);
+                             "",
+                             "",
+                             resource_inspector);
   cls.ResourceDetailView.create_ui_widgets();
   cls.ResourceTreeView.create_ui_widgets();
 

src/resource-manager/resource_detail_view.js

@@ -6,17 +6,8 @@ window.cls || (window.cls = {});
  * @constructor
  * @extends ViewBase
  */
-cls.ResourceDetailView = function(id, name, container_class, html, default_handler, network_logger)
+cls.ResourceDetailView = function(id, name, container_class, html, default_handler, resource_inspector)
 {
-  if (cls.ResourceDetailView.instance)
-  {
-    return cls.ResourceDetailView.instance;
-  }
-  cls.ResourceDetailView.instance = this;
-
-  this._service = new cls.ResourceManagerService(this, network_logger);
-
-
   this.createView = function(container)
   {
     if (this.resource && this.resource.data)
@@ -107,7 +98,7 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
       }
       child = child && child.nextSibling;
     }
-  }
+  };
 
   this.clear_line_highlight = function(container)
   {
@@ -119,7 +110,7 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
     var _ele = container.querySelector("." + HIGHLIGHTED_LINE_CLASSNAME);
     if (_ele)
       _ele.removeClass(HIGHLIGHTED_LINE_CLASSNAME);
-  }
+  };
 
   this.go_to_line = function(container, data)
   {
@@ -142,7 +133,7 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
 
     this.data = data;
     this.resource = resource;
-    this._service.highlight_resource(resource.uid);
+    this.service.highlight_resource(resource.uid);
     this.update();
 
     return true;
@@ -156,7 +147,7 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
 
   this._show_resource_by_key = function(key, data)
   {
-    var service = this._service;
+    var service = this.service;
     var resource = service.get_resource(key) || service.get_resource_by_url(key);
 
     var url = resource ? resource.url : key;
@@ -189,10 +180,18 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
     this.update();
   }.bind(this);
 
-  var messages = window.messages;
-  messages.add_listener("debug-context-selected", this._on_debug_context_selected_bound);
+  this._init = function(id, name, container_class, html, default_handler, resource_inspector)
+  {
+    this.id = id;
+    this.service = resource_inspector;
+
+    var messages = window.messages;
+    messages.add_listener("debug-context-selected", this._on_debug_context_selected_bound);
+
+    this.init(id, name, container_class, html, default_handler);
+  };
 
-  this.init(id, name, container_class, html, default_handler);
+  this._init(id, name, container_class, html, default_handler, resource_inspector)
 };
 
 cls.ResourceDetailView.create_ui_widgets = function()

src/resource-manager/resource_service.js

@@ -5,12 +5,8 @@ window.cls || (window.cls = {});
 /**
  *
  */
-cls.ResourceManagerService = function(view, network_logger)
+cls.ResourceInspector = function(network_logger)
 {
-  if (cls.ResourceManagerService.instance)
-    return cls.ResourceManagerService.instance;
-
-  cls.ResourceManagerService.instance = this;
 
   var THROTTLE_DELAY = 250;
   var TYPE_GROUP_MAPPING =
@@ -23,7 +19,6 @@ cls.ResourceManagerService = function(view, network_logger)
     "*": ui_strings.S_HTTP_LABEL_FILTER_OTHER
   };
 
-  this._view = view;
   this._network_logger = network_logger;
 
   this._handle_list_documents = function(status, msg)
@@ -56,8 +51,19 @@ cls.ResourceManagerService = function(view, network_logger)
       this._document_resources[document_id].push(r.uid);
   };
 
+  this.get_views = function()
+  {
+    if (this.tree_view == null)
+      this.tree_view = window.views.resource_tree_view;
+
+    if (this.detail_view == null)
+      this.detail_view = window.views.resource_detail_view;
+  };
+
   this._update = function(msg)
   {
+    this.get_views();
+
     // bounce if _suppress_updates
     if (this._suppress_updates_url)
     {
@@ -78,7 +84,7 @@ cls.ResourceManagerService = function(view, network_logger)
     var ctx = {};
 
     // get the order of the groups of resources
-    ctx.group_order = this._view.get_group_order();
+    ctx.group_order = this.tree_view.get_group_order();
 
     // get list of window_contexts for which we saw the main_document
     ctx.windowList = (this._network_logger.get_window_contexts() || []).filter(function(w) {
@@ -193,7 +199,7 @@ cls.ResourceManagerService = function(view, network_logger)
       this._context = null;
     }
 
-    this._view.update();
+    this.tree_view.update();
   };
 
   this._update_bound = this._update.bind(this);
@@ -225,7 +231,7 @@ cls.ResourceManagerService = function(view, network_logger)
 
       pivotIDs.forEach(function(p) { hash[p] = collapsed; });
 
-      this._view.update();
+      this.tree_view.update();
     }
   }.bind(this);
 
@@ -240,7 +246,7 @@ cls.ResourceManagerService = function(view, network_logger)
 
     var uid = parent.getAttribute("data-resource-uid");
     this.highlight_resource(uid);
-    cls.ResourceDetailView.instance.show_resource(uid);
+    this.detail_view.show_resource(uid);
   }.bind(this);
 
   this.highlight_resource = function(uid)
@@ -276,7 +282,7 @@ cls.ResourceManagerService = function(view, network_logger)
       uid = list[Math.min( Math.max(0, pos + increment), list.length - 1)];
 
     this.highlight_resource(uid);
-    cls.ResourceDetailView.instance.show_resource(uid);
+      this.detail_view.show_resource(uid);
   };
 
   this.highlight_next_resource_bound = function()
@@ -334,7 +340,6 @@ cls.ResourceManagerService = function(view, network_logger)
     this._document_resources = {};
 
     this._suppress_uids = {};
-    this._view.update();
   };
 
   this.get_resource_context = function()

src/resource-manager/resource_tree_view.js

@@ -6,13 +6,8 @@ window.cls || (window.cls = {});
  * @constructor
  * @extends ViewBase
  */
-cls.ResourceTreeView = function(id, name, container_class, html, default_handler, network_logger) {
-  if (cls.ResourceTreeView.instance)
-  {
-    return cls.ResourceTreeView.instance;
-  }
-  cls.ResourceTreeView.instance = this;
-
+cls.ResourceTreeView = function(id, name, container_class, html, default_handler, resource_inspector)
+{
   //	const
   var THROTTLE_DELAY = 250;
   var GROUP_ORDER = [
@@ -25,10 +20,11 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
   ];
 
   // "private"
-  this._service = new cls.ResourceManagerService(this, network_logger);
   this._loading = false;
 
   // public
+  this.service = resource_inspector;
+
   this.get_group_order = function()
   {
     return GROUP_ORDER;
@@ -39,8 +35,7 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
 
   this.createView = function(container)
   {
-    var service = this._service;
-    var ctx = this._service.get_resource_context();
+    var ctx = this.service.get_resource_context();
     var target = container.firstElementChild;
     var scrollTop = target?target.scrollTop:0;
     var scrollLeft = target?target.scrollLeft:0;
@@ -118,22 +113,28 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
     this.update();
   }.bind(this);
 
-  var messages = window.messages;
-  messages.add_listener("debug-context-selected", this._on_debug_context_selected_bound);
+  this._init = function()
+  {
+    this.id = id;
+
+    var messages = window.messages;
+    messages.add_listener("debug-context-selected", this._on_debug_context_selected_bound);
 
-  var doc_service = window.services["document-manager"];
-  doc_service.add_listener("abouttoloaddocument", this._on_abouttoloaddocument_bound);
-  doc_service.add_listener("documentloaded", this._on_documentloaded_bound);
+    var doc_service = window.services["document-manager"];
+    doc_service.add_listener("abouttoloaddocument", this._on_abouttoloaddocument_bound);
+    doc_service.add_listener("documentloaded", this._on_documentloaded_bound);
 
-  ActionHandlerInterface.apply(this);
-  this._handlers = {
-    "select-next-entry": this._service.highlight_next_resource_bound,
-    "select-previous-entry": this._service.highlight_previous_resource_bound
+    ActionHandlerInterface.apply(this);
+    this._handlers = {
+      "select-next-entry": this.service.highlight_next_resource_bound,
+      "select-previous-entry": this.service.highlight_previous_resource_bound
+    };
+    ActionBroker.get_instance().register_handler(this);
+
+    this.init(id, name, container_class, html, default_handler);
   };
-  this.id = id;
-  ActionBroker.get_instance().register_handler(this);
 
-  this.init(id, name, container_class, html, default_handler);
+  this._init(id, name, container_class, html, default_handler);
 };
 
 cls.ResourceTreeView.create_ui_widgets = function()
@@ -183,12 +184,11 @@ cls.ResourceTreeView.create_ui_widgets = function()
 
   var on_view_created = function(msg)
   {
-    if (msg.id === "resource_tree_view")
+    if (msg.id == "resource_tree_view")
     {
-      var scroll_container = msg.container;
-      if (scroll_container)
+      if (msg.container)
       {
-        text_search.setContainer(scroll_container);
+        text_search.setContainer(msg.container);
         text_search.set_query_selector(".resource-tree-resource-label");
         text_search.setFormInput(
           views.resource_tree_view.getToolbarControl(msg.container, "resource-tree-text-search")