Skip to content

Commit c6de2fd

Browse files
author
p01
committed
DRYed the _show_resource* code
1 parent 5a65b1e commit c6de2fd

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/resource-manager/resource_detail_view.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,21 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
134134
}
135135
};
136136

137-
this._show_resource_by_instance = function(resource)
137+
this._show_resource = function(resource)
138138
{
139-
this.resource = resource;
140139
if (!resource || !resource.data)
141140
return false;
142141

142+
this.resource = resource;
143143
this._service.highlight_resource(resource.id);
144+
this.update();
144145

145-
if (resource.data)
146-
this.update();
147-
else
146+
return true;
147+
};
148+
149+
this._show_resource_by_instance = function(resource)
150+
{
151+
if (!this._show_resource(resource))
148152
this._show_resource_by_url(resource.url);
149153
};
150154

@@ -158,9 +162,8 @@ cls.ResourceDetailView = function(id, name, container_class, html, default_handl
158162
this._show_resource_by_url = function(url)
159163
{
160164
var resource = this._service.get_resource_for_url(url);
161-
if (resource && resource.data)
162-
this._show_resource_by_instance(resource);
163-
else
165+
166+
if (!this._show_resource(resource))
164167
this._service.request_resource(url, this.show_resource.bind(this), this.data);
165168
};
166169

0 commit comments

Comments
 (0)