Skip to content

Commit a0ebc74

Browse files
author
p01
committed
Moved the metadata logic of cls.ResourceInfo to a getter
1 parent 6ebc5f0 commit a0ebc74

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/network/network_service.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,6 +1289,7 @@ cls.NetworkLoggerResponse.prototype = new cls.NetworkLoggerResponsePrototype();
12891289

12901290
cls.ResourceInfo = function(entry)
12911291
{
1292+
this.uid = entry.id;
12921293
this.resource_id = entry.resource_id;
12931294
this.url = entry.url;
12941295
this.document_id = entry.document_id;
@@ -1299,13 +1300,15 @@ cls.ResourceInfo = function(entry)
12991300

13001301
var last_response = entry.requests_responses && entry.requests_responses.last;
13011302
if (last_response && last_response.responsebody)
1302-
{
13031303
this.data = last_response.responsebody;
1304-
if (cls.ResourceUtil && cls.ResourceUtil.get_meta_data)
1305-
this.data.meta = cls.ResourceUtil.get_meta_data(this);
1306-
}
1307-
1308-
this.uid = entry.id;
13091304
};
13101305

13111306
cls.ResourceInfo.prototype = new URIPrototype("url");
1307+
1308+
cls.ResourceInfo.prototype.__defineGetter__("metadata", function()
1309+
{
1310+
if(this._metadata === undefined && this.data != null)
1311+
this._metadata = cls.ResourceUtil.get_meta_data(this);
1312+
1313+
return this._metadata;
1314+
});

src/resource-manager/resource_templates.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ window.templates.resource_tree || (window.templates.resource_tree = new function
5151
context.resources = [];
5252
context.resource_list.forEach(function(r) {
5353
r.is_hidden = context.collapsed[r.pivot_id] == true &&
54-
(context.search_term != "" && !r.url.contains(context.search_term));
54+
context.search_term != "" && !r.url.contains(context.search_term);
5555

5656
if (!r.is_hidden)
5757
context.resources.push(r);
@@ -312,7 +312,7 @@ window.templates.resource_detail || (window.templates.resource_detail = new func
312312
],
313313
["span",
314314
cls.ResourceUtil.bytes_to_human_readable(info.size) +
315-
(resource.data.meta ? " (" + resource.data.meta + ")" : ""),
315+
(resource.metadata ? " (" + resource.metadata + ")" : ""),
316316
"data-tooltip", "js-script-select",
317317
"data-tooltip-text", info.size + " " + ui_strings.S_BYTES_UNIT,
318318
"class", "resource-detail-overview-size"

0 commit comments

Comments
 (0)