Review fixes

Author: p01

src/resource-manager/resource_detail_view.js

@@ -226,7 +226,7 @@ cls.ResourceDetailView.create_ui_widgets = function()
   });
 
   var text_search = window.views.resource_detail_view.text_search = new TextSearch();
-  var TEXT_RESOURCE_DETAIL_CONTAINER_CLASSNAMES = ["markup", "css", "script", "text"].map( function(v) {
+  var TEXT_RESOURCE_DETAIL_CONTAINER_CLASSNAMES = ["markup", "css", "script", "text"].map(function(v) {
     return ".resource-detail-" + v + "-container";
   });
 

src/resource-manager/resource_service.js

@@ -55,7 +55,7 @@ cls.ResourceInspector = function(network_logger)
     {
       this.group_order = this.tree_view.get_group_order();
       this.group_order_type_index = {};
-      this.group_order.forEach( function(g, i) {
+      this.group_order.forEach(function(g, i) {
         this.group_order_type_index[g.type] = i;
       }, this);
     }
@@ -92,8 +92,8 @@ cls.ResourceInspector = function(network_logger)
     if (ctx.window_list.length)
     {
       // get all the (non-suppressed) resources with content
-      ctx.resource_list = (this._network_logger.get_resources() || []).filter(function(v) {
-        return !this._suppress_uids.hasOwnProperty(v.uid) && v.responsecode != 204;
+      ctx.resource_list = (this._network_logger.get_resources() || []).filter(function(resource) {
+        return !this._suppress_uids.hasOwnProperty(resource.uid) && resource.responsecode != 204;
       }, this);
 
       ctx.selected_resource_uid = this._selected_resource_uid;
@@ -124,34 +124,39 @@ cls.ResourceInspector = function(network_logger)
       // set null_document_id flag,
       // augment the document objects,
       // set the default collapsed flags
-      ctx.document_list = this._document_list.filter(function(d, i, a) {
-        var in_context = window_id_index.hasOwnProperty(d.windowID);
+      ctx.document_list = this._document_list.filter(function(document, document_index, document_list) {
+        var in_context = window_id_index.hasOwnProperty(document.windowID);
 
         if (in_context)
         {
-          if (!null_document_id && !d.documentID)
+          if (!null_document_id && !document.documentID)
             null_document_id = true;
 
-          if (d.resourceID != null)
-            ctx.document_resource_hash[d.resourceID] = d.documentID;
+          if (document.resourceID != null)
+            ctx.document_resource_hash[document.resourceID] = document.documentID;
 
           // populate document_id_index
-          document_id_index[d.documentID] = i;
+          document_id_index[document.documentID] = document_index;
 
           // set depth, pivot_id and same_origin
-          var p = a[document_id_index[d.parentDocumentID]];
-          if (!p)
-            p = {pivot_id: ctx.window_list[window_id_index[d.windowID]].pivot_id, depth: 0};
-          var id = p.pivot_id + lead(d.documentID);
-          d.depth = p.depth + 1;
-          d.pivot_id = id;
-          d.same_origin = cls.ResourceUtil.sameOrigin(p.url, d.url);
+          var parent_document = document_list[document_id_index[document.parentDocumentID]];
+          if (!parent_document)
+          {
+            parent_document = {
+              "pivot_id": ctx.window_list[window_id_index[document.windowID]].pivot_id,
+              "depth": 0
+            };
+          }
+          var id = parent_document.pivot_id + lead(document.documentID);
+          document.depth = parent_document.depth + 1;
+          document.pivot_id = id;
+          document.same_origin = cls.ResourceUtil.sameOrigin(parent_document.url, document.url);
 
           // set the default collapsed flag
           var hash = this._collapsed_hash;
           if (!hash.hasOwnProperty(id))
           {
-            hash[id] = d.depth > 1;
+            hash[id] = document.depth > 1;
             ctx.group_order.forEach(function(g) { hash[id + "_" + g.type] = true; });
           }
         }
@@ -167,25 +172,25 @@ cls.ResourceInspector = function(network_logger)
       // same_origin flag to each resource,
       // full_id ( pivot_id + group + uid ),
       // pivot_id
-      ctx.resource_list = ctx.resource_list.filter(function(r) {
+      ctx.resource_list = ctx.resource_list.filter(function(resource) {
         // check if this is the top resource of a document
-        var document_id = ctx.document_resource_hash[r.resource_id];
-        if (document_id != null && document_id != r.document_id)
-          r.document_id = document_id;
+        var document_id = ctx.document_resource_hash[resource.resource_id];
+        if (document_id != null && document_id != resource.document_id)
+          resource.document_id = document_id;
 
-        var d = this._document_list[document_id_index[r.document_id]];
-        if (!d)
+        var document = this._document_list[document_id_index[resource.document_id]];
+        if (!document)
         {
           unknown_document_id = true;
           return false;
         }
 
-        r.group = this.group_order_type_index.hasOwnProperty(r.type) ? r.type : ctx.group_order.last.type;
-        r.same_origin = cls.ResourceUtil.sameOrigin(d.url, r);
+        resource.group = this.group_order_type_index.hasOwnProperty(resource.type) ? resource.type : ctx.group_order.last.type;
+        resource.same_origin = cls.ResourceUtil.sameOrigin(document.url, resource);
 
-        r.full_id = d.pivot_id + " " + lead(this.group_order_type_index[r.group], " ") + r.group + "_" + r.uid;
-        r.pivot_id = d.pivot_id + "_" + r.group;
-        r.is_hidden = ctx.collapsed[r.pivot_id] == true;
+        resource.full_id = document.pivot_id + " " + lead(this.group_order_type_index[resource.group], " ") + "_" + resource.uid;
+        resource.pivot_id = document.pivot_id + "_" + resource.group;
+        resource.is_hidden = ctx.collapsed[resource.pivot_id] == true;
 
         return true;
       }, this);
@@ -196,9 +201,9 @@ cls.ResourceInspector = function(network_logger)
       });
 
       // filter the list of window. Purge the ones with no documents
-      ctx.window_list = ctx.window_list.filter(function(v) {
-        return ctx.document_list.some(function(w) {
-          return v.id == w.windowID;
+      ctx.window_list = ctx.window_list.filter(function(window) {
+        return ctx.document_list.some(function(document) {
+          return window.id == document.windowID;
         });
       });
 
@@ -293,8 +298,7 @@ cls.ResourceInspector = function(network_logger)
     {
       e.addClass(HIGHLIGHT_CLASSNAME);
 
-      if (window.Tooltips)
-        window.Tooltips.hide_tooltip();
+      Tooltips.hide_tooltip();
 
       // scroll into view
       var container = this.tree_view.get_container().firstChild;

src/resource-manager/resource_style.css

@@ -265,6 +265,7 @@ a.resource-detail-link:hover
   height: 100%;
   border: 0;
   font-size: 64px;
+  /* The @font-face declaration of "the font" is created by the resource_detail.font template */
   font-family: "the font";
   box-sizing: border-box;
   white-space: pre;