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:
e2e4f3c
)
luci2: change LuCI2.ui.dialog() to return the resulting element tree, implement wide...
author
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 31 Jan 2014 21:37:22 +0000
(21:37 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 31 Jan 2014 21:37:22 +0000
(21:37 +0000)
luci2/htdocs/luci2/luci2.js
patch
|
blob
|
history
diff --git
a/luci2/htdocs/luci2/luci2.js
b/luci2/htdocs/luci2/luci2.js
index
bbfb6d3
..
8d250cd
100644
(file)
--- a/
luci2/htdocs/luci2/luci2.js
+++ b/
luci2/htdocs/luci2/luci2.js
@@
-3268,13
+3268,13
@@
function LuCI2()
{
state.dialog.modal('hide');
{
state.dialog.modal('hide');
- return;
+ return
state.dialog
;
}
var cnt = state.dialog.children().children().children('div.modal-body');
var ftr = state.dialog.children().children().children('div.modal-footer');
}
var cnt = state.dialog.children().children().children('div.modal-body');
var ftr = state.dialog.children().children().children('div.modal-footer');
- ftr.empty();
+ ftr.empty()
.show()
;
if (options.style == 'confirm')
{
if (options.style == 'confirm')
{
@@
-3295,10
+3295,21
@@
function LuCI2()
.attr('disabled', true));
}
.attr('disabled', true));
}
+ if (options.wide)
+ {
+ state.dialog.addClass('wide');
+ }
+ else
+ {
+ state.dialog.removeClass('wide');
+ }
+
state.dialog.find('h4:first').text(title);
state.dialog.modal('show');
cnt.empty().append(content);
state.dialog.find('h4:first').text(title);
state.dialog.modal('show');
cnt.empty().append(content);
+
+ return state.dialog;
},
upload: function(title, content, options)
},
upload: function(title, content, options)