Review fixes

Author: p01

src/resource-manager/resource_detail_view.js

@@ -107,9 +107,9 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
     this._line_found = false;
     this._target_line = 0;
     this._tops = [];
-    var _ele = container.querySelector("." + HIGHLIGHTED_LINE_CLASSNAME);
-    if (_ele)
-      _ele.removeClass(HIGHLIGHTED_LINE_CLASSNAME);
+    var ele = container.querySelector("." + HIGHLIGHTED_LINE_CLASSNAME);
+    if (ele)
+      ele.removeClass(HIGHLIGHTED_LINE_CLASSNAME);
   };
 
   this.go_to_line = function(container, data)

src/resource-manager/resource_display_broker.js

@@ -48,7 +48,7 @@ cls.ResourceDisplayBroker = function()
       id_or_url = url;
     }
 
-    if(line)
+    if (line)
       data.line = Number(line);
 
     if (!this._show_resource(id_or_url, data) && url)

src/resource-manager/resource_service.js

@@ -12,8 +12,7 @@ cls.ResourceInspector = function(network_logger)
   var HIGHLIGHT_CLASSNAME = "resource-highlight";
 
   var THROTTLE_DELAY = 250;
-  var TYPE_GROUP_MAPPING =
-  {
+  var TYPE_GROUP_MAPPING = {
     "markup": ui_strings.S_HTTP_LABEL_FILTER_MARKUP,
     "css": ui_strings.S_HTTP_LABEL_FILTER_STYLESHEETS,
     "script": ui_strings.S_HTTP_LABEL_FILTER_SCRIPTS,
@@ -162,7 +161,7 @@ cls.ResourceInspector = function(network_logger)
           r.document_id = document_id;
 
         var d = this._document_list[document_id_index[r.document_id]];
-        if(!d)
+        if (!d)
         {
           unknown_document_id = true;
           return false;
@@ -378,12 +377,12 @@ cls.ResourceInspector = function(network_logger)
 
   this.get_resource = function(uid)
   {
-    return this._get_resource_by_key_value('uid', uid);
+    return this._get_resource_by_key_value("uid", uid);
   };
 
   this.get_resource_by_url = function(url)
   {
-    return this._get_resource_by_key_value('url', url);
+    return this._get_resource_by_key_value("url", url);
   };
 
   this.request_resource_data = function(url, callback, data, resource_info)
@@ -410,7 +409,7 @@ cls.ResourceRequest = function(url, callback, data, resource_info)
   {
     this.url = url;
     this.resource_info = resource_info;
-    this._data = data||{};
+    this._data = data || {};
     this._callback = callback;
     this._retries = 0;
 
@@ -480,9 +479,9 @@ cls.ResourceRequest = function(url, callback, data, resource_info)
         this.requests_responses = [{responsebody: resource_data}];
         var resource_info = new cls.ResourceInfo(this);
         if (!this.resource_info)
-            this.resource_info = resource_info;
-          else
-            this.resource_info.data = resource_info.data;
+          this.resource_info = resource_info;
+        else
+          this.resource_info.data = resource_info.data;
 
         // broadcast that we got payload of the resource
         window.messages.post("resource-request-resource", {resource_id: this.resource_id});

src/resource-manager/resource_style.css

@@ -318,13 +318,13 @@ a.external:hover
 
 .resource-tree li > h2:hover
 {
-  background-color: rgba(137, 173, 232, 0.196);
+  background-color: rgba(137, 173, 232, 0.2);
 }
 
 .resource-highlight
 {
   color: #fff;
-  background-color: rgba(55, 115, 211, 0.702);
+  background-color: rgba(55, 115, 211, 0.7);
 }
 
 h2 .resource-tree-count

src/resource-manager/resource_templates.js

@@ -104,8 +104,8 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 	{
 		var document_resources = context.document_resources[d.documentID] || [];
 		var resources = context.resources.filter(function(r) {
-				return document_resources.contains(r.uid);
-			});
+			return document_resources.contains(r.uid);
+		});
 
 		if (resources.length > 0)
 		{
@@ -190,22 +190,22 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 	this.resource = function(context, depth, r)
 	{
 		var search = context.search_term;
-		var partial_URL_match = "";
+		var partial_url_match = "";
 		if (search != "")
 		{
 			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 suffix = pos_last < r.url.length ? "…" : "";
 
-			partial_URL_match = preffix + r.url.substring(pos_first, pos_last) + suffix;
+			partial_url_match = preffix + r.url.substring(pos_first, pos_last) + suffix;
 		}
 
 		this.flat_list.push(
 			["li",
 				["h2",
 					["span",
-						partial_URL_match || this._get_short_distinguisher(r),
+						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",
@@ -223,7 +223,6 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
 	};
 });
 
-
 window.templates.resource_detail || (window.templates.resource_detail = new function()
 {
 	this.update = function(resource)
@@ -306,8 +305,8 @@ window.templates.resource_detail || (window.templates.resource_detail = new func
 			["span",
 				(is_error ? info.response_code + " - " : "") +
 				ui_strings.S_RESOURCE_SENT_AND_GUESSED_TYPE
-				.replace("%(SENT)s", resource.data.mimeType)
-				.replace("%(GUESSED)s", resource.type) +
+					.replace("%(SENT)s", resource.data.mimeType)
+					.replace("%(GUESSED)s", resource.type) +
 				(info.character_encoding && " " + ui_strings.S_RESOURCE_ENCODING.replace("%s", info.character_encoding)),
 				"class", "resource-detail-overview-type" + (is_error ? " resource-detail-error" : "")
 			],

src/resource-manager/resource_tree_view.js

@@ -19,10 +19,8 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
     ui_strings.S_HTTP_LABEL_FILTER_OTHER
   ];
 
-  // "private"
   this._loading = false;
 
-  // public
   this.service = resource_inspector;
 
   this.get_group_order = function()
@@ -37,8 +35,8 @@ cls.ResourceTreeView = function(id, name, container_class, html, default_handler
   {
     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 scroll_top = target ? target.scrollTop : 0;
+    var scroll_left = target ? target.scrollLeft : 0;
     var tpl;
 
     if (ctx)

src/resource-manager/resource_util.js

@@ -404,16 +404,7 @@ cls.ResourceUtil.http_status_codes = {
 
 cls.ResourceUtil.sameOrigin = function(reference, url)
 {
-  if (!reference)
-    return true;
-
-  if (reference.protocol == url.protocol)
-  {
-    if (reference.host == url.host)
-      return true;
-    if (reference.host.match(new RegExp("\\." + url.host + "$")) != null)
-      return true;
-  }
-
-  return false;
+  return !reference ||
+    (reference.protocol == url.protocol &&
+      (reference.host == url.host || reference.host.endswith("." + url.host)));
 }