fixed z-index and renamed all-app.js to all-app.min.js
This commit is contained in:
parent
9823d95066
commit
2a32c0275a
6 changed files with 6 additions and 14 deletions
|
|
@ -1,7 +1,7 @@
|
|||
[
|
||||
|
||||
{
|
||||
"public/js/report-legacy.js": [
|
||||
"public/js/report-legacy.min.js": [
|
||||
"lib/public/js/legacy/widgets/tabbedpage.js",
|
||||
"lib/public/js/legacy/widgets/report_builder/report_builder.js",
|
||||
"lib/public/js/legacy/widgets/report_builder/datatable.js",
|
||||
|
|
@ -48,14 +48,14 @@
|
|||
},
|
||||
|
||||
{
|
||||
"public/js/all-web.js": [
|
||||
"public/js/all-web.min.js": [
|
||||
"lib/public/js/lib/bootstrap.min.js",
|
||||
"lib/public/js/lib/public/json2.js",
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"public/js/all-app.js": [
|
||||
"public/js/all-app.min.js": [
|
||||
"lib/public/js/lib/jquery/jquery.ui.core.min.js",
|
||||
"lib/public/js/lib/jquery/jquery.ui.datepicker.min.js",
|
||||
"lib/public/js/lib/jquery/jquery.ui.autocomplete.min.js",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ div.dialog_wrapper {
|
|||
position: absolute;
|
||||
width: 440px;
|
||||
display: none;
|
||||
z-index: 90;
|
||||
z-index: 2;
|
||||
background-color: #FFF;
|
||||
box-shadow:1px 1px 8px #444;
|
||||
-moz-box-shadow: 1px 1px 8px #444;
|
||||
|
|
@ -40,7 +40,7 @@ div#freeze {
|
|||
right: 0px;
|
||||
background-color: #aaa;
|
||||
opacity: 0.6;
|
||||
z-index: 50;
|
||||
z-index: 1;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
}
|
||||
window.app = true;
|
||||
</script>
|
||||
<script type="text/javascript" src="js/all-app.js"></script>
|
||||
<script type="text/javascript" src="js/all-app.min.js"></script>
|
||||
<link type="text/css" rel="stylesheet" href="css/all-app.css">
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@ var user_img = {};
|
|||
var pscript = {};
|
||||
var selector=null;
|
||||
|
||||
// ui
|
||||
var top_index=91;
|
||||
|
||||
// Name Spaces
|
||||
// ============
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
//
|
||||
|
||||
var cur_dialog;
|
||||
var top_index=91;
|
||||
|
||||
var Dialog = wn.ui.Dialog.extend({
|
||||
init: function(w, h, title, content) {
|
||||
|
|
|
|||
|
|
@ -66,10 +66,6 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({
|
|||
// place it at the center
|
||||
this.wrapper.style.left = (($(window).width() - cint(this.wrapper.style.width))/2) + 'px';
|
||||
this.wrapper.style.top = ($(window).scrollTop() + 60) + 'px';
|
||||
|
||||
// place it on top
|
||||
top_index++;
|
||||
$y(this.wrapper,{zIndex:top_index});
|
||||
},
|
||||
show: function() {
|
||||
// already live, do nothing
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue