Permalink
Browse files

new major version 2.0.0

Added fast month and year select
Added touch handler for scroller element
Update screens
Creation of a custom scrollbars allocated into a plugin xdsoftScroller
  • Loading branch information...
1 parent 2086152 commit 5aa18c624f9be583b18bb6216ba5c8745e77b4d3 @xdan committed Dec 4, 2013
Showing with 223 additions and 33 deletions.
  1. +3 −2 datetimepicker.jquery.json
  2. +1 −0 index.html
  3. +40 −6 jquery.datetimepicker.css
  4. +179 −25 jquery.datetimepicker.js
  5. BIN screen/1.png
  6. BIN screen/3.png
@@ -16,9 +16,10 @@
"scroller",
"picker",
"i18n",
- "input"
+ "input",
+ "touch"
],
- "version": "1.1.1",
+ "version": "2.0.0",
"author": {
"name": "Chupurnov Valeriy",
"url": "http://xdsoft.net/contacts.html"
View
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="./jquery.datetimepicker.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
padding-left: 0px;
padding-top: 2px;
position: absolute;
- z-index: 9999;
+ z-index: 99;
box-sizing: border-box;
display:none;
-webkit-touch-callout: none;
@@ -22,6 +22,7 @@
-ms-user-select: none;
user-select: none;
}
+
.xdsoft_noselect{
-webkit-touch-callout: none;
-webkit-user-select: none;
@@ -143,8 +144,7 @@
.xdsoft_datetimepicker .xdsoft_label{
display: inline;
position: relative;
- z-index: 9999;
- overflow: hidden;
+ z-index: 99;
margin: 0;
padding: 5px 3px;
font-size: 14px;
@@ -154,6 +154,37 @@
float:left;
width:182px;
text-align:center;
+ cursor:pointer;
+}
+.xdsoft_datetimepicker .xdsoft_label:hover{
+ text-decoration:underline;
+}
+.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select{
+ border:1px solid #ccc;
+ position:absolute;
+ display:block;
+ right:0px;
+ top:30px;
+ z-index:101;
+ display:none;
+ background:#fff;
+ max-height:160px;
+ overflow-y:hidden;
+}
+.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select.xdsoft_monthselect{right:-7px;}
+.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select.xdsoft_yearselect{right:2px;}
+.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option:hover{
+ color: #fff;
+ background: #ff8000;
+}
+.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option{
+ padding:2px 10px 2px 5px;
+}
+.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current{
+ background: #33AAFF;
+ box-shadow: #178FE5 0px 1px 3px 0px inset;
+ color:#fff;
+ font-weight: 700;
}
.xdsoft_datetimepicker .xdsoft_month{
width:114px;
@@ -219,7 +250,7 @@
.xdsoft_datetimepicker .xdsoft_calendar th{
font-weight: 700;
text-align: center;
- color: #999999;
+ color: #9999;
cursor:default;
}
.xdsoft_datetimepicker .xdsoft_copyright{ color:#ccc !important; font-size:10px;clear:both;float:none;margin-left:8px;}
@@ -231,17 +262,20 @@
position:relative;
border:1px solid #ccc;
}
-.xdsoft_time_box > .xdsoft_scrollbar >.xdsoft_scroller{
+.xdsoft_scrollbar >.xdsoft_scroller{
background:#ccc !important;
height:20px;
border-radius:3px;
}
-.xdsoft_time_box > .xdsoft_scrollbar{
+.xdsoft_scrollbar{
position:absolute;
width:7px;
width:7px;
right:0px;
top:0px;
bottom:0px;
cursor:pointer;
+}
+.xdsoft_scroller_box{
+position:relative;
}
Oops, something went wrong.

0 comments on commit 5aa18c6

Please sign in to comment.