Permalink
Browse files

Release 1.3.2.

  • Loading branch information...
2 parents 1046549 + c73e835 commit a43ffae24d3ee65de809a015f1ae1eab006488fe @wvega committed Sep 14, 2014
Showing with 54,865 additions and 376 deletions.
  1. +4 −4 .gitignore
  2. +4 −0 CHANGELOG
  3. +18 −7 Gruntfile.js
  4. +2 −3 README.md
  5. +4 −4 jquery-timepicker.jquery.json
  6. +31 −27 jquery.timepicker.css
  7. +70 −50 jquery.timepicker.js
  8. +4 −4 package.json
  9. +13 −5 test/resources/jquery-ui.js
  10. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/animated-overlay.gif
  11. BIN ...rces/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  12. BIN ...rces/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
  13. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
  14. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
  15. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
  16. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
  17. BIN ...sources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  18. BIN ...rces/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  19. BIN ...urces/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  20. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-icons_222222_256x240.png
  21. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-icons_228ef1_256x240.png
  22. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
  23. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
  24. BIN test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/images/ui-icons_ffffff_256x240.png
  25. +1,178 −0 test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/jquery-ui-1.10.4.custom.css
  26. +7 −0 test/resources/jquery-ui/jquery-ui-1.10.4/css/ui-lightness/jquery-ui-1.10.4.custom.min.css
  27. +15,008 −0 test/resources/jquery-ui/jquery-ui-1.10.4/js/jquery-ui-1.10.4.custom.js
  28. +7 −0 test/resources/jquery-ui/jquery-ui-1.10.4/js/jquery-ui-1.10.4.custom.min.js
  29. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  30. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_diagonals-thick_20_666666_40x40.png
  31. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_flat_10_000000_40x100.png
  32. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_glass_100_f6f6f6_1x400.png
  33. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_glass_100_fdf5ce_1x400.png
  34. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_glass_65_ffffff_1x400.png
  35. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  36. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  37. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  38. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-icons_222222_256x240.png
  39. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-icons_228ef1_256x240.png
  40. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-icons_ef8c08_256x240.png
  41. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-icons_ffd27a_256x240.png
  42. BIN test/resources/jquery-ui/jquery-ui-1.11.1/images/ui-icons_ffffff_256x240.png
  43. +1,225 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.css
  44. +16,375 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.js
  45. +7 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.min.css
  46. +13 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.min.js
  47. +833 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.structure.css
  48. +5 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.structure.min.css
  49. +410 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.theme.css
  50. +5 −0 test/resources/jquery-ui/jquery-ui-1.11.1/jquery-ui.theme.min.css
  51. BIN ...urces/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  52. BIN ...urces/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
  53. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
  54. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
  55. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
  56. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
  57. BIN ...esources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  58. BIN ...urces/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  59. BIN ...ources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  60. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-icons_222222_256x240.png
  61. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-icons_228ef1_256x240.png
  62. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
  63. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
  64. BIN test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/images/ui-icons_ffffff_256x240.png
  65. +462 −0 test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/jquery-ui-1.9.2.custom.css
  66. +7 −0 test/resources/jquery-ui/jquery-ui-1.9.2/css/ui-lightness/jquery-ui-1.9.2.custom.min.css
  67. +14,879 −0 test/resources/jquery-ui/jquery-ui-1.9.2/js/jquery-ui-1.9.2.custom.js
  68. +7 −0 test/resources/jquery-ui/jquery-ui-1.9.2/js/jquery-ui-1.9.2.custom.min.js
  69. +2 −2 test/resources/jquery.js
  70. +4 −0 test/resources/jquery/jquery-1.11.0.min.js
  71. +4 −0 test/resources/jquery/jquery-1.11.1.min.js
  72. +4 −0 test/resources/jquery/jquery-2.1.0.min.js
  73. +4 −0 test/resources/jquery/jquery-2.1.1.min.js
  74. +2 −2 test/runner.js
  75. +38 −13 test/test.js
  76. +32 −0 test/visual.html
  77. +295 −0 test/visuals/i43/calendar.html
  78. BIN test/visuals/i43/css/custom-theme/images/animated-overlay.gif
  79. BIN test/visuals/i43/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  80. BIN test/visuals/i43/css/custom-theme/images/ui-bg_flat_100_ffffff_40x100.png
  81. BIN test/visuals/i43/css/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png
  82. BIN test/visuals/i43/css/custom-theme/images/ui-bg_highlight-soft_100_f7f9fb_1x100.png
  83. BIN test/visuals/i43/css/custom-theme/images/ui-icons_191919_256x240.png
  84. BIN test/visuals/i43/css/custom-theme/images/ui-icons_2e83ff_256x240.png
  85. BIN test/visuals/i43/css/custom-theme/images/ui-icons_323a45_256x240.png
  86. BIN test/visuals/i43/css/custom-theme/images/ui-icons_454545_256x240.png
  87. BIN test/visuals/i43/css/custom-theme/images/ui-icons_888888_256x240.png
  88. BIN test/visuals/i43/css/custom-theme/images/ui-icons_cd0a0a_256x240.png
  89. +1,203 −0 test/visuals/i43/css/custom-theme/jquery-ui-1.10.4.custom.css
  90. +397 −0 test/visuals/i43/css/jquery.formstyler.css
  91. +1,857 −0 test/visuals/i43/css/main.css
  92. +1 −0 test/visuals/i43/css/normalize.min.css
  93. BIN test/visuals/i43/img/calendar-list__link.png
  94. BIN test/visuals/i43/img/ico-add-small.png
  95. BIN test/visuals/i43/img/ico-add.png
  96. BIN test/visuals/i43/img/ico-alarm__btn.png
  97. BIN test/visuals/i43/img/ico-archive.png
  98. BIN test/visuals/i43/img/ico-arrow-left.png
  99. BIN test/visuals/i43/img/ico-arrow-next.png
  100. BIN test/visuals/i43/img/ico-arrow-prev.png
  101. BIN test/visuals/i43/img/ico-calendar.png
  102. BIN test/visuals/i43/img/ico-camera-list.png
  103. BIN test/visuals/i43/img/ico-clock.png
  104. BIN test/visuals/i43/img/ico-close.png
  105. BIN test/visuals/i43/img/ico-date.png
  106. BIN test/visuals/i43/img/ico-download.png
  107. BIN test/visuals/i43/img/ico-ignore.png
  108. BIN test/visuals/i43/img/ico-live.png
  109. BIN test/visuals/i43/img/ico-logout.png
  110. BIN test/visuals/i43/img/ico-map-pins.png
  111. BIN test/visuals/i43/img/ico-setting.png
  112. BIN test/visuals/i43/img/ico-user.png
  113. BIN test/visuals/i43/img/logo.png
  114. BIN test/visuals/i43/img/timeline-bg.png
  115. BIN test/visuals/i43/img/timeline__alarm-flag.png
  116. BIN test/visuals/i43/img/timeline__record-current-bg.png
  117. BIN test/visuals/i43/img/timeline__scroll-bridge.png
  118. BIN test/visuals/i43/img/timeline__scroll-control-bg.png
  119. BIN test/visuals/i43/img/timeline__scroll-control-left.png
  120. BIN test/visuals/i43/img/timeline__scroll-control-right.png
  121. +114 −0 test/visuals/i43/js/hoverIntent.js
  122. +27 −0 test/visuals/i43/js/jquery.formstyler.min.js
  123. +5 −0 test/visuals/i43/js/main.js
  124. +257 −0 test/visuals/i43/js/superfish.js
  125. +6 −0 test/visuals/i43/js/vendor/jquery-1.10.1.min.js
  126. +7 −0 test/visuals/i43/js/vendor/jquery-ui-1.10.4.custom.min.js
  127. +11 −0 test/visuals/i43/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
  128. +17 −0 test/visuals/i43/robots.txt
  129. BIN test/visuals/i43/uploads/calendar-1.jpg
  130. BIN test/visuals/i43/uploads/calendar-2.jpg
  131. BIN test/visuals/i43/uploads/calendar-3.jpg
  132. +0 −27 test/visuals/visual-jquery-1.3.2.html
  133. +0 −27 test/visuals/visual-jquery-1.4.2.html
  134. +0 −29 test/visuals/visual-jquery-1.4.3.html
  135. +0 −34 test/visuals/visual-jquery-1.5.1.html
  136. +0 −34 test/visuals/visual-jquery-1.6.2.html
  137. +0 −34 test/visuals/visual-jquery-1.6.4.html
  138. +0 −34 test/visuals/visual-jquery-1.7.1.html
  139. +0 −36 test/visuals/visual-jquery-ui.html
View
@@ -1,7 +1,7 @@
-node_modules/
-
-builds/
-dist/
+/build/
+/dist/
+/node_modules/
+/_site/
jquery.timepicker-*
jquery.timepicker.min.*
View
@@ -1,3 +1,7 @@
+* Sat Sep 13 2014 - Version 1.3.2
+- Add defaultTime option (#41).
+- Fix position bug (#43).
+
* Sat Nov 09 2013 - Version 1.3.1
- Fix minor errors in jQuery Package Manifest.
View
@@ -134,7 +134,8 @@ module.exports = function(grunt) {
dist: {
src: ['jquery.<%= meta.name %>.css'],
options: {
- 'box-model': false
+ 'box-model': false,
+ 'box-sizing': false
}
}
},
@@ -155,7 +156,7 @@ module.exports = function(grunt) {
compress: {
zip: {
options: {
- archive: 'builds/<%= pkg.name %>-<%= pkg.version %>.zip'
+ archive: 'build/<%= pkg.name %>-<%= pkg.version %>.zip'
},
files: [{expand: true, cwd: 'dist/', src: ['*']}]
}
@@ -178,20 +179,29 @@ module.exports = function(grunt) {
'http://localhost:8000/test/index.html?jquery=1.9.1',
'http://localhost:8000/test/index.html?jquery=1.10.1',
'http://localhost:8000/test/index.html?jquery=1.10.2',
+ 'http://localhost:8000/test/index.html?jquery=1.11.0',
+ 'http://localhost:8000/test/index.html?jquery=1.11.1',
'http://localhost:8000/test/index.html?jquery=2.0.0',
'http://localhost:8000/test/index.html?jquery=2.0.1',
'http://localhost:8000/test/index.html?jquery=2.0.2',
- 'http://localhost:8000/test/index.html?jquery=2.0.3'
+ 'http://localhost:8000/test/index.html?jquery=2.0.3',
+ 'http://localhost:8000/test/index.html?jquery=2.1.0',
+ 'http://localhost:8000/test/index.html?jquery=2.1.1'
]
}
}
},
connect: {
- 'default': {}
+ 'default': {},
+ 'server': {
+ options: {
+ keepalive: true
+ }
+ }
},
- clean: ['dist/']
+ clean: ['build/', 'dist/']
});
grunt.loadNpmTasks('grunt-contrib-jshint');
@@ -208,7 +218,8 @@ module.exports = function(grunt) {
grunt.registerTask('lint', ['jshint', 'csslint']);
grunt.registerTask('min', ['uglify', 'cssmin']);
grunt.registerTask('build', ['copy:legacy', 'compress']);
- grunt.registerTask('default', ['lint', 'concat', 'min', 'build', 'clean']);
- grunt.registerTask('test', ['default', 'connect', 'qunit']);
+ grunt.registerTask('default', ['lint', 'concat', 'min', 'build']);
+ grunt.registerTask('test', ['default', 'connect:default', 'qunit']);
+ grunt.registerTask('server', ['default', 'connect:server']);
};
View
@@ -1,10 +1,9 @@
-# jQuery Timepicker [![Build Status](https://travis-ci.org/wvega/timepicker.png?branch=master)](https://travis-ci.org/wvega/timepicker)
+# jQuery Timepicker [![Build Status](http://img.shields.io/travis/wvega/timepicker.svg)](https://travis-ci.org/wvega/timepicker) [![Gitter chat](https://badges.gitter.im/wvega/timepicker.png)](https://gitter.im/wvega/timepicker)
A jQuery plugin to enhance standard form input fields helping users to select
(or type) times.
-Please visit http://wvega.github.com/timepicker/ for Documentation, Examples
-and Getting Started information.
+Please visit http://timepicker.co for Documentation, Examples and Getting Started information.
## Release History
@@ -2,8 +2,8 @@
"name": "jquery-timepicker",
"title": "jQuery Timepicker",
"description": "Enhances standard form input fields helping users to select (or type) times.",
- "version": "1.3.1",
- "homepage": "http://wvega.github.com/timepicker/",
+ "version": "1.3.2",
+ "homepage": "http://timepicker.co",
"downloads": "https://github.com/wvega/timepicker/releases",
"author": {
"name": "Willington Vega",
@@ -20,11 +20,11 @@
"licenses": [
{
"type": "MIT",
- "url": "http://wvega.github.com/timepicker/blob/master/LICENSE-MIT"
+ "url": "http://github.com/wvega/timepicker/blob/master/LICENSE-MIT"
},
{
"type": "GPL",
- "url": "http://wvega.github.com/timepicker/blob/master/LICENSE-GPL"
+ "url": "http://github.com/wvega/timepicker/blob/master/LICENSE-GPL"
}
],
"dependencies": {
View
@@ -1,6 +1,6 @@
/**
* jQuery Timepicker
- * http://wvega.github.com/timepicker/
+ * http://timepicker.co
*
* Enhances standard form input fields helping users to select (or type) times.
*
@@ -10,71 +10,75 @@
.ui-timepicker-container {
position: absolute;
overflow: hidden;
+ box-sizing: border-box;
}
.ui-timepicker {
+ box-sizing: content-box;
display: block;
- height: 200px;
- text-align: center;
+ height: 205px;
list-style: none outside none;
- overflow: auto;
- overflow-x: hidden; /* IE */
margin: 0;
padding: 0 1px;
+ text-align: center;
+}
+
+.ui-timepicker-viewport {
+ box-sizing: content-box;
+ display: block;
+ height: 205px;
+ margin: 0;
+ padding: 0;
+ overflow: auto;
+ overflow-x: hidden; /* IE */
}
+
.ui-timepicker-standard {
- /* .ui-widget */
+ /* overwrites .ui-widget */
font-family: Verdana,Arial,sans-serif;
font-size: 1.1em;
- /* .ui-widget-content */
+ /* overwrites .ui-widget-content */
background-color: #FFF;
border: 1px solid #AAA;
color: #222;
- /* .ui-menu */
+ /* overwrites .ui-menu */
margin: 0;
padding: 2px;
}
.ui-timepicker-standard a {
- /* .ui-widget-content a */
+ border: 1px solid transparent;
color: #222;
+ display: block;
+ padding: 0.2em 0.4em;
+ text-decoration: none;
}
.ui-timepicker-standard .ui-state-hover {
- /* .ui-state-hover */
+ /* overwrites .ui-state-hover */
background-color: #DADADA;
border: 1px solid #999;
font-weight: normal;
color: #212121;
}
.ui-timepicker-standard .ui-menu-item {
- /* .ui-menu .ui-menu-item */
+ /* overwrites .ui-menu and .ui-menu-item */
/*clear: left;
float: left;*/
margin: 0;
padding: 0;
- /*width: 100%;*/
}
-.ui-timepicker-standard .ui-menu-item a {
- /* .ui-menu .ui-menu-item a */
- display: block;
- padding: 0.2em 0.4em;
- line-height: 1.5;
- text-decoration: none;
-}
-.ui-timepicker-standard .ui-menu-item a.ui-state-hover {
- /* .ui-menu .ui-menu-item a.ui-state-hover */
- font-weight: normal;
- margin: -1px -1px -1px -1px;
-}
- .ui-timepicker-corners, .ui-timepicker-corners .ui-corner-all {
+
+.ui-timepicker-corners,
+.ui-timepicker-corners .ui-corner-all {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
+
.ui-timepicker-hidden {
- /* .ui-helper-hidden */
+ /* overwrites .ui-helper-hidden */
display: none;
}
-.ui-timepicker-container .ui-no-scrollbar {
+.ui-timepicker-no-scrollbar .ui-timepicker {
border: none;
}
Oops, something went wrong.

0 comments on commit a43ffae

Please sign in to comment.