merging changes
This commit is contained in:
commit
351652e513
7 changed files with 11 additions and 16 deletions
|
@ -381,4 +381,4 @@ Miscellaneous
|
|||
color: rgba(128, 128, 128, 1);
|
||||
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
|
||||
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -398,4 +398,4 @@ Miscellaneous
|
|||
color: rgba(128, 128, 128, 1);
|
||||
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
|
||||
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -309,7 +309,7 @@ Ox.Calendar = function(options, self) {
|
|||
.css({
|
||||
textAlign: 'center'
|
||||
});
|
||||
|
||||
|
||||
renderCalendar();
|
||||
|
||||
function changeDate() {
|
||||
|
|
|
@ -35,4 +35,4 @@ Ox.forEach($('<div>'), function(val, key) {
|
|||
Ox.UI.elements[id] : ret;
|
||||
};
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
@ -3,15 +3,11 @@
|
|||
<head>
|
||||
<title>Ox.js Tests</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<link rel="stylesheet" type="text/css" href="../build/css/ox.ui.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="tests.css"/>
|
||||
<script type="text/javascript" src="../build/js/jquery.js"></script>
|
||||
<!--<script type="text/javascript" src="../build/js/Ox.js"></script>-->
|
||||
<script type="text/javascript" src="../build/js/OxUI.js"></script>
|
||||
<script type="text/javascript" src="../build/js/Ox.js"></script>
|
||||
<!--<script type="text/javascript" src="../build/js/ox.data.js"></script>-->
|
||||
<!--<script type="text/javascript" src="../build/js/ox.ui.js"></script>-->
|
||||
<script type="text/javascript" src="tests.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
@ -9,8 +9,7 @@
|
|||
font-size: 12px;
|
||||
}
|
||||
</style>
|
||||
<script type="text/javascript" src="../build/js/jquery-1.3.2.js"></script>
|
||||
<script type="text/javascript" src="../build/js/ox.js"></script>
|
||||
<script type="text/javascript" src="../build/js/Ox.js"></script>
|
||||
<script>
|
||||
$(function() {
|
||||
var $body = $('body'),
|
||||
|
@ -58,4 +57,4 @@
|
|||
</script>
|
||||
</head>
|
||||
<body></body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Ox.UI(function() {
|
||||
Ox.load('UI', function() {
|
||||
|
||||
//Ox.UI.ready(function() {
|
||||
|
||||
|
@ -27,7 +27,7 @@ Ox.UI(function() {
|
|||
|
||||
setBackground($tests, true);
|
||||
|
||||
tests(['../build/js/ox.js'/*, '../build/js/ox.data.js'*/]);
|
||||
tests(['../build/js/Ox.js'/*, '../build/js/ox.data.js'*/]);
|
||||
|
||||
function tests() {
|
||||
var succeeded = 0, failed = 0,
|
||||
|
@ -131,4 +131,4 @@ Ox.UI(function() {
|
|||
});
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue