Review fixes

* no "loading" template
* no "flash" template but a fallback one with a Show Resource link
* reuse the NetworkEntry' .error_in_current_response
* s/service/_resource_inspector in cls.ResourceTreeView and cls.ResourceDetailView
* switch this.flat_list to a private variable in window.templates.resource_tree

Author: p01

src/network/network_service.js

@@ -1297,6 +1297,7 @@ cls.ResourceInfo = function(entry)
   this.window_id = entry.window_id;
   this.is_unloaded = entry.is_unloaded;
   this.responsecode = entry.current_responsecode;
+  this.error_in_current_response = entry.error_in_current_response;
 
   var last_response = entry.requests_responses && entry.requests_responses.last;
   if (last_response && last_response.responsebody)

src/resource-manager/resource_detail_view.js

@@ -133,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._resource_inspector.highlight_resource(resource.uid);
     this.update();
 
     return true;
@@ -147,13 +147,13 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
 
   this._show_resource_by_key = function(key, data)
   {
-    var service = this.service;
-    var resource = service.get_resource(key) || service.get_resource_by_url(key);
+    var inspector = this._resource_inspector;
+    var resource = inspector.get_resource(key) || inspector.get_resource_by_url(key);
 
     var url = resource ? resource.url : key;
 
     if (!resource || !this._show_resource(resource, data))
-      service.request_resource_data(url, this.show_resource.bind(this), data, resource);
+      inspector.request_resource_data(url, this.show_resource.bind(this), data, resource);
   };
 
   /*
@@ -180,7 +180,7 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
   this._init = function(id, name, container_class, html, default_handler, resource_inspector)
   {
     this.id = id;
-    this.service = resource_inspector;
+    this._resource_inspector = resource_inspector;
 
     var messages = window.messages;
     messages.add_listener("debug-context-selected", this._on_debug_context_selected_bound);

src/resource-manager/resource_style.css

@@ -57,11 +57,6 @@
   background-image: url("../ui-images/type_feed.png");
 }
 
-.resource-type-flash
-{
-  background-image: url("../ui-images/type_flash.png");
-}
-
 .resource-type-font
 {
   background-image: url("../ui-images/type_font.png");
@@ -228,7 +223,7 @@
 .resource-detail-text-container,
 .resource-detail-image-container,
 .resource-detail-others-container,
-.resource-detail-flash-container
+.resource-detail-fallback-container
 {
   padding: 8px;
 }

src/resource-manager/resource_templates.js

@@ -7,10 +7,11 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 	var URL_MATCH_CONTEXT_SIZE = 10;
 	var DEPTH_IDENTATION = 18;
 	var DISTINGUISHER_MAX_LENGTH = 64;
+	var flat_list;
 
 	this._get_short_distinguisher = function(url)
 	{
-		var name = url.filename || url.short_distinguisher || url;
+		var name = url.short_distinguisher;
 
 		if (name.length > this.DISTINGUISHER_MAX_LENGTH)
 			name = name.slice(0, this.DISTINGUISHER_MAX_LENGTH) + "…";
@@ -41,8 +42,6 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 
 	this.update = function(context)
 	{
-		this.flat_list = [];
-
 		// expand all the pivots if there is a search_term
 		if (context.search_term != "")
 			Object.keys(context.collapsed).forEach(function(v) { context.collapsed[v] = false; });
@@ -57,12 +56,20 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 				context.resources.push(r);
 		});
 
+		flat_list = [];
 		this.windows(context);
-		var tpl = ["div", ["ul", this.flat_list], "class", "resource-tree"];
-		delete this.flat_list;
+		var tpl = ["div", ["ul", flat_list], "class", "resource-tree"];
+		flat_list = [];
+
 		return tpl;
 	};
 
+	/*
+	 * The following template methods push their result to the private variable
+	 * `flat_list` in order to create a lightweight flat list of windows, documents,
+	 * groups, resources, ...
+	 *
+	 */
 	this.windows = function(context)
 	{
 		context.window_list.forEach(this.window.bind(this, context));
@@ -72,11 +79,11 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 	{
 		var window_info = window.window_manager_data.get_window(w.id);
 		if (!window_info)
-			return [];
+			return;
 
 		var extras = this._expander_extras(context, String(w.id));
 
-		this.flat_list.push(
+		flat_list.push(
 			["li",
 				["h2",
 					extras.tpl.button,
@@ -108,17 +115,16 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 
 		if (resources.length > 0)
 		{
-			var depth = d.depth;
-			var extras = this._expander_extras(context, d.pivot_id, depth);
+			var extras = this._expander_extras(context, d.pivot_id, d.depth);
 
-			this.flat_list.push(
+			flat_list.push(
 				["li",
 					["h2",
 						extras.tpl.button,
 						["span",
 							this._get_short_distinguisher(d.url),
 							"class", "resource-tree-document-label",
-							"data-tooltip", " js-script-select",
+							"data-tooltip", "kjs-script-select",
 							"data-tooltip-text", d.original_url
 						],
 						" ",
@@ -132,7 +138,7 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 				].concat(extras.tpl.li)
 			);
 
-			if (!extras.collapsed )
+			if (!extras.collapsed)
 			{
 				if (resources.length)
 					this.resource_groups(context, resources, d);
@@ -159,7 +165,7 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 		var depth = d.depth + 1;
 		var extras = this._expander_extras(context, d.pivot_id + "_" + g, depth);
 
-		this.flat_list.push(
+		flat_list.push(
 			["li",
 				["h2",
 					extras.tpl.button,
@@ -194,21 +200,21 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 		{
 			var pos_first = r.url.indexOf(search) - URL_MATCH_CONTEXT_SIZE;
 			var pos_last = r.url.lastIndexOf(search) + URL_MATCH_CONTEXT_SIZE + search.length;
-			var preffix = pos_first > 0 ? "…" : "";
+			var prefix = pos_first > 0 ? "…" : "";
 			var suffix = pos_last < r.url.length ? "…" : "";
 
-			partial_url_match = preffix + r.url.substring(pos_first, pos_last) + suffix;
+			partial_url_match = prefix + r.url.substring(pos_first, pos_last) + suffix;
 		}
 
-		this.flat_list.push(
+		flat_list.push(
 			["li",
 				["h2",
 					["span",
 						partial_url_match || this._get_short_distinguisher(r),
 						"class", "resource-tree-resource-label",
 						"style", "margin-left:" + (1 + depth) * DEPTH_IDENTATION + "px;",
 						"data-tooltip", "js-script-select",
-						"data-tooltip-text", r.url
+						"data-tooltip-text", r.short_distinguisher
 					],
 					" ",
 					r.same_origin ? [] : ["span", r.host, "class", "resource-domain"],
@@ -232,14 +238,14 @@ window.templates.resource_detail || (window.templates.resource_detail = new func
 		if (!resource.data)
 			return this.no_data_available(resource);
 
-		var specific_template = this[resource.type] ? resource.type : "text";
+		var type = this[resource.type] ? resource.type : "fallback";
 
 		return(
 		["div",
 			this.overview(resource),
 			["div",
-				this[specific_template](resource, resource.data),
-				"class", "resource-detail-" + specific_template + "-container"
+				this[type](resource, resource.data),
+				"class", "resource-detail-" + type + "-container"
 			],
 			"class", "resource-detail-container"
 		]);
@@ -280,14 +286,13 @@ window.templates.resource_detail || (window.templates.resource_detail = new func
 
 	this.overview = function(resource)
 	{
-		var info =
-		{
+		var info = {
 			"response_code": resource.responsecode + " " + cls.ResourceUtil.http_status_codes[resource.responsecode],
 			"size": resource.size || resource.data.contentLength || resource.data.content.length,
 			"character_encoding": resource.encoding || resource.data.characterEncoding
 		};
 
-		var is_error = resource.responsecode && ![200, 304].contains(resource.responsecode);
+		var is_error = resource.error_in_current_response;
 
 		return (
 		["div",
@@ -395,16 +400,15 @@ window.templates.resource_detail || (window.templates.resource_detail = new func
 		]);
 	};
 
-	this.flash = function(resource)
+	this.fallback = function(resource)
 	{
 		return(
-		["object",
-			["div",
-				"Type not supported"
-			],
-			"type", resource.mimeType,
-			"data", resource.data.content.stringData,
-			"class", "resource-detail-flash"
+		[
+			"a",
+			ui_strings.M_CONTEXTMENU_SHOW_RESOURCE,
+			"href", resource.url,
+			"target", "_blank",
+			"class", "resource-detail-link"
 		]);
 	};
 

src/resource-manager/resource_tree_view.js

@@ -19,9 +19,7 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
     ui_strings.S_HTTP_LABEL_FILTER_OTHER
   ];
 
-  this._loading = false;
-
-  this.service = resource_inspector;
+  this._resource_inspector = resource_inspector;
 
   this.get_group_order = function()
   {
@@ -33,26 +31,15 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
 
   this.createView = function(container)
   {
-    var ctx = this.service.get_resource_context();
-    var target = container.firstElementChild;
-    var scroll_top = target ? target.scrollTop : 0;
-    var scroll_left = target ? target.scrollLeft : 0;
     var tpl;
+    var ctx = this._resource_inspector.get_resource_context();
+    var target = container.firstElementChild;
 
     if (ctx)
     {
       ctx.search_term = this.search_term || "";
       tpl = templates.resource_tree.update(ctx);
     }
-    else if (this._loading)
-    {
-      tpl = (
-        ["div",
-         ["p", ui_strings.S_RESOURCE_LOADING_PAGE],
-         "class", "info-box"
-        ]
-      );
-    }
     else
     {
       tpl = (
@@ -67,13 +54,17 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
       );
     }
 
-    //  only render the template if it has changed ( using its JSON representation as hash )
+    //  Exit if the template has not changed since last time ( using its JSON representation as hash )
     var tpl_JSON = JSON.stringify(tpl);
-    if (!this.tpl_JSON || tpl_JSON.length != this.tpl_JSON.length || tpl_JSON != this.tpl_JSON)
-    {
-      container.clearAndRender(tpl);
-      this.tpl_JSON = tpl_JSON;
-    }
+    if (tpl_JSON == this.tpl_JSON)
+      return;
+
+    this.tpl_JSON = tpl_JSON;
+
+    var scroll_top = target ? target.scrollTop : 0;
+    var scroll_left = target ? target.scrollLeft : 0;
+
+    container.clearAndRender(tpl);
 
     target = container.firstElementChild;
     if (target)
@@ -93,39 +84,21 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
     container.clearAndRender(window.templates.disabled_view());
   };
 
-  this._on_abouttoloaddocument_bound = function()
-  {
-    this._loading = true;
-    this.update();
-  }.bind(this);
-
-  this._on_documentloaded_bound = function()
-  {
-    this._loading = false;
-    this.update();
-  }.bind(this);
-
-  this._on_debug_context_selected_bound = function()
-  {
-    this._loading = false;
-    this.update();
-  }.bind(this);
-
   this._init = function()
   {
     this.id = id;
 
     var messages = window.messages;
-    messages.add_listener("debug-context-selected", this._on_debug_context_selected_bound);
+    messages.add_listener("debug-context-selected", this.update);
 
     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);
+    doc_service.add_listener("abouttoloaddocument", this.update);
+    doc_service.add_listener("documentloaded", this.update);
 
     ActionHandlerInterface.apply(this);
     this._handlers = {
-      "select-next-entry": this.service.highlight_next_resource_bound,
-      "select-previous-entry": this.service.highlight_previous_resource_bound
+      "select-next-entry": this._resource_inspector.highlight_next_resource_bound,
+      "select-previous-entry": this._resource_inspector.highlight_previous_resource_bound
     };
     ActionBroker.get_instance().register_handler(this);
 

src/scripts/uri.js

@@ -53,7 +53,6 @@ var URIPrototype = function(uri_prop_name)
     {
       if (!this._is_data_uri)
       {
-        this.pathname;
         var pos = this.pathname.lastIndexOf("/");
         if (pos > -1)
           this._filename = this.pathname.slice(pos + 1);