projects
/
project
/
luci2
/
ui.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9b01564
)
luci2: expose loaded views in LuCI2.view[]
author
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 31 Jan 2014 21:58:08 +0000
(21:58 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 31 Jan 2014 21:58:08 +0000
(21:58 +0000)
luci2/htdocs/luci2/luci2.js
patch
|
blob
|
history
diff --git
a/luci2/htdocs/luci2/luci2.js
b/luci2/htdocs/luci2/luci2.js
index
beed5ca
..
fd2c671
100644
(file)
--- a/
luci2/htdocs/luci2/luci2.js
+++ b/
luci2/htdocs/luci2/luci2.js
@@
-3707,9
+3707,11
@@
function LuCI2()
renderView: function()
{
renderView: function()
{
- var node = arguments[0];
- var name = node.view.split(/\//).join('.');
- var args = [ ];
+ var node = arguments[0];
+ var name = node.view.split(/\//).join('.');
+ var cname = _luci2.toClassName(name);
+ var views = _luci2.views || (_luci2.views = { });
+ var args = [ ];
for (var i = 1; i < arguments.length; i++)
args.push(arguments[i]);
for (var i = 1; i < arguments.length; i++)
args.push(arguments[i]);
@@
-3718,16
+3720,12
@@
function LuCI2()
_luci2.globals.currentView.finish();
_luci2.ui.renderViewMenu();
_luci2.globals.currentView.finish();
_luci2.ui.renderViewMenu();
-
- if (!_luci2._views)
- _luci2._views = { };
-
_luci2.setHash('view', node.view);
_luci2.setHash('view', node.view);
- if (
_luci2._views[
name] instanceof _luci2.ui.view)
+ if (
views[c
name] instanceof _luci2.ui.view)
{
{
- _luci2.globals.currentView =
_luci2._views[
name];
- return
_luci2._views[name].render.apply(_luci2._views[
name], args);
+ _luci2.globals.currentView =
views[c
name];
+ return
views[cname].render.apply(views[c
name], args);
}
var url = _luci2.globals.resource + '/view/' + name + '.js';
}
var url = _luci2.globals.resource + '/view/' + name + '.js';
@@
-3747,13
+3745,13
@@
function LuCI2()
var viewConstructor = eval(viewConstructorSource);
var viewConstructor = eval(viewConstructorSource);
-
_luci2._views[
name] = new viewConstructor({
+
views[c
name] = new viewConstructor({
name: name,
acls: node.write || { }
});
name: name,
acls: node.write || { }
});
- _luci2.globals.currentView =
_luci2._views[
name];
- return
_luci2._views[name].render.apply(_luci2._views[
name], args);
+ _luci2.globals.currentView =
views[c
name];
+ return
views[cname].render.apply(views[c
name], args);
}
catch(e) {
alert('Unable to instantiate view "%s": %s'.format(url, e));
}
catch(e) {
alert('Unable to instantiate view "%s": %s'.format(url, e));