Permalink
Browse files

upgraded timepicker to jq 1.4 and jq ui 1.8 (thanks to Simon Lampen)

  • Loading branch information...
1 parent c915992 commit 548c0f280e22be2f075b4f9b103ff85db20e77b4 haineault committed Apr 11, 2010
Showing with 6 additions and 6 deletions.
  1. +2 −2 standalone/ui-timepickr/page/index.html
  2. +4 −4 standalone/ui-timepickr/src/ui.timepickr.js
@@ -5,11 +5,11 @@
<link rel="Stylesheet" media="screen" href="styles.css" />
<link rel="Stylesheet" media="screen" href="../dist/themes/default/ui.core.css" />
<link rel="Stylesheet" media="screen" href="../src/css/ui.timepickr.css" />
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.js"></script>
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.js"></script>
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js"></script>
<script type="text/javascript" src="jquery.utils.js"></script>
<script type="text/javascript" src="jquery.strings.js"></script>
<script type="text/javascript" src="jquery.anchorHandler.js"></script>
- <script type="text/javascript" src="jquery.ui.all.js"></script>
<script type="text/javascript" src="../src/ui.timepickr.js"></script>
@@ -25,7 +25,7 @@ $.tpl('timepickr.button', '<li class="{className:s}"><span class="ui-state-defau
$.widget('ui.timepickr', {
plugins: {},
- _init: function() {
+ _create: function() {
this._dom = {
menu: $.tpl('timepickr.menu'),
row: $.tpl('timepickr.menu')
@@ -37,7 +37,7 @@ $.widget('ui.timepickr', {
_trigger: function(type, e, ui) {
var ui = ui || this;
$.ui.plugin.call(this, type, [e, ui]);
- return $.widget.prototype._trigger.call(this, type, e, ui);
+ return $.Widget.prototype._trigger.call(this, type, e, ui);
},
_createButton: function(i, format, className) {
@@ -130,11 +130,11 @@ $.widget('ui.timepickr', {
});
// These properties are shared accross every instances of timepickr
-$.extend($.ui.timepickr, {
+$.extend($.ui.timepickr.prototype, {
version: '@VERSION',
//eventPrefix: '',
//getter: '',
- defaults: {
+ options: {
convention: 24, // 24, 12
trigger: 'mouseover',
format12: '{h:02.d}:{m:02.d} {z:s}',

0 comments on commit 548c0f2

Please sign in to comment.