Skip to content

Commit

Permalink
Fix behavior under iPad and iPhone
Browse files Browse the repository at this point in the history
  • Loading branch information
xdan committed Oct 23, 2014
1 parent 57251e4 commit 0a5e0ef
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 94 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"datetimepicker",
"version":"2.3.7",
"version":"2.3.8",
"main": [
"jquery.datetimepicker.js",
"jquery.datetimepicker.css"
Expand Down
2 changes: 1 addition & 1 deletion datetimepicker.jquery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datetimepicker",
"version": "2.3.7",
"version": "2.3.8",
"title": "jQuery Date and Time picker",
"description": "jQuery plugin for date, time, or datetime manipulation in form",
"keywords": [
Expand Down
7 changes: 6 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
</style>
</head>
<body>

<p><a href="http://xdsoft.net/jqplugins/datetimepicker/">Homepage</a></p>
<h3>DateTimePicker</h3>
<input type="text" value="" id="datetimepicker"/><br><br>
Expand All @@ -22,6 +23,7 @@ <h3>TimePicker</h3>
<h3>DatePicker</h3>
<input type="text" id="datetimepicker2"/><br><br>
<h3>Inline DateTimePicker</h3>
<!--<div id="console" style="background-color:#fff;color:red">sdfdsfsdf</div>-->
<input type="text" id="datetimepicker3"/><input type="button" onclick="$('#datetimepicker3').datetimepicker({value:'2011/12/11 12:00'})" value="set inline value 2011/12/11 12:00"/><br><br>
<h3>Button Trigger</h3>
<input type="text" value="2013/12/03 18:00" id="datetimepicker4"/><input id="open" type="button" value="open"/><input id="close" type="button" value="close"/><input id="reset" type="button" value="reset"/>
Expand Down Expand Up @@ -55,7 +57,10 @@ <h3>Dark theme</h3>
</body>
<script src="./jquery.js"></script>
<script src="./jquery.datetimepicker.js"></script>
<script>
<script>/*
window.onerror = function(errorMsg) {
$('#console').html($('#console').html()+'<br>'+errorMsg)
}*/
$('#datetimepicker').datetimepicker({
dayOfWeekStart : 1,
lang:'ru',
Expand Down
5 changes: 3 additions & 2 deletions jquery.datetimepicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
text-align:center;
cursor:pointer;
}
.xdsoft_datetimepicker .xdsoft_label:hover{
.xdsoft_datetimepicker .xdsoft_label:hover>span{
text-decoration:underline;
}
.xdsoft_datetimepicker .xdsoft_label:hover i{
Expand All @@ -214,7 +214,8 @@
background: #ff8000;
}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option{
padding:2px 10px 2px 5px;
padding:2px 10px 2px 5px;
text-decoration:none !important;
}
.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current{
background: #33AAFF;
Expand Down
187 changes: 98 additions & 89 deletions jquery.datetimepicker.js

Large diffs are not rendered by default.

0 comments on commit 0a5e0ef

Please sign in to comment.