Skip to content

Commit e22e97c

Browse files
author
p01
committed
added detail templates for all types of resources, moved the handlers out of the view into the ResourceManagerService, cleaned up OpenSingleResource and added a requestCreateRequest for resources in AppCache, added a few types in ResourceUtil
1 parent e49334e commit e22e97c

File tree

11 files changed

+554
-154
lines changed

11 files changed

+554
-154
lines changed

‎src/build-application/build_resource_manager_1_0.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ window.app.builders.ResourceManager["1.0"] = function(service)
44
{
55
// p01 WIP resource views
66
new cls.ResourceTestView('resource_tree_view','Tree View');
7-
//new cls.ResourceTestView('resource_search', 'Search');
7+
new cls.ResourceDetailView('resource_detail_view', 'Detail');
88

99

10-
new cls.ResourceManagerAllView('resource_all', ui_strings.M_VIEW_LABEL_ALL_RESOURCES, 'scroll resource-manager', '', '');
10+
// new cls.ResourceManagerAllView('resource_all', ui_strings.M_VIEW_LABEL_ALL_RESOURCES, 'scroll resource-manager', '', '');
11+
1112
//new cls.ResourceManagerFontView('resource_fonts', "Fonts", 'scroll', '', '');
1213
//new cls.ResourceManagerImageView('resource_images', "Images", 'scroll', '', '');
14+
1315
new cls.NetworkLogView('network_logger', ui_strings.M_VIEW_LABEL_NETWORK_LOG, 'scroll', '', '');
1416
new cls.RequestCraftingView('request_crafter', ui_strings.M_VIEW_LABEL_REQUEST_CRAFTER, 'scroll', '', '');
1517
new cls.NetworkOptionsView('network_options',

‎src/client-en.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ window.load_screen_timeout = window.setTimeout(function()
480480
<script src="./resource-manager/documentmanager.1.0.events.onabouttoloaddocument.js"/>
481481

482482
<script src="./resource-manager/resource_test_view.js"/>
483+
<script src="./resource-manager/resource_detail_view.js"/>
483484

484485

485486
<script src="./network/network_service.js"/>

‎src/client/client.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,11 +584,14 @@ ui_framework.layouts.resource_rough_layout =
584584
children:
585585
[
586586
{
587-
width: 700, tabbar: { id:'resources_tree', tabs: ['resource_tree_view'] }
587+
width: 500, tabbar: { id:'resources_tree', tabs: ['resource_tree_view'], is_hidden:true }
588588
},
589589
{
590-
width: 300, tabbar: { id: "resources", tabs: ['resource_all'], _is_hidden: true }
591-
}
590+
width:400, tabbar:{id:'resource_detail',tabs:['resource_detail_view'], is_hidden:true }
591+
}/*,
592+
{
593+
width: 100, tabbar: { id: "resources", tabs: ['resource_all'], _is_hidden: true }
594+
}*/
592595
]
593596
};
594597

‎src/resource-manager/opensingleresource.js‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
window.cls || (window.cls = {});
22

3-
cls.OpenSingleResource = function(resource_manager, url, data)
3+
cls.OpenSingleResource = function(view,manager, url, data)
44
{
5-
this._resman = resource_manager;
5+
this._view = view;
6+
this._manager = manager;
67
this._url = url;
78
this._data = data;
89

@@ -24,7 +25,8 @@ cls.OpenSingleResource.prototype = new function()
2425

2526
this._show_resource = function()
2627
{
27-
if (!this._resman.show_resource_for_url(this._url, this._data))
28+
if (!this._manager.get_resource_for_url(this._url))
29+
//if (!this._view.show_resource_for_url(this._url, this._data))
2830
{
2931
if (this._service.requestGetResourceID)
3032
{
@@ -39,6 +41,33 @@ cls.OpenSingleResource.prototype = new function()
3941
};
4042

4143
this._on_resolve_url = function(status, message)
44+
{
45+
if (status)
46+
{
47+
if (this._service.requestCreateRequest)
48+
{
49+
var debugContext = window.window_manager_data.get_debug_context();
50+
var tag = this._tagman.set_callback(this, this._on_resolve_url_request);
51+
this._service.requestCreateRequest(tag, [debugContext, this._url, 'GET']);
52+
}
53+
else
54+
{
55+
this._fallback();
56+
}
57+
}
58+
else
59+
{
60+
const RESOURCE_ID = 0;
61+
this._rid = message[RESOURCE_ID];
62+
// if (!this._view.show_resource_for_id(this._rid))
63+
{
64+
var tag = this._tagman.set_callback(this, this._on_mime_type);
65+
this._service.requestGetResource(tag, [this._rid, [TRANSPORT_OFF]]);
66+
}
67+
}
68+
};
69+
70+
this._on_resolve_url_request = function(status, message)
4271
{
4372
if (status)
4473
{
@@ -48,7 +77,7 @@ cls.OpenSingleResource.prototype = new function()
4877
{
4978
const RESOURCE_ID = 0;
5079
this._rid = message[RESOURCE_ID];
51-
if (!this._resman.show_resource_for_id(this._rid))
80+
// if (!this._view.show_resource_for_id(this._rid))
5281
{
5382
var tag = this._tagman.set_callback(this, this._on_mime_type);
5483
this._service.requestGetResource(tag, [this._rid, [TRANSPORT_OFF]]);
@@ -80,6 +109,7 @@ cls.OpenSingleResource.prototype = new function()
80109
this._service.requestGetResource(tag, msg);
81110
}
82111
};
112+
.001
83113

84114
this._on_resource = function(status, message)
85115
{
@@ -89,8 +119,10 @@ cls.OpenSingleResource.prototype = new function()
89119
}
90120
else
91121
{
92-
this._res.update("urlfinished", new this._ResourceData(message));
93-
this._resman.open_resource_tab(this._res, this._data);
122+
//this._res.update("urlfinished", new this._ResourceData(message));
123+
this._res.update("responsefinished", message );
124+
this._view.open_resource_tab(this._res, this._data);
125+
window.UI.instance.show_view( this._view.id );
94126
}
95127
};
96128

‎src/resource-manager/resource_all_view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ cls.ResourceManagerAllView = function(id, name, container_class, html, default_h
3434

3535
this.show_resource_for_id = function(rid, data)
3636
{
37-
var res = this._service.get_resource_for_id(rid);
37+
var res = this._service.get_resource(rid);
3838
if (res)
3939
{
4040
this._view = this._open_resource_tab(res, data);

‎src/resource-manager/resource_base.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ cls.JSResourceDetail = function(res, service, options)
334334

335335
this.init(res, service);
336336
}
337-
338337
cls.JSResourceDetail.prototype = cls.ResourceDetailSearch.prototype;
339338

340339

‎src/resource-manager/resource_display_broker.js‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,38 @@ cls.ResourceDisplayBroker = function()
88
}
99
cls.ResourceDisplayBroker.instance = this;
1010

11+
12+
this._view = null;
13+
this._check = function()
14+
{
15+
this._view = window.views.resource_detail_view;
16+
}
17+
1118
this.show_resource_for_id = function(id, line)
1219
{
20+
var data = {};
21+
var view = window.views.resource_detail_view; //resource_all;
22+
if (window.services["resource-manager"] && view)
23+
{
1324
if (line)
1425
{
15-
var data = {"lines":[line]}
16-
}
17-
if (window.services["resource-manager"] && window.views.resource_all)
18-
{
19-
var view = window.views.resource_all;
26+
var data = {"lines":[line]};
27+
}
2028
view.show_resource_for_id(id, data);
2129
}
2230
}
2331

2432
this.show_resource_for_url = function(url, line)
2533
{
26-
27-
if (window.services["resource-manager"] && window.views.resource_all)
34+
var data = {};
35+
var view = window.views.resource_detail_view; //resource_all;
36+
if (window.services["resource-manager"] && view)
2837
{
2938
if (line)
3039
{
3140
var data = {"lines":[line]};
3241
}
33-
else
34-
{
35-
var data = {};
36-
}
37-
new cls.OpenSingleResource(window.views.resource_all, url, data);
42+
new cls.OpenSingleResource(view, cls.ResourceManagerService.instance, url, data);
3843
}
3944
else
4045
{

0 commit comments

Comments
 (0)