Przeglądaj źródła

Updating js libraries.

Julio Montoya 11 lat temu
rodzic
commit
814aa64584
47 zmienionych plików z 4029 dodań i 1579 usunięć
  1. 256 0
      web/ChamiloLMS/js/daterange/daterangepicker-bs2.css
  2. 267 0
      web/ChamiloLMS/js/daterange/daterangepicker-bs3.css
  3. 1010 0
      web/ChamiloLMS/js/daterange/daterangepicker.js
  4. 5 0
      web/ChamiloLMS/js/daterange/moment.min.js
  5. 17 0
      web/ChamiloLMS/js/datetimepicker/.jshintrc
  6. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-af.js
  7. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-am.js
  8. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-bg.js
  9. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ca.js
  10. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-cs.js
  11. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-da.js
  12. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-de.js
  13. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-el.js
  14. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-es.js
  15. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-et.js
  16. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-eu.js
  17. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-fi.js
  18. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-fr.js
  19. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-gl.js
  20. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-he.js
  21. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-hr.js
  22. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-hu.js
  23. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-id.js
  24. 6 5
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-it.js
  25. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ja.js
  26. 2 1
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ko.js
  27. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-lt.js
  28. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-nl.js
  29. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-no.js
  30. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-pl.js
  31. 7 6
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-pt-BR.js
  32. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-pt.js
  33. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ro.js
  34. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ru.js
  35. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sk.js
  36. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sr-RS.js
  37. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sr-YU.js
  38. 8 7
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sv.js
  39. 18 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-th.js
  40. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-tr.js
  41. 21 0
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-uk.js
  42. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-vi.js
  43. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-zh-CN.js
  44. 3 2
      web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-zh-TW.js
  45. 17 11
      web/ChamiloLMS/js/datetimepicker/jquery-ui-sliderAccess.js
  46. 8 2
      web/ChamiloLMS/js/datetimepicker/jquery-ui-timepicker-addon.css
  47. 2162 1495
      web/ChamiloLMS/js/datetimepicker/jquery-ui-timepicker-addon.js

+ 256 - 0
web/ChamiloLMS/js/daterange/daterangepicker-bs2.css

@@ -0,0 +1,256 @@
+/*!
+ * Stylesheet for the Date Range Picker, for use with Bootstrap 2.x
+ *
+ * Copyright 2013 Dan Grossman ( http://www.dangrossman.info )
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Built for http://www.improvely.com
+ */
+
+.daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
+  float: left;
+  margin: 4px;
+}
+
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar {
+  float: right;
+  margin: 4px;
+}
+
+.daterangepicker .ranges {
+  width: 160px;
+  text-align: left;
+}
+
+.daterangepicker .ranges .range_inputs>div {
+  float: left;
+}
+
+.daterangepicker .ranges .range_inputs>div:nth-child(2) {
+  padding-left: 11px;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 250px;
+}
+.daterangepicker.show-calendar .calendar {
+    display: block;
+}
+
+.daterangepicker .calendar.single .calendar-date {
+  border: none;
+}
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  white-space: nowrap;
+  text-align: center;
+}
+
+.daterangepicker .daterangepicker_start_input label,
+.daterangepicker .daterangepicker_end_input label {
+  color: #333;
+  font-size: 11px;
+  margin-bottom: 2px;
+  text-transform: uppercase;
+  text-shadow: 1px 1px 0 #fff;
+}
+
+.daterangepicker .ranges input {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}
+
+.daterangepicker .calendar-date {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 8px auto 0 auto;
+  line-height: 30px;
+}
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.daterangepicker td.off {
+  color: #999;
+}
+
+.daterangepicker td.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
+  width: 60px;
+  margin-bottom: 0;
+}
+
+.daterangepicker_start_input {
+  float: left;
+}
+
+.daterangepicker_end_input {
+  float: left; 
+  padding-left: 11px
+}
+
+.daterangepicker th.month {
+  width: auto;
+}

+ 267 - 0
web/ChamiloLMS/js/daterange/daterangepicker-bs3.css

@@ -0,0 +1,267 @@
+/*!
+ * Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
+ *
+ * Copyright 2013 Dan Grossman ( http://www.dangrossman.info )
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Built for http://www.improvely.com
+ */
+
+ .daterangepicker.dropdown-menu {
+  max-width: none;
+  z-index: 3000;
+}
+
+.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
+  float: left;
+  margin: 4px;
+}
+
+.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar {
+  float: right;
+  margin: 4px;
+}
+
+.daterangepicker .ranges {
+  width: 160px;
+  text-align: left;
+}
+
+.daterangepicker .ranges .range_inputs>div {
+  float: left;
+}
+
+.daterangepicker .ranges .range_inputs>div:nth-child(2) {
+  padding-left: 11px;
+}
+
+.daterangepicker .calendar {
+  display: none;
+  max-width: 270px;
+}
+
+.daterangepicker.show-calendar .calendar {
+    display: block;
+}
+
+.daterangepicker .calendar.single .calendar-date {
+  border: none;
+}
+
+.daterangepicker .calendar th, .daterangepicker .calendar td {
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  white-space: nowrap;
+  text-align: center;
+  min-width: 32px;
+}
+
+.daterangepicker .daterangepicker_start_input label,
+.daterangepicker .daterangepicker_end_input label {
+  color: #333;
+  display: block;
+  font-size: 11px;
+  font-weight: normal;
+  height: 20px;
+  line-height: 20px;
+  margin-bottom: 2px;
+  text-shadow: #fff 1px 1px 0px;
+  text-transform: uppercase;
+  width: 74px;
+}
+
+.daterangepicker .ranges input {
+  font-size: 11px;
+}
+
+.daterangepicker .ranges .input-mini {
+  background-color: #eee;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555;
+  display: block;
+  font-size: 11px;
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+  margin: 0 0 10px 0;
+  padding: 0 6px;
+  width: 74px;
+}
+
+.daterangepicker .ranges ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.daterangepicker .ranges li {
+  font-size: 13px;
+  background: #f5f5f5;
+  border: 1px solid #f5f5f5;
+  color: #08c;
+  padding: 3px 12px;
+  margin-bottom: 8px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  cursor: pointer;
+}
+
+.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
+  background: #08c;
+  border: 1px solid #08c;
+  color: #fff;
+}
+
+.daterangepicker .calendar-date {
+  border: 1px solid #ddd;
+  padding: 4px;
+  border-radius: 4px;
+  background: #fff;
+}
+
+.daterangepicker .calendar-time {
+  text-align: center;
+  margin: 8px auto 0 auto;
+  line-height: 30px;
+}
+
+.daterangepicker {
+  position: absolute;
+  background: #fff;
+  top: 100px;
+  left: 20px;
+  padding: 4px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.daterangepicker.opensleft:before {
+  position: absolute;
+  top: -7px;
+  right: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensleft:after {
+  position: absolute;
+  top: -6px;
+  right: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker.opensright:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.daterangepicker.opensright:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #fff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.daterangepicker table {
+  width: 100%;
+  margin: 0;
+}
+
+.daterangepicker td, .daterangepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.daterangepicker td.off {
+  color: #999;
+}
+
+.daterangepicker td.disabled {
+  color: #999;
+}
+
+.daterangepicker td.available:hover, .daterangepicker th.available:hover {
+  background: #eee;
+}
+
+.daterangepicker td.in-range {
+  background: #ebf4f8;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #357ebd;
+  border-color: #3071a9;
+  color: #fff;
+}
+
+.daterangepicker td.week, .daterangepicker th.week {
+  font-size: 80%;
+  color: #ccc;
+}
+
+.daterangepicker select.monthselect, .daterangepicker select.yearselect {
+  font-size: 12px;
+  padding: 1px;
+  height: auto;
+  margin: 0;
+  cursor: default;
+}
+
+.daterangepicker select.monthselect {
+  margin-right: 2%;
+  width: 56%;
+}
+
+.daterangepicker select.yearselect {
+  width: 40%;
+}
+
+.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
+  width: 50px;
+  margin-bottom: 0;
+}
+
+.daterangepicker_start_input {
+  float: left;
+}
+
+.daterangepicker_end_input {
+  float: left; 
+  padding-left: 11px
+}
+
+.daterangepicker th.month {
+  width: auto;
+}

+ 1010 - 0
web/ChamiloLMS/js/daterange/daterangepicker.js

@@ -0,0 +1,1010 @@
+/**
+* @version: 1.3.4
+* @author: Dan Grossman http://www.dangrossman.info/
+* @date: 2014-03-19
+* @copyright: Copyright (c) 2012-2014 Dan Grossman. All rights reserved.
+* @license: Licensed under Apache License v2.0. See http://www.apache.org/licenses/LICENSE-2.0
+* @website: http://www.improvely.com/
+*/
+!function ($, moment) {
+
+    var DateRangePicker = function (element, options, cb) {
+
+        // by default, the daterangepicker element is placed at the bottom of HTML body
+        this.parentEl = 'body';
+
+        //element that triggered the date range picker
+        this.element = $(element);
+
+        //create the picker HTML object
+        var DRPTemplate = '<div class="daterangepicker dropdown-menu">' +
+                '<div class="calendar left"></div>' +
+                '<div class="calendar right"></div>' +
+                '<div class="ranges">' +
+                  '<div class="range_inputs">' +
+                    '<div class="daterangepicker_start_input">' +
+                      '<label for="daterangepicker_start"></label>' +
+                      '<input class="input-mini" type="text" name="daterangepicker_start" value="" disabled="disabled" />' +
+                    '</div>' +
+                    '<div class="daterangepicker_end_input">' +
+                      '<label for="daterangepicker_end"></label>' +
+                      '<input class="input-mini" type="text" name="daterangepicker_end" value="" disabled="disabled" />' +
+                    '</div>' +
+                    '<button class="applyBtn" disabled="disabled"></button>&nbsp;' +
+                    '<button class="cancelBtn"></button>' +
+                  '</div>' +
+                '</div>' +
+              '</div>';
+
+        //custom options
+        if (typeof options !== 'object' || options === null)
+            options = {};
+
+        this.parentEl = (typeof options === 'object' && options.parentEl && $(options.parentEl).length) || $(this.parentEl);
+        this.container = $(DRPTemplate).appendTo(this.parentEl);
+
+        this.setOptions(options, cb);
+
+        //apply CSS classes and labels to buttons
+        var c = this.container;
+        $.each(this.buttonClasses, function (idx, val) {
+            c.find('button').addClass(val);
+        });
+        this.container.find('.daterangepicker_start_input label').html(this.locale.fromLabel);
+        this.container.find('.daterangepicker_end_input label').html(this.locale.toLabel);
+        if (this.applyClass.length)
+            this.container.find('.applyBtn').addClass(this.applyClass);
+        if (this.cancelClass.length)
+            this.container.find('.cancelBtn').addClass(this.cancelClass);
+        this.container.find('.applyBtn').html(this.locale.applyLabel);
+        this.container.find('.cancelBtn').html(this.locale.cancelLabel);
+
+        //event listeners
+
+        this.container.find('.calendar')
+            .on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this))
+            .on('click.daterangepicker', '.next', $.proxy(this.clickNext, this))
+            .on('click.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
+            .on('mouseenter.daterangepicker', 'td.available', $.proxy(this.enterDate, this))
+            .on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this))
+            .on('change.daterangepicker', 'select.yearselect', $.proxy(this.updateMonthYear, this))
+            .on('change.daterangepicker', 'select.monthselect', $.proxy(this.updateMonthYear, this))
+            .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.ampmselect', $.proxy(this.updateTime, this));
+
+        this.container.find('.ranges')
+            .on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this))
+            .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
+            .on('click.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.showCalendars, this))
+            .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this))
+            .on('mouseenter.daterangepicker', 'li', $.proxy(this.enterRange, this))
+            .on('mouseleave.daterangepicker', 'li', $.proxy(this.updateFormInputs, this));
+
+        if (this.element.is('input')) {
+            this.element.on({
+                'click.daterangepicker': $.proxy(this.show, this),
+                'focus.daterangepicker': $.proxy(this.show, this),
+                'keyup.daterangepicker': $.proxy(this.updateFromControl, this)
+            });
+        } else {
+            this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
+        }
+
+    };
+
+    DateRangePicker.prototype = {
+
+        constructor: DateRangePicker,
+
+        setOptions: function(options, callback) {
+
+            this.startDate = moment().startOf('day');
+            this.endDate = moment().endOf('day');
+            this.minDate = false;
+            this.maxDate = false;
+            this.dateLimit = false;
+
+            this.showDropdowns = false;
+            this.showWeekNumbers = false;
+            this.timePicker = false;
+            this.timePickerIncrement = 30;
+            this.timePicker12Hour = true;
+            this.singleDatePicker = false;
+            this.ranges = {};
+
+            this.opens = 'right';
+            if (this.element.hasClass('pull-right'))
+                this.opens = 'left';
+
+            this.buttonClasses = ['btn', 'btn-small'];
+            this.applyClass = 'btn-success';
+            this.cancelClass = 'btn-default';
+
+            this.format = 'MM/DD/YYYY';
+            this.separator = ' - ';
+
+            this.locale = {
+                applyLabel: 'Apply',
+                cancelLabel: 'Cancel',
+                fromLabel: 'From',
+                toLabel: 'To',
+                weekLabel: 'W',
+                customRangeLabel: 'Custom Range',
+                daysOfWeek: moment()._lang._weekdaysMin.slice(),
+                monthNames: moment()._lang._monthsShort.slice(),
+                firstDay: 0
+            };
+
+            this.cb = function () { };
+
+            if (typeof options.format === 'string')
+                this.format = options.format;
+
+            if (typeof options.separator === 'string')
+                this.separator = options.separator;
+
+            if (typeof options.startDate === 'string')
+                this.startDate = moment(options.startDate, this.format);
+
+            if (typeof options.endDate === 'string')
+                this.endDate = moment(options.endDate, this.format);
+
+            if (typeof options.minDate === 'string')
+                this.minDate = moment(options.minDate, this.format);
+
+            if (typeof options.maxDate === 'string')
+                this.maxDate = moment(options.maxDate, this.format);
+
+            if (typeof options.startDate === 'object')
+                this.startDate = moment(options.startDate);
+
+            if (typeof options.endDate === 'object')
+                this.endDate = moment(options.endDate);
+
+            if (typeof options.minDate === 'object')
+                this.minDate = moment(options.minDate);
+
+            if (typeof options.maxDate === 'object')
+                this.maxDate = moment(options.maxDate);
+
+            if (typeof options.applyClass === 'string')
+                this.applyClass = options.applyClass;
+
+            if (typeof options.cancelClass === 'string')
+                this.cancelClass = options.cancelClass;
+
+            if (typeof options.dateLimit === 'object')
+                this.dateLimit = options.dateLimit;
+
+            // update day names order to firstDay
+            if (typeof options.locale === 'object') {
+
+                if (typeof options.locale.daysOfWeek === 'object') {
+                    // Create a copy of daysOfWeek to avoid modification of original
+                    // options object for reusability in multiple daterangepicker instances
+                    this.locale.daysOfWeek = options.locale.daysOfWeek.slice();
+                }
+
+                if (typeof options.locale.monthNames === 'object') {
+                  this.locale.monthNames = options.locale.monthNames.slice();
+                }
+
+                if (typeof options.locale.firstDay === 'number') {
+                    this.locale.firstDay = options.locale.firstDay;
+                    var iterator = options.locale.firstDay;
+                    while (iterator > 0) {
+                        this.locale.daysOfWeek.push(this.locale.daysOfWeek.shift());
+                        iterator--;
+                    }
+                }
+
+                if (typeof options.locale.applyLabel === 'string') {
+                  this.locale.applyLabel = options.locale.applyLabel;
+                }
+
+                if (typeof options.locale.cancelLabel === 'string') {
+                  this.locale.cancelLabel = options.locale.cancelLabel;
+                }
+
+                if (typeof options.locale.fromLabel === 'string') {
+                  this.locale.fromLabel = options.locale.fromLabel;
+                }
+
+                if (typeof options.locale.toLabel === 'string') {
+                  this.locale.toLabel = options.locale.toLabel;
+                }
+
+                if (typeof options.locale.weekLabel === 'string') {
+                  this.locale.weekLabel = options.locale.weekLabel;
+                }
+
+                if (typeof options.locale.customRangeLabel === 'string') {
+                  this.locale.customRangeLabel = options.locale.customRangeLabel;
+                }
+            }
+
+            if (typeof options.opens === 'string')
+                this.opens = options.opens;
+
+            if (typeof options.showWeekNumbers === 'boolean') {
+                this.showWeekNumbers = options.showWeekNumbers;
+            }
+
+            if (typeof options.buttonClasses === 'string') {
+                this.buttonClasses = [options.buttonClasses];
+            }
+
+            if (typeof options.buttonClasses === 'object') {
+                this.buttonClasses = options.buttonClasses;
+            }
+
+            if (typeof options.showDropdowns === 'boolean') {
+                this.showDropdowns = options.showDropdowns;
+            }
+
+            if (typeof options.singleDatePicker === 'boolean') {
+                this.singleDatePicker = options.singleDatePicker;
+            }
+
+            if (typeof options.timePicker === 'boolean') {
+                this.timePicker = options.timePicker;
+            }
+
+            if (typeof options.timePickerIncrement === 'number') {
+                this.timePickerIncrement = options.timePickerIncrement;
+            }
+
+            if (typeof options.timePicker12Hour === 'boolean') {
+                this.timePicker12Hour = options.timePicker12Hour;
+            }
+
+            var start, end, range;
+
+            //if no start/end dates set, check if an input element contains initial values
+            if (typeof options.startDate === 'undefined' && typeof options.endDate === 'undefined') {
+                if ($(this.element).is('input[type=text]')) {
+                    var val = $(this.element).val();
+                    var split = val.split(this.separator);
+                    start = end = null;
+                    if (split.length == 2) {
+                        start = moment(split[0], this.format);
+                        end = moment(split[1], this.format);
+                    } else if (this.singleDatePicker) {
+                        start = moment(val, this.format);
+                        end = moment(val, this.format);
+                    }
+                    if (start !== null && end !== null) {
+                        this.startDate = start;
+                        this.endDate = end;
+                    }
+                }
+            }
+
+            if (typeof options.ranges === 'object') {
+                for (range in options.ranges) {
+
+                    start = moment(options.ranges[range][0]);
+                    end = moment(options.ranges[range][1]);
+
+                    // If we have a min/max date set, bound this range
+                    // to it, but only if it would otherwise fall
+                    // outside of the min/max.
+                    if (this.minDate && start.isBefore(this.minDate))
+                        start = moment(this.minDate);
+
+                    if (this.maxDate && end.isAfter(this.maxDate))
+                        end = moment(this.maxDate);
+
+                    // If the end of the range is before the minimum (if min is set) OR
+                    // the start of the range is after the max (also if set) don't display this
+                    // range option.
+                    if ((this.minDate && end.isBefore(this.minDate)) || (this.maxDate && start.isAfter(this.maxDate))) {
+                        continue;
+                    }
+
+                    this.ranges[range] = [start, end];
+                }
+
+                var list = '<ul>';
+                for (range in this.ranges) {
+                    list += '<li>' + range + '</li>';
+                }
+                list += '<li>' + this.locale.customRangeLabel + '</li>';
+                list += '</ul>';
+                this.container.find('.ranges ul').remove();
+                this.container.find('.ranges').prepend(list);
+            }
+
+            if (typeof callback === 'function') {
+                this.cb = callback;
+            }
+
+            if (!this.timePicker) {
+                this.startDate = this.startDate.startOf('day');
+                this.endDate = this.endDate.endOf('day');
+            }
+
+            if (this.singleDatePicker) {
+                this.opens = 'right';
+                this.container.find('.calendar.right').show();
+                this.container.find('.calendar.left').hide();
+                this.container.find('.ranges').hide();
+                if (!this.container.find('.calendar.right').hasClass('single'))
+                    this.container.find('.calendar.right').addClass('single');
+            } else {
+                this.container.find('.calendar.right').removeClass('single');
+                this.container.find('.ranges').show();
+            }
+
+            this.oldStartDate = this.startDate.clone();
+            this.oldEndDate = this.endDate.clone();
+            this.oldChosenLabel = this.chosenLabel;
+
+            this.leftCalendar = {
+                month: moment([this.startDate.year(), this.startDate.month(), 1, this.startDate.hour(), this.startDate.minute()]),
+                calendar: []
+            };
+
+            this.rightCalendar = {
+                month: moment([this.endDate.year(), this.endDate.month(), 1, this.endDate.hour(), this.endDate.minute()]),
+                calendar: []
+            };
+
+            if (this.opens == 'right') {
+                //swap calendar positions
+                var left = this.container.find('.calendar.left');
+                var right = this.container.find('.calendar.right');
+                left.removeClass('left').addClass('right');
+                right.removeClass('right').addClass('left');
+            }
+
+            if (typeof options.ranges === 'undefined' && !this.singleDatePicker) {
+                this.container.addClass('show-calendar');
+            }
+
+            this.container.addClass('opens' + this.opens);
+
+            this.updateView();
+            this.updateCalendars();
+
+        },
+
+        setStartDate: function(startDate) {
+            if (typeof startDate === 'string')
+                this.startDate = moment(startDate, this.format);
+
+            if (typeof startDate === 'object')
+                this.startDate = moment(startDate);
+
+            if (!this.timePicker)
+                this.startDate = this.startDate.startOf('day');
+
+            this.oldStartDate = this.startDate.clone();
+
+            this.updateView();
+            this.updateCalendars();
+        },
+
+        setEndDate: function(endDate) {
+            if (typeof endDate === 'string')
+                this.endDate = moment(endDate, this.format);
+
+            if (typeof endDate === 'object')
+                this.endDate = moment(endDate);
+
+            if (!this.timePicker)
+                this.endDate = this.endDate.endOf('day');
+
+            this.oldEndDate = this.endDate.clone();
+
+            this.updateView();
+            this.updateCalendars();
+        },
+
+        updateView: function () {
+            this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year());
+            this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year());
+            this.updateFormInputs();
+        },
+
+        updateFormInputs: function () {
+            this.container.find('input[name=daterangepicker_start]').val(this.startDate.format(this.format));
+            this.container.find('input[name=daterangepicker_end]').val(this.endDate.format(this.format));
+
+            if (this.startDate.isSame(this.endDate) || this.startDate.isBefore(this.endDate)) {
+                this.container.find('button.applyBtn').removeAttr('disabled');
+            } else {
+                this.container.find('button.applyBtn').attr('disabled', 'disabled');
+            }
+        },
+
+        updateFromControl: function () {
+            if (!this.element.is('input')) return;
+            if (!this.element.val().length) return;
+
+            var dateString = this.element.val().split(this.separator);
+            var start = moment(dateString[0], this.format);
+            var end = moment(dateString[1], this.format);
+
+            if (this.singleDatePicker) {
+                start = moment(this.element.val(), this.format);
+                end = start;
+            }
+
+            if (end.isBefore(start)) return;
+
+            this.oldStartDate = this.startDate.clone();
+            this.oldEndDate = this.endDate.clone();
+
+            this.startDate = start;
+            this.endDate = end;
+
+            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
+                this.notify();
+
+            this.updateCalendars();
+        },
+
+        notify: function () {
+            this.updateView();
+            this.cb(this.startDate, this.endDate, this.chosenLabel);
+        },
+
+        move: function () {
+            var parentOffset = { top: 0, left: 0 };
+            if (!this.parentEl.is('body')) {
+                parentOffset = {
+                    top: this.parentEl.offset().top - this.parentEl.scrollTop(),
+                    left: this.parentEl.offset().left - this.parentEl.scrollLeft()
+                };
+            }
+            
+            if (this.opens == 'left') {
+                this.container.css({
+                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
+                    right: $(window).width() - this.element.offset().left - this.element.outerWidth() - parentOffset.left,
+                    left: 'auto'
+                });
+                if (this.container.offset().left < 0) {
+                    this.container.css({
+                        right: 'auto',
+                        left: 9
+                    });
+                }
+            } else {
+                this.container.css({
+                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
+                    left: this.element.offset().left - parentOffset.left,
+                    right: 'auto'
+                });
+                if (this.container.offset().left + this.container.outerWidth() > $(window).width()) {
+                    this.container.css({
+                        left: 'auto',
+                        right: 0
+                    });
+                }
+            }
+        },
+
+        toggle: function (e) {
+            if (this.element.hasClass('active')) {
+                this.hide();
+            } else {
+                this.show();
+            }
+        },
+
+        show: function (e) {
+            this.element.addClass('active');
+            this.container.show();
+            this.move();
+
+            $(document).on('click.daterangepicker', $.proxy(this.outsideClick, this));
+            // also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them
+            $(document).on('click.daterangepicker', '[data-toggle=dropdown]', $.proxy(this.outsideClick, this));
+
+            this.element.trigger('show.daterangepicker', this);
+        },
+
+        outsideClick: function (e) {
+            var target = $(e.target);
+            // if the page is clicked anywhere except within the daterangerpicker/button
+            // itself then call this.hide()
+            if (
+                target.closest(this.element).length ||
+                target.closest(this.container).length ||
+                target.closest('.calendar-date').length 
+                ) return;
+            this.hide();
+        },
+
+        hide: function (e) {
+            this.element.removeClass('active');
+            this.container.hide();
+
+            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
+                this.notify();
+
+            this.oldStartDate = this.startDate.clone();
+            this.oldEndDate = this.endDate.clone();
+
+            $(document).off('click.daterangepicker', this.outsideClick);
+            this.element.trigger('hide.daterangepicker', this);
+        },
+
+        enterRange: function (e) {
+            // mouse pointer has entered a range label
+            var label = e.target.innerHTML;
+            if (label == this.locale.customRangeLabel) {
+                this.updateView();
+            } else {
+                var dates = this.ranges[label];
+                this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.format));
+                this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.format));
+            }
+        },
+
+        showCalendars: function() {
+            this.container.addClass('show-calendar');
+            this.move();
+        },
+
+        hideCalendars: function() {
+            this.container.removeClass('show-calendar');
+        },
+
+        updateInputText: function() {
+            if (this.element.is('input') && !this.singleDatePicker) {
+                this.element.val(this.startDate.format(this.format) + this.separator + this.endDate.format(this.format));
+            } else if (this.element.is('input')) {
+                this.element.val(this.startDate.format(this.format));
+            }
+        },
+
+        clickRange: function (e) {
+            var label = e.target.innerHTML;
+            this.chosenLabel = label;
+            if (label == this.locale.customRangeLabel) {
+                this.showCalendars();
+            } else {
+                var dates = this.ranges[label];
+
+                this.startDate = dates[0];
+                this.endDate = dates[1];
+
+                if (!this.timePicker) {
+                    this.startDate.startOf('day');
+                    this.endDate.endOf('day');
+                }
+
+                this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute());
+                this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute());
+                this.updateCalendars();
+
+                this.updateInputText();
+
+                this.hideCalendars();
+                this.hide();
+                this.element.trigger('apply.daterangepicker', this);
+            }
+        },
+
+        clickPrev: function (e) {
+            var cal = $(e.target).parents('.calendar');
+            if (cal.hasClass('left')) {
+                this.leftCalendar.month.subtract('month', 1);
+            } else {
+                this.rightCalendar.month.subtract('month', 1);
+            }
+            this.updateCalendars();
+        },
+
+        clickNext: function (e) {
+            var cal = $(e.target).parents('.calendar');
+            if (cal.hasClass('left')) {
+                this.leftCalendar.month.add('month', 1);
+            } else {
+                this.rightCalendar.month.add('month', 1);
+            }
+            this.updateCalendars();
+        },
+
+        enterDate: function (e) {
+
+            var title = $(e.target).attr('data-title');
+            var row = title.substr(1, 1);
+            var col = title.substr(3, 1);
+            var cal = $(e.target).parents('.calendar');
+
+            if (cal.hasClass('left')) {
+                this.container.find('input[name=daterangepicker_start]').val(this.leftCalendar.calendar[row][col].format(this.format));
+            } else {
+                this.container.find('input[name=daterangepicker_end]').val(this.rightCalendar.calendar[row][col].format(this.format));
+            }
+
+        },
+
+        clickDate: function (e) {
+            var title = $(e.target).attr('data-title');
+            var row = title.substr(1, 1);
+            var col = title.substr(3, 1);
+            var cal = $(e.target).parents('.calendar');
+
+            var startDate, endDate;
+            if (cal.hasClass('left')) {
+                startDate = this.leftCalendar.calendar[row][col];
+                endDate = this.endDate;
+                if (typeof this.dateLimit === 'object') {
+                    var maxDate = moment(startDate).add(this.dateLimit).startOf('day');
+                    if (endDate.isAfter(maxDate)) {
+                        endDate = maxDate;
+                    }
+                }
+            } else {
+                startDate = this.startDate;
+                endDate = this.rightCalendar.calendar[row][col];
+                if (typeof this.dateLimit === 'object') {
+                    var minDate = moment(endDate).subtract(this.dateLimit).startOf('day');
+                    if (startDate.isBefore(minDate)) {
+                        startDate = minDate;
+                    }
+                }
+            }
+
+            if (this.singleDatePicker && cal.hasClass('left')) {
+                endDate = startDate.clone();
+            } else if (this.singleDatePicker && cal.hasClass('right')) {
+                startDate = endDate.clone();
+            }
+
+            cal.find('td').removeClass('active');
+
+            if (startDate.isSame(endDate) || startDate.isBefore(endDate)) {
+                $(e.target).addClass('active');
+                this.startDate = startDate;
+                this.endDate = endDate;
+                this.chosenLabel = this.locale.customRangeLabel;
+            } else if (startDate.isAfter(endDate)) {
+                $(e.target).addClass('active');
+                var difference = this.endDate.diff(this.startDate);
+                this.startDate = startDate;
+                this.endDate = moment(startDate).add('ms', difference);
+                this.chosenLabel = this.locale.customRangeLabel;
+            }
+
+            this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year());
+            this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year());
+            this.updateCalendars();
+
+            endDate.endOf('day');
+
+            if (this.singleDatePicker)
+                this.clickApply();
+        },
+
+        clickApply: function (e) {
+            this.updateInputText();
+            this.hide();
+            this.element.trigger('apply.daterangepicker', this);
+        },
+
+        clickCancel: function (e) {
+            this.startDate = this.oldStartDate;
+            this.endDate = this.oldEndDate;
+            this.chosenLabel = this.oldChosenLabel;
+            this.updateView();
+            this.updateCalendars();
+            this.hide();
+            this.element.trigger('cancel.daterangepicker', this);
+        },
+
+        updateMonthYear: function (e) {
+            var isLeft = $(e.target).closest('.calendar').hasClass('left'),
+                leftOrRight = isLeft ? 'left' : 'right',
+                cal = this.container.find('.calendar.'+leftOrRight);
+
+            // Month must be Number for new moment versions
+            var month = parseInt(cal.find('.monthselect').val(), 10);
+            var year = cal.find('.yearselect').val();
+
+            this[leftOrRight+'Calendar'].month.month(month).year(year);
+            this.updateCalendars();
+        },
+
+        updateTime: function(e) {
+            var isLeft = $(e.target).closest('.calendar').hasClass('left'),
+                leftOrRight = isLeft ? 'left' : 'right',
+                cal = this.container.find('.calendar.'+leftOrRight);
+
+            var hour = parseInt(cal.find('.hourselect').val(), 10);
+            var minute = parseInt(cal.find('.minuteselect').val(), 10);
+
+            if (this.timePicker12Hour) {
+                var ampm = cal.find('.ampmselect').val();
+                if (ampm === 'PM' && hour < 12)
+                    hour += 12;
+                if (ampm === 'AM' && hour === 12)
+                    hour = 0;
+            }
+
+            if (isLeft) {
+                var start = this.startDate.clone();
+                start.hour(hour);
+                start.minute(minute);
+                this.startDate = start;
+                this.leftCalendar.month.hour(hour).minute(minute);
+            } else {
+                var end = this.endDate.clone();
+                end.hour(hour);
+                end.minute(minute);
+                this.endDate = end;
+                this.rightCalendar.month.hour(hour).minute(minute);
+            }
+
+            this.updateCalendars();
+        },
+
+        updateCalendars: function () {
+            this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), 'left');
+            this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), 'right');
+            this.container.find('.calendar.left').html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate));
+            this.container.find('.calendar.right').html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.startDate, this.maxDate));
+
+            this.container.find('.ranges li').removeClass('active');
+            var customRange = true;
+            var i = 0;
+            for (var range in this.ranges) {
+                if (this.timePicker) {
+                    if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
+                        customRange = false;
+                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
+                            .addClass('active').html();
+                    }
+                } else {
+                    //ignore times when comparing dates if time picker is not enabled
+                    if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
+                        customRange = false;
+                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
+                            .addClass('active').html();
+                    }
+                }
+                i++;
+            }
+            if (customRange) {
+                this.chosenLabel = this.container.find('.ranges li:last')
+                    .addClass('active').html();
+            }
+        },
+
+        buildCalendar: function (month, year, hour, minute, side) {
+            var firstDay = moment([year, month, 1]);
+            var lastMonth = moment(firstDay).subtract('month', 1).month();
+            var lastYear = moment(firstDay).subtract('month', 1).year();
+
+            var daysInLastMonth = moment([lastYear, lastMonth]).daysInMonth();
+
+            var dayOfWeek = firstDay.day();
+
+            var i;
+
+            //initialize a 6 rows x 7 columns array for the calendar
+            var calendar = [];
+            for (i = 0; i < 6; i++) {
+                calendar[i] = [];
+            }
+
+            //populate the calendar with date objects
+            var startDay = daysInLastMonth - dayOfWeek + this.locale.firstDay + 1;
+            if (startDay > daysInLastMonth)
+                startDay -= 7;
+
+            if (dayOfWeek == this.locale.firstDay)
+                startDay = daysInLastMonth - 6;
+
+            var curDate = moment([lastYear, lastMonth, startDay, 12, minute]);
+            var col, row;
+            for (i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add('hour', 24)) {
+                if (i > 0 && col % 7 === 0) {
+                    col = 0;
+                    row++;
+                }
+                calendar[row][col] = curDate.clone().hour(hour);
+                curDate.hour(12);
+            }
+
+            return calendar;
+        },
+
+        renderDropdowns: function (selected, minDate, maxDate) {
+            var currentMonth = selected.month();
+            var monthHtml = '<select class="monthselect">';
+            var inMinYear = false;
+            var inMaxYear = false;
+
+            for (var m = 0; m < 12; m++) {
+                if ((!inMinYear || m >= minDate.month()) && (!inMaxYear || m <= maxDate.month())) {
+                    monthHtml += "<option value='" + m + "'" +
+                        (m === currentMonth ? " selected='selected'" : "") +
+                        ">" + this.locale.monthNames[m] + "</option>";
+                }
+            }
+            monthHtml += "</select>";
+
+            var currentYear = selected.year();
+            var maxYear = (maxDate && maxDate.year()) || (currentYear + 5);
+            var minYear = (minDate && minDate.year()) || (currentYear - 50);
+            var yearHtml = '<select class="yearselect">';
+
+            for (var y = minYear; y <= maxYear; y++) {
+                yearHtml += '<option value="' + y + '"' +
+                    (y === currentYear ? ' selected="selected"' : '') +
+                    '>' + y + '</option>';
+            }
+
+            yearHtml += '</select>';
+
+            return monthHtml + yearHtml;
+        },
+
+        renderCalendar: function (calendar, selected, minDate, maxDate) {
+
+            var html = '<div class="calendar-date">';
+            html += '<table class="table-condensed">';
+            html += '<thead>';
+            html += '<tr>';
+
+            // add empty cell for week number
+            if (this.showWeekNumbers)
+                html += '<th></th>';
+
+            if (!minDate || minDate.isBefore(calendar[1][1])) {
+                html += '<th class="prev available"><i class="fa fa-arrow-left icon-arrow-left glyphicon glyphicon-arrow-left"></i></th>';
+            } else {
+                html += '<th></th>';
+            }
+
+            var dateHtml = this.locale.monthNames[calendar[1][1].month()] + calendar[1][1].format(" YYYY");
+
+            if (this.showDropdowns) {
+                dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate);
+            }
+
+            html += '<th colspan="5" class="month">' + dateHtml + '</th>';
+            if (!maxDate || maxDate.isAfter(calendar[1][1])) {
+                html += '<th class="next available"><i class="fa fa-arrow-right icon-arrow-right glyphicon glyphicon-arrow-right"></i></th>';
+            } else {
+                html += '<th></th>';
+            }
+
+            html += '</tr>';
+            html += '<tr>';
+
+            // add week number label
+            if (this.showWeekNumbers)
+                html += '<th class="week">' + this.locale.weekLabel + '</th>';
+
+            $.each(this.locale.daysOfWeek, function (index, dayOfWeek) {
+                html += '<th>' + dayOfWeek + '</th>';
+            });
+
+            html += '</tr>';
+            html += '</thead>';
+            html += '<tbody>';
+
+            for (var row = 0; row < 6; row++) {
+                html += '<tr>';
+
+                // add week number
+                if (this.showWeekNumbers)
+                    html += '<td class="week">' + calendar[row][0].week() + '</td>';
+
+                for (var col = 0; col < 7; col++) {
+                    var cname = 'available ';
+                    cname += (calendar[row][col].month() == calendar[1][1].month()) ? '' : 'off';
+
+                    if ((minDate && calendar[row][col].isBefore(minDate)) || (maxDate && calendar[row][col].isAfter(maxDate))) {
+                        cname = ' off disabled ';
+                    } else if (calendar[row][col].format('YYYY-MM-DD') == selected.format('YYYY-MM-DD')) {
+                        cname += ' active ';
+                        if (calendar[row][col].format('YYYY-MM-DD') == this.startDate.format('YYYY-MM-DD')) {
+                            cname += ' start-date ';
+                        }
+                        if (calendar[row][col].format('YYYY-MM-DD') == this.endDate.format('YYYY-MM-DD')) {
+                            cname += ' end-date ';
+                        }
+                    } else if (calendar[row][col] >= this.startDate && calendar[row][col] <= this.endDate) {
+                        cname += ' in-range ';
+                        if (calendar[row][col].isSame(this.startDate)) { cname += ' start-date '; }
+                        if (calendar[row][col].isSame(this.endDate)) { cname += ' end-date '; }
+                    }
+
+                    var title = 'r' + row + 'c' + col;
+                    html += '<td class="' + cname.replace(/\s+/g, ' ').replace(/^\s?(.*?)\s?$/, '$1') + '" data-title="' + title + '">' + calendar[row][col].date() + '</td>';
+                }
+                html += '</tr>';
+            }
+
+            html += '</tbody>';
+            html += '</table>';
+            html += '</div>';
+
+            var i;
+            if (this.timePicker) {
+
+                html += '<div class="calendar-time">';
+                html += '<select class="hourselect">';
+                var start = 0;
+                var end = 23;
+                var selected_hour = selected.hour();
+                if (this.timePicker12Hour) {
+                    start = 1;
+                    end = 12;
+                    if (selected_hour >= 12)
+                        selected_hour -= 12;
+                    if (selected_hour === 0)
+                        selected_hour = 12;
+                }
+
+                for (i = start; i <= end; i++) {
+                    if (i == selected_hour) {
+                        html += '<option value="' + i + '" selected="selected">' + i + '</option>';
+                    } else {
+                        html += '<option value="' + i + '">' + i + '</option>';
+                    }
+                }
+
+                html += '</select> : ';
+
+                html += '<select class="minuteselect">';
+
+                for (i = 0; i < 60; i += this.timePickerIncrement) {
+                    var num = i;
+                    if (num < 10)
+                        num = '0' + num;
+                    if (i == selected.minute()) {
+                        html += '<option value="' + i + '" selected="selected">' + num + '</option>';
+                    } else {
+                        html += '<option value="' + i + '">' + num + '</option>';
+                    }
+                }
+
+                html += '</select> ';
+
+                if (this.timePicker12Hour) {
+                    html += '<select class="ampmselect">';
+                    if (selected.hour() >= 12) {
+                        html += '<option value="AM">AM</option><option value="PM" selected="selected">PM</option>';
+                    } else {
+                        html += '<option value="AM" selected="selected">AM</option><option value="PM">PM</option>';
+                    }
+                    html += '</select>';
+                }
+
+                html += '</div>';
+
+            }
+
+            return html;
+
+        },
+
+        remove: function() {
+
+            this.container.remove();
+            this.element.off('.daterangepicker');
+            this.element.removeData('daterangepicker');
+
+        }
+
+    };
+
+    $.fn.daterangepicker = function (options, cb) {
+        this.each(function () {
+            var el = $(this);
+            if (el.data('daterangepicker'))
+                el.data('daterangepicker').remove();
+            el.data('daterangepicker', new DateRangePicker(el, options, cb));
+        });
+        return this;
+    };
+
+}(window.jQuery, window.moment);

Plik diff jest za duży
+ 5 - 0
web/ChamiloLMS/js/daterange/moment.min.js


+ 17 - 0
web/ChamiloLMS/js/datetimepicker/.jshintrc

@@ -0,0 +1,17 @@
+{
+	"evil": true,
+	"curly": true,
+	"eqeqeq": true,
+	"immed": true,
+	"latedef": true,
+	"newcap": true,
+	"noarg": true,
+	"sub": true,
+	"undef": true,
+	"unused": false,
+	"loopfunc": true,
+	"boss": true,
+	"eqnull": true,
+	"browser": true,
+	"predef": ["jQuery"]
+}

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-af.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-af.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minute',
 		secondText: 'Sekondes',
 		millisecText: 'Millisekondes',
+		microsecText: 'Mikrosekondes',
 		timezoneText: 'Tydsone',
 		currentText: 'Huidige Tyd',
 		closeText: 'Klaar',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['af']);
 })(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-am.js

@@ -0,0 +1,21 @@
+/* Armenian translation for the jQuery Timepicker Addon */
+/* Written by Artavazd Avetisyan artavazda@hotmail.com */
+(function($) {
+	$.timepicker.regional['am'] = {
+		timeOnlyTitle: 'Ընտրեք ժամանակը',
+		timeText: 'Ժամանակը',
+		hourText: 'Ժամ',
+		minuteText: 'Րոպե',
+		secondText: 'Վարկյան',
+		millisecText: 'Միլիվարկյան',
+		microsecText: 'Միկրովարկյան',
+		timezoneText: 'Ժամային գոտին',
+		currentText: 'Այժմ',
+		closeText: 'Փակել',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['am']);
+})(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-bg.js

@@ -0,0 +1,21 @@
+/* Bulgarian translation for the jQuery Timepicker Addon */
+/* Written by Plamen Kovandjiev */
+(function($) {
+	$.timepicker.regional['bg'] = {
+		timeOnlyTitle: 'Изберете време',
+		timeText: 'Време',
+		hourText: 'Час',
+		minuteText: 'Минути',
+		secondText: 'Секунди',
+		millisecText: 'Милисекунди',
+		microsecText: 'Микросекунди',
+		timezoneText: 'Часови пояс',
+		currentText: 'Сега',
+		closeText: 'Затвори',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['bg']);
+})(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-ca.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ca.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minuts',
 		secondText: 'Segons',
 		millisecText: 'Milisegons',
+		microsecText: 'Microsegons',
 		timezoneText: 'Fus horari',
 		currentText: 'Ara',
 		closeText: 'Tancar',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ca']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-cs.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-cs.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minuty',
 		secondText: 'Vteřiny',
 		millisecText: 'Milisekundy',
+		microsecText: 'Mikrosekundy',
 		timezoneText: 'Časové pásmo',
 		currentText: 'Nyní',
 		closeText: 'Zavřít',
-		timeFormat: 'h:m',
+		timeFormat: 'HH:mm',
 		amNames: ['dop.', 'AM', 'A'],
 		pmNames: ['odp.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['cs']);
 })(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-da.js

@@ -0,0 +1,21 @@
+/* Danish translation for the jQuery Timepicker Addon */
+/* Written by Lars H. Jensen (http://www.larshj.dk) */
+(function ($) {
+    $.timepicker.regional['da'] = {
+        timeOnlyTitle: 'Vælg tid',
+        timeText: 'Tid',
+        hourText: 'Time',
+        minuteText: 'Minut',
+        secondText: 'Sekund',
+        millisecText: 'Millisekund',
+        microsecText: 'Mikrosekund',
+        timezoneText: 'Tidszone',
+        currentText: 'Nu',
+        closeText: 'Luk',
+        timeFormat: 'HH:mm',
+        amNames: ['am', 'AM', 'A'],
+        pmNames: ['pm', 'PM', 'P'],
+        isRTL: false
+    };
+    $.timepicker.setDefaults($.timepicker.regional['da']);
+})(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-de.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-de.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minute',
 		secondText: 'Sekunde',
 		millisecText: 'Millisekunde',
+		microsecText: 'Mikrosekunde',
 		timezoneText: 'Zeitzone',
 		currentText: 'Jetzt',
 		closeText: 'Fertig',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['vorm.', 'AM', 'A'],
 		pmNames: ['nachm.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['de']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-el.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-el.js

@@ -8,13 +8,14 @@
 		minuteText: 'Λεπτά',
 		secondText: 'Δευτερόλεπτα',
 		millisecText: 'μιλιδευτερόλεπτο',
+		microsecText: 'Microseconds',
 		timezoneText: 'Ζώνη ώρας',
 		currentText: 'Τώρα',
 		closeText: 'Κλείσιμο',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['π.μ.', 'AM', 'A'],
 		pmNames: ['μ.μ.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['el']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-es.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-es.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minutos',
 		secondText: 'Segundos',
 		millisecText: 'Milisegundos',
+		microsecText: 'Microsegundos',
 		timezoneText: 'Huso horario',
 		currentText: 'Ahora',
 		closeText: 'Cerrar',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['es']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-et.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-et.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minut',
 		secondText: 'Sekund',
 		millisecText: 'Millisekundis',
+		microsecText: 'Mikrosekundis',
 		timezoneText: 'Ajavöönd',
 		currentText: 'Praegu',
 		closeText: 'Valmis',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['et']);
 })(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-eu.js

@@ -0,0 +1,21 @@
+/* Basque trannslation for JQuery Timepicker Addon
+/* Translated by Xabi Fer */
+(function($) {
+	$.timepicker.regional['eu'] = {
+		timeOnlyTitle: 'Aukeratu ordua',
+		timeText: 'Ordua',
+		hourText: 'Orduak',
+		minuteText: 'Minutuak',
+		secondText: 'Segunduak',
+		millisecText: 'Milisegunduak',
+		microsecText: 'Mikrosegundotan',
+		timezoneText: 'Ordu-eremua',
+		currentText: 'Orain',
+		closeText: 'Itxi',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['eu']);
+})(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-fi.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-fi.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minuutti',
 		secondText: 'Sekunti',
 		millisecText: 'Millisekunnin',
+		microsecText: 'Mikrosekuntia',
 		timezoneText: 'Aikavyöhyke',
 		currentText: 'Nyt',
 		closeText: 'Sulje',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['ap.', 'AM', 'A'],
 		pmNames: ['ip.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['fi']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-fr.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-fr.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minutes',
 		secondText: 'Secondes',
 		millisecText: 'Millisecondes',
+		microsecText: 'Microsecondes',
 		timezoneText: 'Fuseau horaire',
 		currentText: 'Maintenant',
 		closeText: 'Terminé',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['fr']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-gl.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-gl.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minutos',
 		secondText: 'Segundos',
 		millisecText: 'Milisegundos',
+		microsecText: 'Microssegundos',
 		timezoneText: 'Fuso horario',
 		currentText: 'Agora',
 		closeText: 'Pechar',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['gl']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-he.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-he.js

@@ -8,13 +8,14 @@
 		minuteText: "דקות",
 		secondText: "שניות",
 		millisecText: "אלפית השנייה",
+		microsecText: "מיקרו",
 		timezoneText: "אזור זמן",
 		currentText: "עכשיו",
 		closeText:"סגור",
-		timeFormat: "hh:mm tt",
+		timeFormat: "HH:mm",
 		amNames: ['לפנה"צ', 'AM', 'A'],
 		pmNames: ['אחה"צ', 'PM', 'P'],
-		ampm: false
+		isRTL: true
 	};
 	$.timepicker.setDefaults($.timepicker.regional["he"]);
 })(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-hr.js

@@ -0,0 +1,21 @@
+/* Croatian translation for the jQuery Timepicker Addon */
+/* Written by Mladen */
+(function($) {
+	$.timepicker.regional['hr'] = {
+		timeOnlyTitle: 'Odaberi vrijeme',
+		timeText: 'Vrijeme',
+		hourText: 'Sati',
+		minuteText: 'Minute',
+		secondText: 'Sekunde',
+		millisecText: 'Milisekunde',
+		microsecText: 'Mikrosekunde',
+		timezoneText: 'Vremenska zona',
+		currentText: 'Sada',
+		closeText: 'Gotovo',
+		timeFormat: 'HH:mm',
+		amNames: ['a.m.', 'AM', 'A'],
+		pmNames: ['p.m.', 'PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['hr']);
+})(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-hu.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-hu.js

@@ -8,13 +8,14 @@
 		minuteText: 'Perc',
 		secondText: 'Másodperc',
 		millisecText: 'Milliszekundumos',
+		microsecText: 'Ezredmásodperc',
 		timezoneText: 'Időzóna',
 		currentText: 'Most',
 		closeText: 'Kész',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['de.', 'AM', 'A'],
 		pmNames: ['du.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['hu']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-id.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-id.js

@@ -8,13 +8,14 @@
 		minuteText: 'Menit',
 		secondText: 'Detik',
 		millisecText: 'Milidetik',
+		microsecText: 'Mikrodetik',
 		timezoneText: 'Zona Waktu',
 		currentText: 'Sekarang',
 		closeText: 'OK',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['id']);
 })(jQuery);

+ 6 - 5
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-it.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-it.js

@@ -5,16 +5,17 @@
         timeOnlyTitle: 'Scegli orario',
         timeText: 'Orario',
         hourText: 'Ora',
-        minuteText: 'Minuto',
-        secondText: 'Secondo',
-        millisecText: 'Millisecondo',
+        minuteText: 'Minuti',
+        secondText: 'Secondi',
+        millisecText: 'Millisecondi',
+        microsecText: 'Microsecondi',
         timezoneText: 'Fuso orario',
         currentText: 'Adesso',
         closeText: 'Chiudi',
-        timeFormat: 'hh:mm',
+        timeFormat: 'HH:mm',
         amNames: ['m.', 'AM', 'A'],
         pmNames: ['p.', 'PM', 'P'],
-        ampm: false
+        isRTL: false
     };
     $.timepicker.setDefaults($.timepicker.regional['it']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-ja.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ja.js

@@ -8,13 +8,14 @@
 		minuteText: '分',
 		secondText: '秒',
 		millisecText: 'ミリ秒',
+		microsecText: 'マイクロ秒',
 		timezoneText: 'タイムゾーン',
 		currentText: '現時刻',
 		closeText: '閉じる',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['午前', 'AM', 'A'],
 		pmNames: ['午後', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ja']);
 })(jQuery);

+ 2 - 1
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-ko.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ko.js

@@ -8,13 +8,14 @@
 		minuteText: '분',
 		secondText: '초',
 		millisecText: '밀리초',
+		microsecText: '마이크로',
 		timezoneText: '표준 시간대',
 		currentText: '현재 시각',
 		closeText: '닫기',
 		timeFormat: 'tt h:mm',
 		amNames: ['오전', 'AM', 'A'],
 		pmNames: ['오후', 'PM', 'P'],
-		ampm: true
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ko']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-lt.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-lt.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minutės',
 		secondText: 'Sekundės',
 		millisecText: 'Milisekundės',
+		microsecText: 'Mikrosekundės',
 		timezoneText: 'Laiko zona',
 		currentText: 'Dabar',
 		closeText: 'Uždaryti',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['priešpiet', 'AM', 'A'],
 		pmNames: ['popiet', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['lt']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-nl.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-nl.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minuut',
 		secondText: 'Seconde',
 		millisecText: 'Milliseconde',
+		microsecText: 'Microseconde',
 		timezoneText: 'Tijdzone',
 		currentText: 'Vandaag',
 		closeText: 'Sluiten',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['nl']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-no.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-no.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minutt',
 		secondText: 'Sekund',
 		millisecText: 'Millisekund',
+		microsecText: 'mikrosekund',
 		timezoneText: 'Tidssone',
 		currentText: 'Nå',
 		closeText: 'Lukk',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['am', 'AM', 'A'],
 		pmNames: ['pm', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['no']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-pl.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-pl.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minuta',
 		secondText: 'Sekunda',
 		millisecText: 'Milisekunda',
+		microsecText: 'Mikrosekunda',
 		timezoneText: 'Strefa czasowa',
 		currentText: 'Teraz',
 		closeText: 'Gotowe',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['pl']);
 })(jQuery);

+ 7 - 6
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-pt-BR.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-pt-BR.js

@@ -2,19 +2,20 @@
 /* Written by Diogo Damiani (diogodamiani@gmail.com) */
 (function ($) {
 	$.timepicker.regional['pt-BR'] = {
-		timeOnlyTitle: 'Escolha a hora',
-		timeText: 'Hora',
-		hourText: 'Horas',
+		timeOnlyTitle: 'Escolha o horário',
+		timeText: 'Horário',
+		hourText: 'Hora',
 		minuteText: 'Minutos',
 		secondText: 'Segundos',
 		millisecText: 'Milissegundos',
-		timezoneText: 'Fuso horário',
+		microsecText: 'Microssegundos',
+		timezoneText: 'Fuso horário',
 		currentText: 'Agora',
 		closeText: 'Fechar',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['pt-BR']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-pt.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-pt.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minutos',
 		secondText: 'Segundos',
 		millisecText: 'Milissegundos',
+		microsecText: 'Microssegundos',
 		timezoneText: 'Fuso horário',
 		currentText: 'Agora',
 		closeText: 'Fechar',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['pt']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-ro.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ro.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minute',
 		secondText: 'Secunde',
 		millisecText: 'Milisecunde',
+		microsecText: 'Microsecunde',
 		timezoneText: 'Fus orar',
 		currentText: 'Acum',
 		closeText: 'Închide',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ro']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-ru.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-ru.js

@@ -8,13 +8,14 @@
 		minuteText: 'Минуты',
 		secondText: 'Секунды',
 		millisecText: 'Миллисекунды',
+		microsecText: 'Микросекунды',
 		timezoneText: 'Часовой пояс',
 		currentText: 'Сейчас',
 		closeText: 'Закрыть',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ru']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-sk.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sk.js

@@ -8,13 +8,14 @@
 		minuteText: 'Minúty',
 		secondText: 'Sekundy',
 		millisecText: 'Milisekundy',
+		microsecText: 'Mikrosekundy',
 		timezoneText: 'Časové pásmo',
 		currentText: 'Teraz',
 		closeText: 'Zavrieť',
-		timeFormat: 'h:m',
+		timeFormat: 'H:m',
 		amNames: ['dop.', 'AM', 'A'],
 		pmNames: ['pop.', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['sk']);
 })(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sr-RS.js

@@ -0,0 +1,21 @@
+/* Serbian cyrilic translation for the jQuery Timepicker Addon */
+/* Written by Vladimir Jelovac */
+(function($) {
+	$.timepicker.regional['sr-RS'] = {
+		timeOnlyTitle: 'Одаберите време',
+		timeText: 'Време',
+		hourText: 'Сати',
+		minuteText: 'Минути',
+		secondText: 'Секунде',
+		millisecText: 'Милисекунде',
+		microsecText: 'Микросекунде',
+		timezoneText: 'Временска зона',
+		currentText: 'Сада',
+		closeText: 'Затвори',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['sr-RS']);
+})(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sr-YU.js

@@ -0,0 +1,21 @@
+/* Serbian latin translation for the jQuery Timepicker Addon */
+/* Written by Vladimir Jelovac */
+(function($) {
+	$.timepicker.regional['sr-YU'] = {
+		timeOnlyTitle: 'Odaberite vreme',
+		timeText: 'Vreme',
+		hourText: 'Sati',
+		minuteText: 'Minuti',
+		secondText: 'Sekunde',
+		millisecText: 'Milisekunde',
+		microsecText: 'Mikrosekunde',
+		timezoneText: 'Vremenska zona',
+		currentText: 'Sada',
+		closeText: 'Zatvori',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['sr-YU']);
+})(jQuery);

+ 8 - 7
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-sv.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-sv.js

@@ -3,18 +3,19 @@
 (function($) {
 	$.timepicker.regional['sv'] = {
 		timeOnlyTitle: 'Välj en tid',
-		timeText: 'Timme',
-		hourText: 'Timmar',
-		minuteText: 'Minuter',
-		secondText: 'Sekunder',
-		millisecText: 'Millisekunder',
+		timeText: 'Tid',
+		hourText: 'Timme',
+		minuteText: 'Minut',
+		secondText: 'Sekund',
+		millisecText: 'Millisekund',
+		microsecText: 'Mikrosekund',
 		timezoneText: 'Tidszon',
 		currentText: 'Nu',
 		closeText: 'Stäng',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['sv']);
 })(jQuery);

+ 18 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-th.js

@@ -0,0 +1,18 @@
+/* Thai translation for the jQuery Timepicker Addon */
+/* Written by Yote Wachirapornpongsa */
+(function($) {
+	$.timepicker.regional['th'] = {
+		timeOnlyTitle: 'เลือกเวลา',
+		timeText: 'เวลา ',
+		hourText: 'ชั่วโมง ',
+		minuteText: 'นาที',
+		secondText: 'วินาที',
+		millisecText: 'มิลลิวินาที',
+		microsecText: 'ไมโคริวินาที',
+		timezoneText: 'เขตเวลา',
+		currentText: 'เวลาปัจจุบัน',
+		closeText: 'ปิด',
+		timeFormat: 'hh:mm tt'
+	};
+	$.timepicker.setDefaults($.timepicker.regional['th']);
+})(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-tr.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-tr.js

@@ -8,13 +8,14 @@
 		minuteText: 'Dakika',
 		secondText: 'Saniye',
 		millisecText: 'Milisaniye',
+		microsecText: 'Mikrosaniye',
 		timezoneText: 'Zaman Dilimi',
 		currentText: 'Şu an',
 		closeText: 'Tamam',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['ÖÖ', 'Ö'],
 		pmNames: ['ÖS', 'S'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['tr']);
 })(jQuery);

+ 21 - 0
web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-uk.js

@@ -0,0 +1,21 @@
+/* Ukrainian translation for the jQuery Timepicker Addon */
+/* Written by Sergey Noskov */
+(function($) {
+	$.timepicker.regional['uk'] = {
+		timeOnlyTitle: 'Виберіть час',
+		timeText: 'Час',
+		hourText: 'Години',
+		minuteText: 'Хвилини',
+		secondText: 'Секунди',
+		millisecText: 'Мілісекунди',
+		microsecText: 'Мікросекунди',
+		timezoneText: 'Часовий пояс',
+		currentText: 'Зараз',
+		closeText: 'Закрити',
+		timeFormat: 'HH:mm',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		isRTL: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['uk']);
+})(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-vi.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-vi.js

@@ -8,13 +8,14 @@
 		minuteText: 'Phút',
 		secondText: 'Giây',
 		millisecText: 'Phần nghìn giây',
+		microsecText: 'Miligiây',
 		timezoneText: 'Múi giờ',
 		currentText: 'Hiện thời',
 		closeText: 'Đóng',
-		timeFormat: 'h:m',
+		timeFormat: 'H:m',
 		amNames: ['SA', 'AM', 'A'],
 		pmNames: ['CH', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['vi']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-zh-CN.js

@@ -8,13 +8,14 @@
 		minuteText: '分钟',
 		secondText: '秒钟',
 		millisecText: '微秒',
+		microsecText: '微秒',
 		timezoneText: '时区',
 		currentText: '现在时间',
 		closeText: '关闭',
-		timeFormat: 'hh:mm',
+		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['zh-CN']);
 })(jQuery);

+ 3 - 2
web/ChamiloLMS/js/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js → web/ChamiloLMS/js/datetimepicker/i18n/jquery-ui-timepicker-zh-TW.js

@@ -8,13 +8,14 @@
 		minuteText: '分',
 		secondText: '秒',
 		millisecText: '毫秒',
+		microsecText: '微秒',
 		timezoneText: '時區',
 		currentText: '現在時間',
 		closeText: '確定',
-		timeFormat: 'hh:mm tt',
+		timeFormat: 'HH:mm',
 		amNames: ['上午', 'AM', 'A'],
 		pmNames: ['下午', 'PM', 'P'],
-		ampm: false
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['zh-TW']);
 })(jQuery);

+ 17 - 11
web/ChamiloLMS/js/datetimepicker/jquery-ui-sliderAccess.js

@@ -1,8 +1,8 @@
 /*
  * jQuery UI Slider Access
  * By: Trent Richardson [http://trentrichardson.com]
- * Version 0.2
- * Last Modified: 12/02/2011
+ * Version 0.3
+ * Last Modified: 10/20/2012
  * 
  * Copyright 2011 Trent Richardson
  * Dual licensed under the MIT and GPL licenses.
@@ -17,8 +17,9 @@
 			options = options || {};
 			options.touchonly = options.touchonly !== undefined? options.touchonly : true; // by default only show it if touch device
 
-			if(options.touchonly === true && !("ontouchend" in document))
+			if(options.touchonly === true && !("ontouchend" in document)){
 				return $(this);
+			}
 				
 			return $(this).each(function(i,obj){
 						var $t = $(this),
@@ -31,11 +32,12 @@
 											upText: '+',
 											downText: '-',
 											buttonset: true,
-											buttonsetTag: 'span'
+											buttonsetTag: 'span',
+											isRTL: false
 										}, options),
 							$buttons = $('<'+ o.buttonsetTag +' class="ui-slider-access">'+
-											'<button data-icon="'+ o.downIcon +'" data-step="-'+ o.step +'">'+ o.downText +'</button>'+
-											'<button data-icon="'+ o.upIcon +'" data-step="'+ o.step +'">'+ o.upText +'</button>'+
+											'<button data-icon="'+ o.downIcon +'" data-step="'+ (o.isRTL? o.step : o.step*-1) +'">'+ o.downText +'</button>'+
+											'<button data-icon="'+ o.upIcon +'" data-step="'+ (o.isRTL? o.step*-1 : o.step) +'">'+ o.upText +'</button>'+
 										'</'+ o.buttonsetTag +'>');
 
 						$buttons.children('button').each(function(j, jobj){
@@ -49,16 +51,20 @@
 												curr = $t.slider('value'),
 												newval = curr += step*1,
 												minval = $t.slider('option','min'),
-												maxval = $t.slider('option','max');
+												maxval = $t.slider('option','max'),
+												slidee = $t.slider("option", "slide") || function(){},
+												stope = $t.slider("option", "stop") || function(){};
 
 											e.preventDefault();
 											
-											if(newval < minval || newval > maxval)
+											if(newval < minval || newval > maxval){
 												return;
+											}
 											
 											$t.slider('value', newval);
 
-											$t.slider("option", "slide").call($t, null, { value: newval });
+											slidee.call($t, null, { value: newval });
+											stope.call($t, null, { value: newval });
 										});
 						});
 						
@@ -73,8 +79,8 @@
 
 						// adjust the width so we don't break the original layout
 						var bOuterWidth = $buttons.css({
-									marginLeft: (o.where == 'after'? 10:0), 
-									marginRight: (o.where == 'before'? 10:0)
+									marginLeft: ((o.where === 'after' && !o.isRTL) || (o.where === 'before' && o.isRTL)? 10:0), 
+									marginRight: ((o.where === 'before' && !o.isRTL) || (o.where === 'after' && o.isRTL)? 10:0)
 								}).outerWidth(true) + 5;
 						var tOuterWidth = $t.outerWidth(true);
 						$t.css('display','inline-block').width(tOuterWidth-bOuterWidth);

+ 8 - 2
web/ChamiloLMS/js/datetimepicker/jquery-ui-timepicker-addon.css

@@ -1,6 +1,12 @@
+/* css for timepicker */
 .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
 .ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 45%; }
 .ui-timepicker-div td { font-size: 90%; }
 .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 45% 10px 10px; }

+ 2162 - 1495
web/ChamiloLMS/js/datetimepicker/jquery-ui-timepicker-addon.js

@@ -1,1530 +1,2197 @@
-/*
-* jQuery timepicker addon
-* By: Trent Richardson [http://trentrichardson.com]
-* Version 1.0.1
-* Last Modified: 07/01/2012
-*
-* Copyright 2012 Trent Richardson
-* You may use this project under MIT or GPL licenses.
-* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
-* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
-*
-* HERES THE CSS:
-* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-* .ui-timepicker-div dl { text-align: left; }
-* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
-* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
-* .ui-timepicker-div td { font-size: 90%; }
-* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-*/
-
-/*jslint evil: true, maxlen: 300, white: false, undef: false, nomen: false, onevar: false */
-
-(function($) {
-
-// Prevent "Uncaught RangeError: Maximum call stack size exceeded"
-$.ui.timepicker = $.ui.timepicker || {};
-if ($.ui.timepicker.version) {
-	return;
-}
-
-$.extend($.ui, { timepicker: { version: "1.0.1" } });
-
-/* Time picker manager.
-   Use the singleton instance of this class, $.timepicker, to interact with the time picker.
-   Settings for (groups of) time pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
-
-function Timepicker() {
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[''] = { // Default regional settings
-		currentText: 'Now',
-		closeText: 'Done',
-		ampm: false,
-		amNames: ['AM', 'A'],
-		pmNames: ['PM', 'P'],
-		timeFormat: 'hh:mm tt',
-		timeSuffix: '',
-		timeOnlyTitle: 'Choose Time',
-		timeText: 'Time',
-		hourText: 'Hour',
-		minuteText: 'Minute',
-		secondText: 'Second',
-		millisecText: 'Millisecond',
-		timezoneText: 'Time Zone'
-	};
-	this._defaults = { // Global defaults for all the datetime picker instances
-		showButtonPanel: true,
-		timeOnly: false,
-		showHour: true,
-		showMinute: true,
-		showSecond: false,
-		showMillisec: false,
-		showTimezone: false,
-		showTime: true,
-		stepHour: 1,
-		stepMinute: 1,
-		stepSecond: 1,
-		stepMillisec: 1,
-		hour: 0,
-		minute: 0,
-		second: 0,
-		millisec: 0,
-		timezone: null,
-		useLocalTimezone: false,
-		defaultTimezone: "+0000",
-		hourMin: 0,
-		minuteMin: 0,
-		secondMin: 0,
-		millisecMin: 0,
-		hourMax: 23,
-		minuteMax: 59,
-		secondMax: 59,
-		millisecMax: 999,
-		minDateTime: null,
-		maxDateTime: null,
-		onSelect: null,
-		hourGrid: 0,
-		minuteGrid: 0,
-		secondGrid: 0,
-		millisecGrid: 0,
-		alwaysSetTime: true,
-		separator: ' ',
-		altFieldTimeOnly: true,
-		showTimepicker: true,
-		timezoneIso8601: false,
-		timezoneList: null,
-		addSliderAccess: false,
-		sliderAccessArgs: null
-	};
-	$.extend(this._defaults, this.regional['']);
-}
-
-$.extend(Timepicker.prototype, {
-	$input: null,
-	$altInput: null,
-	$timeObj: null,
-	inst: null,
-	hour_slider: null,
-	minute_slider: null,
-	second_slider: null,
-	millisec_slider: null,
-	timezone_select: null,
-	hour: 0,
-	minute: 0,
-	second: 0,
-	millisec: 0,
-	timezone: null,
-	defaultTimezone: "+0000",
-	hourMinOriginal: null,
-	minuteMinOriginal: null,
-	secondMinOriginal: null,
-	millisecMinOriginal: null,
-	hourMaxOriginal: null,
-	minuteMaxOriginal: null,
-	secondMaxOriginal: null,
-	millisecMaxOriginal: null,
-	ampm: '',
-	formattedDate: '',
-	formattedTime: '',
-	formattedDateTime: '',
-	timezoneList: null,
-
-	/* Override the default settings for all instances of the time picker.
-	   @param  settings  object - the new settings to use as defaults (anonymous object)
-	   @return the manager object */
-	setDefaults: function(settings) {
-		extendRemove(this._defaults, settings || {});
-		return this;
-	},
-
-	//########################################################################
-	// Create a new Timepicker instance
-	//########################################################################
-	_newInst: function($input, o) {
-		var tp_inst = new Timepicker(),
-			inlineSettings = {};
-
-		for (var attrName in this._defaults) {
-			var attrValue = $input.attr('time:' + attrName);
-			if (attrValue) {
-				try {
-					inlineSettings[attrName] = eval(attrValue);
-				} catch (err) {
-					inlineSettings[attrName] = attrValue;
-				}
-			}
-		}
-		tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
-			beforeShow: function(input, dp_inst) {
-				if ($.isFunction(o.beforeShow)) {
-					return o.beforeShow(input, dp_inst, tp_inst);
-                }
-			},
-			onChangeMonthYear: function(year, month, dp_inst) {
-				// Update the time as well : this prevents the time from disappearing from the $input field.
-				tp_inst._updateDateTime(dp_inst);
-				if ($.isFunction(o.onChangeMonthYear)) {
-					o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
-                }
-			},
-			onClose: function(dateText, dp_inst) {
-				if (tp_inst.timeDefined === true && $input.val() !== '') {
-					tp_inst._updateDateTime(dp_inst);
-                }
-				if ($.isFunction(o.onClose)) {
-					o.onClose.call($input[0], dateText, dp_inst, tp_inst);
-                }
-			},
-			timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
-		});
-		tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase(); });
-		tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase(); });
-
-		if (tp_inst._defaults.timezoneList === null) {
-			var timezoneList = [];
-			for (var i = -11; i <= 12; i++) {
-				timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
-            }
-			if (tp_inst._defaults.timezoneIso8601) {
-				timezoneList = $.map(timezoneList, function(val) {
-					return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
-				});
-            }
-			tp_inst._defaults.timezoneList = timezoneList;
-		}
-
-		tp_inst.timezone = tp_inst._defaults.timezone;
-		tp_inst.hour = tp_inst._defaults.hour;
-		tp_inst.minute = tp_inst._defaults.minute;
-		tp_inst.second = tp_inst._defaults.second;
-		tp_inst.millisec = tp_inst._defaults.millisec;
-		tp_inst.ampm = '';
-		tp_inst.$input = $input;
-
-		if (o.altField) {
-			tp_inst.$altInput = $(o.altField)
-				.css({ cursor: 'pointer' })
-				.focus(function(){ $input.trigger("focus"); });
-        }
+/*! jQuery Timepicker Addon - v1.4.4 - 2014-03-29
+ * http://trentrichardson.com/examples/timepicker
+ * Copyright (c) 2014 Trent Richardson; Licensed MIT */
+(function ($) {
+
+    /*
+     * Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+     */
+    $.ui.timepicker = $.ui.timepicker || {};
+    if ($.ui.timepicker.version) {
+        return;
+    }
 
-		if(tp_inst._defaults.minDate===0 || tp_inst._defaults.minDateTime===0)
-		{
-			tp_inst._defaults.minDate=new Date();
-		}
-		if(tp_inst._defaults.maxDate===0 || tp_inst._defaults.maxDateTime===0)
-		{
-			tp_inst._defaults.maxDate=new Date();
-		}
-
-		// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
-		if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
-			tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
-        }
-		if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
-			tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+    /*
+     * Extend jQueryUI, get it started with our version number
+     */
+    $.extend($.ui, {
+        timepicker: {
+            version: "1.4.4"
         }
-		if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
-			tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
-        }
-		if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
-			tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
-        }
-		return tp_inst;
-	},
-
-	//########################################################################
-	// add our sliders to the calendar
-	//########################################################################
-	_addTimePicker: function(dp_inst) {
-		var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
-				this.$input.val() + ' ' + this.$altInput.val() :
-				this.$input.val();
-
-		this.timeDefined = this._parseTime(currDT);
-		this._limitMinMaxDateTime(dp_inst, false);
-		this._injectTimePicker();
-	},
-
-	//########################################################################
-	// parse the time string from input value or _setTime
-	//########################################################################
-	_parseTime: function(timeString, withDate) {
-		if (!this.inst) {
-			this.inst = $.datepicker._getInst(this.$input[0]);
-		}
-		
-		if (withDate || !this._defaults.timeOnly) 
-		{
-			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
-			try {
-				var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
-				if (!parseRes.timeObj) { return false; }
-				$.extend(this, parseRes.timeObj);
-			} catch (err)
-			{
-				return false;
-			}
-			return true;
-		}
-		else
-		{
-			var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
-			if(!timeObj) { return false; }
-			$.extend(this, timeObj);
-			return true;
-		}
-	},
-	
-	//########################################################################
-	// generate and inject html for timepicker into ui datepicker
-	//########################################################################
-	_injectTimePicker: function() {
-		var $dp = this.inst.dpDiv,
-			o = this._defaults,
-			tp_inst = this,
-			// Added by Peter Medeiros:
-			// - Figure out what the hour/minute/second max should be based on the step values.
-			// - Example: if stepMinute is 15, then minMax is 45.
-			hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
-			minMax  = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
-			secMax  = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
-			millisecMax  = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
-			dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
-
-		// Prevent displaying twice
-		//if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
-		if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
-			var noDisplay = ' style="display:none;"',
-				html =	'<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' +
-						'<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
-						((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
-						'<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' +
-						((o.showTime) ? '' : noDisplay) + '></dd>' +
-						'<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
-						((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
-				hourGridSize = 0,
-				minuteGridSize = 0,
-				secondGridSize = 0,
-				millisecGridSize = 0,
-				size = null;
-
-            // Hours
-			html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
-						((o.showHour) ? '' : noDisplay) + '></div>';
-			if (o.showHour && o.hourGrid > 0) {
-				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
-				for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) {
-					hourGridSize++;
-					var tmph = (o.ampm && h > 12) ? h-12 : h;
-					if (tmph < 10) { tmph = '0' + tmph; }
-					if (o.ampm) {
-						if (h === 0) {
-                            tmph = 12 +'a';
-                        } else {
-                            if (h < 12) { tmph += 'a'; }
-						    else { tmph += 'p'; }
+    });
+
+    /*
+     * Timepicker manager.
+     * Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+     * Settings for (groups of) time pickers are maintained in an instance object,
+     * allowing multiple different settings on the same page.
+     */
+    var Timepicker = function () {
+        this.regional = []; // Available regional settings, indexed by language code
+        this.regional[''] = { // Default regional settings
+            currentText: 'Now',
+            closeText: 'Done',
+            amNames: ['AM', 'A'],
+            pmNames: ['PM', 'P'],
+            timeFormat: 'HH:mm',
+            timeSuffix: '',
+            timeOnlyTitle: 'Choose Time',
+            timeText: 'Time',
+            hourText: 'Hour',
+            minuteText: 'Minute',
+            secondText: 'Second',
+            millisecText: 'Millisecond',
+            microsecText: 'Microsecond',
+            timezoneText: 'Time Zone',
+            isRTL: false
+        };
+        this._defaults = { // Global defaults for all the datetime picker instances
+            showButtonPanel: true,
+            timeOnly: false,
+            timeOnlyShowDate: false,
+            showHour: null,
+            showMinute: null,
+            showSecond: null,
+            showMillisec: null,
+            showMicrosec: null,
+            showTimezone: null,
+            showTime: true,
+            stepHour: 1,
+            stepMinute: 1,
+            stepSecond: 1,
+            stepMillisec: 1,
+            stepMicrosec: 1,
+            hour: 0,
+            minute: 0,
+            second: 0,
+            millisec: 0,
+            microsec: 0,
+            timezone: null,
+            hourMin: 0,
+            minuteMin: 0,
+            secondMin: 0,
+            millisecMin: 0,
+            microsecMin: 0,
+            hourMax: 23,
+            minuteMax: 59,
+            secondMax: 59,
+            millisecMax: 999,
+            microsecMax: 999,
+            minDateTime: null,
+            maxDateTime: null,
+            maxTime: null,
+            minTime: null,
+            onSelect: null,
+            hourGrid: 0,
+            minuteGrid: 0,
+            secondGrid: 0,
+            millisecGrid: 0,
+            microsecGrid: 0,
+            alwaysSetTime: true,
+            separator: ' ',
+            altFieldTimeOnly: true,
+            altTimeFormat: null,
+            altSeparator: null,
+            altTimeSuffix: null,
+            pickerTimeFormat: null,
+            pickerTimeSuffix: null,
+            showTimepicker: true,
+            timezoneList: null,
+            addSliderAccess: false,
+            sliderAccessArgs: null,
+            controlType: 'slider',
+            defaultValue: null,
+            parse: 'strict'
+        };
+        $.extend(this._defaults, this.regional['']);
+    };
+
+    $.extend(Timepicker.prototype, {
+        $input: null,
+        $altInput: null,
+        $timeObj: null,
+        inst: null,
+        hour_slider: null,
+        minute_slider: null,
+        second_slider: null,
+        millisec_slider: null,
+        microsec_slider: null,
+        timezone_select: null,
+        maxTime: null,
+        minTime: null,
+        hour: 0,
+        minute: 0,
+        second: 0,
+        millisec: 0,
+        microsec: 0,
+        timezone: null,
+        hourMinOriginal: null,
+        minuteMinOriginal: null,
+        secondMinOriginal: null,
+        millisecMinOriginal: null,
+        microsecMinOriginal: null,
+        hourMaxOriginal: null,
+        minuteMaxOriginal: null,
+        secondMaxOriginal: null,
+        millisecMaxOriginal: null,
+        microsecMaxOriginal: null,
+        ampm: '',
+        formattedDate: '',
+        formattedTime: '',
+        formattedDateTime: '',
+        timezoneList: null,
+        units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
+        support: {},
+        control: null,
+
+        /*
+         * Override the default settings for all instances of the time picker.
+         * @param  {Object} settings  object - the new settings to use as defaults (anonymous object)
+         * @return {Object} the manager object
+         */
+        setDefaults: function (settings) {
+            extendRemove(this._defaults, settings || {});
+            return this;
+        },
+
+        /*
+         * Create a new Timepicker instance
+         */
+        _newInst: function ($input, opts) {
+            var tp_inst = new Timepicker(),
+                inlineSettings = {},
+                fns = {},
+                overrides, i;
+
+            for (var attrName in this._defaults) {
+                if (this._defaults.hasOwnProperty(attrName)) {
+                    var attrValue = $input.attr('time:' + attrName);
+                    if (attrValue) {
+                        try {
+                            inlineSettings[attrName] = eval(attrValue);
+                        } catch (err) {
+                            inlineSettings[attrName] = attrValue;
                         }
-					}
-					html += '<td>' + tmph + '</td>';
-				}
-
-				html += '</tr></table></div>';
-			}
-			html += '</dd>';
-
-			// Minutes
-			html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
-					((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
-					'<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
-							((o.showMinute) ? '' : noDisplay) + '></div>';
-
-			if (o.showMinute && o.minuteGrid > 0) {
-				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
-				for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
-					minuteGridSize++;
-					html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
-				}
-
-				html += '</tr></table></div>';
-			}
-			html += '</dd>';
-
-			// Seconds
-			html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
-					((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
-					'<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
-							((o.showSecond) ? '' : noDisplay) + '></div>';
-
-			if (o.showSecond && o.secondGrid > 0) {
-				html += '<div style="padding-left: 1px"><table><tr>';
-
-				for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
-					secondGridSize++;
-					html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
-				}
-
-				html += '</tr></table></div>';
-			}
-			html += '</dd>';
-
-			// Milliseconds
-			html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
-					((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
-					'<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
-							((o.showMillisec) ? '' : noDisplay) + '></div>';
-
-			if (o.showMillisec && o.millisecGrid > 0) {
-				html += '<div style="padding-left: 1px"><table><tr>';
-
-				for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
-					millisecGridSize++;
-					html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
-				}
-
-				html += '</tr></table></div>';
-			}
-			html += '</dd>';
-
-			// Timezone
-			html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
-					((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
-			html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"'	+
-							((o.showTimezone) ? '' : noDisplay) + '></dd>';
-
-			html += '</dl></div>';
-			var $tp = $(html);
-
-				// if we only want time picker...
-			if (o.timeOnly === true) {
-				$tp.prepend(
-					'<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' +
-						'<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
-					'</div>');
-				$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
-			}
-
-			this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.hour,
-				min: o.hourMin,
-				max: hourMax,
-				step: o.stepHour,
-				slide: function(event, ui) {
-					tp_inst.hour_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
-				}
-			});
-
-
-			// Updated by Peter Medeiros:
-			// - Pass in Event and UI instance into slide function
-			this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.minute,
-				min: o.minuteMin,
-				max: minMax,
-				step: o.stepMinute,
-				slide: function(event, ui) {
-					tp_inst.minute_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
-				}
-			});
-
-			this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.second,
-				min: o.secondMin,
-				max: secMax,
-				step: o.stepSecond,
-				slide: function(event, ui) {
-					tp_inst.second_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
-				}
-			});
-
-			this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
-				orientation: "horizontal",
-				value: this.millisec,
-				min: o.millisecMin,
-				max: millisecMax,
-				step: o.stepMillisec,
-				slide: function(event, ui) {
-					tp_inst.millisec_slider.slider( "option", "value", ui.value);
-					tp_inst._onTimeChange();
-				}
-			});
-
-			this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
-			$.fn.append.apply(this.timezone_select,
-				$.map(o.timezoneList, function(val, idx) {
-					return $("<option />")
-						.val(typeof val == "object" ? val.value : val)
-						.text(typeof val == "object" ? val.label : val);
-				})
-			);
-			if (typeof(this.timezone) != "undefined" && this.timezone !== null && this.timezone !== "") {
-				var local_date = new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12);
-				var local_timezone = timeZoneString(local_date);
-				if (local_timezone == this.timezone) {
-					selectLocalTimeZone(tp_inst);
-				} else {
-					this.timezone_select.val(this.timezone);
-				}
-			} else {
-				if (typeof(this.hour) != "undefined" && this.hour !== null && this.hour !== "") {
-					this.timezone_select.val(o.defaultTimezone);
-				} else {
-					selectLocalTimeZone(tp_inst);
-				}
-			}
-			this.timezone_select.change(function() {
-				tp_inst._defaults.useLocalTimezone = false;
-				tp_inst._onTimeChange();
-			});
-
-			// Add grid functionality
-			if (o.showHour && o.hourGrid > 0) {
-				size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
-
-				$tp.find(".ui_tpicker_hour table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * hourGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each( function(index) {
-					$(this).click(function() {
-						var h = $(this).html();
-						if(o.ampm)	{
-							var ap = h.substring(2).toLowerCase(),
-								aph = parseInt(h.substring(0,2), 10);
-							if (ap == 'a') {
-								if (aph == 12) { h = 0; }
-								else { h = aph; }
-							} else if (aph == 12) { h = 12; }
-							else { h = aph + 12; }
-						}
-						tp_inst.hour_slider.slider("option", "value", h);
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / hourGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			if (o.showMinute && o.minuteGrid > 0) {
-				size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
-				$tp.find(".ui_tpicker_minute table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * minuteGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each(function(index) {
-					$(this).click(function() {
-						tp_inst.minute_slider.slider("option", "value", $(this).html());
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / minuteGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			if (o.showSecond && o.secondGrid > 0) {
-				$tp.find(".ui_tpicker_second table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * secondGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each(function(index) {
-					$(this).click(function() {
-						tp_inst.second_slider.slider("option", "value", $(this).html());
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / secondGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			if (o.showMillisec && o.millisecGrid > 0) {
-				$tp.find(".ui_tpicker_millisec table").css({
-					width: size + "%",
-					marginLeft: (size / (-2 * millisecGridSize)) + "%",
-					borderCollapse: 'collapse'
-				}).find("td").each(function(index) {
-					$(this).click(function() {
-						tp_inst.millisec_slider.slider("option", "value", $(this).html());
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					}).css({
-						cursor: 'pointer',
-						width: (100 / millisecGridSize) + '%',
-						textAlign: 'center',
-						overflow: 'hidden'
-					});
-				});
-			}
-
-			var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
-			if ($buttonPanel.length) { $buttonPanel.before($tp); }
-			else { $dp.append($tp); }
-
-			this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
-
-			if (this.inst !== null) {
-				var timeDefined = this.timeDefined;
-				this._onTimeChange();
-				this.timeDefined = timeDefined;
-			}
-
-			//Emulate datepicker onSelect behavior. Call on slidestop.
-			var onSelectDelegate = function() {
-				tp_inst._onSelectHandler();
-			};
-			this.hour_slider.bind('slidestop',onSelectDelegate);
-			this.minute_slider.bind('slidestop',onSelectDelegate);
-			this.second_slider.bind('slidestop',onSelectDelegate);
-			this.millisec_slider.bind('slidestop',onSelectDelegate);
-
-			// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
-			if (this._defaults.addSliderAccess){
-				var sliderAccessArgs = this._defaults.sliderAccessArgs;
-				setTimeout(function(){ // fix for inline mode
-					if($tp.find('.ui-slider-access').length === 0){
-						$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
-
-						// fix any grids since sliders are shorter
-						var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
-						if(sliderAccessWidth){
-							$tp.find('table:visible').each(function(){
-								var $g = $(this),
-									oldWidth = $g.outerWidth(),
-									oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
-									newWidth = oldWidth - sliderAccessWidth,
-									newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
-
-								$g.css({ width: newWidth, marginLeft: newMarginLeft });
-							});
-						}
-					}
-				},0);
-			}
-			// end slideAccess integration
-
-		}
-	},
-
-	//########################################################################
-	// This function tries to limit the ability to go outside the
-	// min/max date range
-	//########################################################################
-	_limitMinMaxDateTime: function(dp_inst, adjustSliders){
-		var o = this._defaults,
-			dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
-
-		if(!this._defaults.showTimepicker) { return; } // No time so nothing to check here
-
-		if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
-			var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
-				minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
-
-			if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){
-				this.hourMinOriginal = o.hourMin;
-				this.minuteMinOriginal = o.minuteMin;
-				this.secondMinOriginal = o.secondMin;
-				this.millisecMinOriginal = o.millisecMin;
-			}
-
-			if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
-				this._defaults.hourMin = minDateTime.getHours();
-				if (this.hour <= this._defaults.hourMin) {
-					this.hour = this._defaults.hourMin;
-					this._defaults.minuteMin = minDateTime.getMinutes();
-					if (this.minute <= this._defaults.minuteMin) {
-						this.minute = this._defaults.minuteMin;
-						this._defaults.secondMin = minDateTime.getSeconds();
-					} else if (this.second <= this._defaults.secondMin){
-						this.second = this._defaults.secondMin;
-						this._defaults.millisecMin = minDateTime.getMilliseconds();
-					} else {
-						if(this.millisec < this._defaults.millisecMin) {
-							this.millisec = this._defaults.millisecMin;
+                    }
+                }
+            }
+
+            overrides = {
+                beforeShow: function (input, dp_inst) {
+                    if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
+                        return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
+                    }
+                },
+                onChangeMonthYear: function (year, month, dp_inst) {
+                    // Update the time as well : this prevents the time from disappearing from the $input field.
+                    tp_inst._updateDateTime(dp_inst);
+                    if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
+                        tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+                    }
+                },
+                onClose: function (dateText, dp_inst) {
+                    if (tp_inst.timeDefined === true && $input.val() !== '') {
+                        tp_inst._updateDateTime(dp_inst);
+                    }
+                    if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
+                        tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
+                    }
+                }
+            };
+            for (i in overrides) {
+                if (overrides.hasOwnProperty(i)) {
+                    fns[i] = opts[i] || null;
+                }
+            }
+
+            tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, {
+                evnts: fns,
+                timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+            });
+            tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) {
+                return val.toUpperCase();
+            });
+            tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) {
+                return val.toUpperCase();
+            });
+
+            // detect which units are supported
+            tp_inst.support = detectSupport(
+                tp_inst._defaults.timeFormat +
+                    (tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
+                    (tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
+
+            // controlType is string - key to our this._controls
+            if (typeof(tp_inst._defaults.controlType) === 'string') {
+                if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') {
+                    tp_inst._defaults.controlType = 'select';
+                }
+                tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
+            }
+            // controlType is an object and must implement create, options, value methods
+            else {
+                tp_inst.control = tp_inst._defaults.controlType;
+            }
+
+            // prep the timezone options
+            var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60,
+                0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840];
+            if (tp_inst._defaults.timezoneList !== null) {
+                timezoneList = tp_inst._defaults.timezoneList;
+            }
+            var tzl = timezoneList.length, tzi = 0, tzv = null;
+            if (tzl > 0 && typeof timezoneList[0] !== 'object') {
+                for (; tzi < tzl; tzi++) {
+                    tzv = timezoneList[tzi];
+                    timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) };
+                }
+            }
+            tp_inst._defaults.timezoneList = timezoneList;
+
+            // set the default units
+            tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) :
+                ((new Date()).getTimezoneOffset() * -1);
+            tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin :
+                tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
+            tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin :
+                tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
+            tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin :
+                tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second;
+            tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin :
+                tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
+            tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin :
+                tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec;
+            tp_inst.ampm = '';
+            tp_inst.$input = $input;
+
+            if (tp_inst._defaults.altField) {
+                tp_inst.$altInput = $(tp_inst._defaults.altField).css({
+                    cursor: 'pointer'
+                }).focus(function () {
+                    $input.trigger("focus");
+                });
+            }
+
+            if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
+                tp_inst._defaults.minDate = new Date();
+            }
+            if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
+                tp_inst._defaults.maxDate = new Date();
+            }
+
+            // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+            if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+                tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+            }
+            if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+                tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+            }
+            if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+                tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+            }
+            if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+                tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+            }
+            tp_inst.$input.bind('focus', function () {
+                tp_inst._onFocus();
+            });
+
+            return tp_inst;
+        },
+
+        /*
+         * add our sliders to the calendar
+         */
+        _addTimePicker: function (dp_inst) {
+            var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val();
+
+            this.timeDefined = this._parseTime(currDT);
+            this._limitMinMaxDateTime(dp_inst, false);
+            this._injectTimePicker();
+        },
+
+        /*
+         * parse the time string from input value or _setTime
+         */
+        _parseTime: function (timeString, withDate) {
+            if (!this.inst) {
+                this.inst = $.datepicker._getInst(this.$input[0]);
+            }
+
+            if (withDate || !this._defaults.timeOnly) {
+                var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+                try {
+                    var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+                    if (!parseRes.timeObj) {
+                        return false;
+                    }
+                    $.extend(this, parseRes.timeObj);
+                } catch (err) {
+                    $.timepicker.log("Error parsing the date/time string: " + err +
+                        "\ndate/time string = " + timeString +
+                        "\ntimeFormat = " + this._defaults.timeFormat +
+                        "\ndateFormat = " + dp_dateFormat);
+                    return false;
+                }
+                return true;
+            } else {
+                var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+                if (!timeObj) {
+                    return false;
+                }
+                $.extend(this, timeObj);
+                return true;
+            }
+        },
+
+        /*
+         * generate and inject html for timepicker into ui datepicker
+         */
+        _injectTimePicker: function () {
+            var $dp = this.inst.dpDiv,
+                o = this.inst.settings,
+                tp_inst = this,
+                litem = '',
+                uitem = '',
+                show = null,
+                max = {},
+                gridSize = {},
+                size = null,
+                i = 0,
+                l = 0;
+
+            // Prevent displaying twice
+            if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
+                var noDisplay = ' style="display:none;"',
+                    html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+                        '<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
+
+                // Create the markup
+                for (i = 0, l = this.units.length; i < l; i++) {
+                    litem = this.units[i];
+                    uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+                    show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+                    // Added by Peter Medeiros:
+                    // - Figure out what the hour/minute/second max should be based on the step values.
+                    // - Example: if stepMinute is 15, then minMax is 45.
+                    max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10);
+                    gridSize[litem] = 0;
+
+                    html += '<dt class="ui_tpicker_' + litem + '_label"' + (show ? '' : noDisplay) + '>' + o[litem + 'Text'] + '</dt>' +
+                        '<dd class="ui_tpicker_' + litem + '"><div class="ui_tpicker_' + litem + '_slider"' + (show ? '' : noDisplay) + '></div>';
+
+                    if (show && o[litem + 'Grid'] > 0) {
+                        html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+                        if (litem === 'hour') {
+                            for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) {
+                                gridSize[litem]++;
+                                var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o);
+                                html += '<td data-for="' + litem + '">' + tmph + '</td>';
+                            }
                         }
-						this._defaults.millisecMin = this.millisecMinOriginal;
-					}
-				} else {
-					this._defaults.minuteMin = this.minuteMinOriginal;
-					this._defaults.secondMin = this.secondMinOriginal;
-					this._defaults.millisecMin = this.millisecMinOriginal;
-				}
-			}else{
-				this._defaults.hourMin = this.hourMinOriginal;
-				this._defaults.minuteMin = this.minuteMinOriginal;
-				this._defaults.secondMin = this.secondMinOriginal;
-				this._defaults.millisecMin = this.millisecMinOriginal;
-			}
-		}
-
-		if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
-			var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
-				maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
-
-			if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
-				this.hourMaxOriginal = o.hourMax;
-				this.minuteMaxOriginal = o.minuteMax;
-				this.secondMaxOriginal = o.secondMax;
-				this.millisecMaxOriginal = o.millisecMax;
-			}
-
-			if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
-				this._defaults.hourMax = maxDateTime.getHours();
-				if (this.hour >= this._defaults.hourMax) {
-					this.hour = this._defaults.hourMax;
-					this._defaults.minuteMax = maxDateTime.getMinutes();
-					if (this.minute >= this._defaults.minuteMax) {
-						this.minute = this._defaults.minuteMax;
-						this._defaults.secondMax = maxDateTime.getSeconds();
-					} else if (this.second >= this._defaults.secondMax) {
-						this.second = this._defaults.secondMax;
-						this._defaults.millisecMax = maxDateTime.getMilliseconds();
-					} else {
-						if(this.millisec > this._defaults.millisecMax) { this.millisec = this._defaults.millisecMax; }
-						this._defaults.millisecMax = this.millisecMaxOriginal;
-					}
-				} else {
-					this._defaults.minuteMax = this.minuteMaxOriginal;
-					this._defaults.secondMax = this.secondMaxOriginal;
-					this._defaults.millisecMax = this.millisecMaxOriginal;
-				}
-			}else{
-				this._defaults.hourMax = this.hourMaxOriginal;
-				this._defaults.minuteMax = this.minuteMaxOriginal;
-				this._defaults.secondMax = this.secondMaxOriginal;
-				this._defaults.millisecMax = this.millisecMaxOriginal;
-			}
-		}
-
-		if(adjustSliders !== undefined && adjustSliders === true){
-			var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
-                minMax  = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
-                secMax  = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
-				millisecMax  = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
-
-			if(this.hour_slider) {
-				this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
-            }
-			if(this.minute_slider) {
-				this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
-            }
-			if(this.second_slider){
-				this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
-            }
-			if(this.millisec_slider) {
-				this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec);
-            }
-		}
-
-	},
-
-
-	//########################################################################
-	// when a slider moves, set the internal time...
-	// on time change is also called when the time is updated in the text field
-	//########################################################################
-	_onTimeChange: function() {
-		var hour   = (this.hour_slider) ? this.hour_slider.slider('value') : false,
-			minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
-			second = (this.second_slider) ? this.second_slider.slider('value') : false,
-			millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
-			timezone = (this.timezone_select) ? this.timezone_select.val() : false,
-			o = this._defaults;
-
-		if (typeof(hour) == 'object') { hour = false; }
-		if (typeof(minute) == 'object') { minute = false; }
-		if (typeof(second) == 'object') { second = false; }
-		if (typeof(millisec) == 'object') { millisec = false; }
-		if (typeof(timezone) == 'object') { timezone = false; }
-
-		if (hour !== false) { hour = parseInt(hour,10); }
-		if (minute !== false) { minute = parseInt(minute,10); }
-		if (second !== false) { second = parseInt(second,10); }
-		if (millisec !== false) { millisec = parseInt(millisec,10); }
-
-		var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
-
-		// If the update was done in the input field, the input field should not be updated.
-		// If the update was done using the sliders, update the input field.
-		var hasChanged = (hour != this.hour || minute != this.minute ||
-				second != this.second || millisec != this.millisec ||
-				(this.ampm.length > 0 &&
-				    (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
-				timezone != this.timezone);
-
-		if (hasChanged) {
-
-			if (hour !== false) { this.hour = hour; }
-			if (minute !== false) { this.minute = minute; }
-			if (second !== false) { this.second = second; }
-			if (millisec !== false) { this.millisec = millisec; }
-			if (timezone !== false) { this.timezone = timezone; }
-
-			if (!this.inst) { this.inst = $.datepicker._getInst(this.$input[0]); }
-
-			this._limitMinMaxDateTime(this.inst, true);
-		}
-		if (o.ampm) { this.ampm = ampm; }
-
-		//this._formatTime();
-		this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
-		if (this.$timeObj) { this.$timeObj.text(this.formattedTime + o.timeSuffix); }
-		this.timeDefined = true;
-		if (hasChanged) { this._updateDateTime(); }
-	},
-
-	//########################################################################
-	// call custom onSelect.
-	// bind to sliders slidestop, and grid click.
-	//########################################################################
-	_onSelectHandler: function() {
-		var onSelect = this._defaults.onSelect;
-		var inputEl = this.$input ? this.$input[0] : null;
-		if (onSelect && inputEl) {
-			onSelect.apply(inputEl, [this.formattedDateTime, this]);
-		}
-	},
-
-	//########################################################################
-	// left for any backwards compatibility
-	//########################################################################
-	_formatTime: function(time, format) {
-		time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone };
-		var tmptime = (format || this._defaults.timeFormat).toString();
-
-		tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
-
-		if (arguments.length) { return tmptime; }
-		else { this.formattedTime = tmptime; }
-	},
-
-	//########################################################################
-	// update our input with the new date time..
-	//########################################################################
-	_updateDateTime: function(dp_inst) {
-		dp_inst = this.inst || dp_inst;
-		var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
-			dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
-			formatCfg = $.datepicker._getFormatConfig(dp_inst),
-			timeAvailable = dt !== null && this.timeDefined;
-		this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
-		var formattedDateTime = this.formattedDate;
-		// remove following lines to force every changes in date picker to change the input value
-		// Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
-		// If the user manually empty the value in the input field, the date picker will never change selected value.
-		//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
-		//	return;
-        //}
-
-		if (this._defaults.timeOnly === true) {
-			formattedDateTime = this.formattedTime;
-		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
-			formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
-		}
-
-		this.formattedDateTime = formattedDateTime;
-
-		if(!this._defaults.showTimepicker) {
-			this.$input.val(this.formattedDate);
-		} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
-			this.$altInput.val(this.formattedTime);
-			this.$input.val(this.formattedDate);
-		} else if(this.$altInput) {
-			this.$altInput.val(formattedDateTime);
-			this.$input.val(formattedDateTime);
-		} else {
-			this.$input.val(formattedDateTime);
-		}
-
-		this.$input.trigger("change");
-	}
-
-});
-
-$.fn.extend({
-	//########################################################################
-	// shorthand just to use timepicker..
-	//########################################################################
-	timepicker: function(o) {
-		o = o || {};
-		var tmp_args = arguments;
-
-		if (typeof o == 'object') { tmp_args[0] = $.extend(o, { timeOnly: true }); }
-
-		return $(this).each(function() {
-			$.fn.datetimepicker.apply($(this), tmp_args);
-		});
-	},
-
-	//########################################################################
-	// extend timepicker to datepicker
-	//########################################################################
-	datetimepicker: function(o) {
-		o = o || {};
-		var tmp_args = arguments;
-
-		if (typeof(o) == 'string'){
-			if(o == 'getDate') {
-				return $.fn.datepicker.apply($(this[0]), tmp_args);
-            }
-			else {
-				return this.each(function() {
-					var $t = $(this);
-					$t.datepicker.apply($t, tmp_args);
-				});
-            }
-		}
-		else {
-			return this.each(function() {
-				var $t = $(this);
-				$t.datepicker($.timepicker._newInst($t, o)._defaults);
-			});
-        }
-	}
-});
-
-$.datepicker.parseDateTime = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
-	var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
-	if (parseRes.timeObj)
-	{
-		var t = parseRes.timeObj;
-		parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
-	}
-
-	return parseRes.date;
-};
-
-$.datepicker.parseTime = function(timeFormat, timeString, options) {
-	
-	//########################################################################
-	// pattern for standard and localized AM/PM markers
-	//########################################################################
-	var getPatternAmpm = function(amNames, pmNames) {
-		var markers = [];
-		if (amNames) {
-			$.merge(markers, amNames);
-        }
-		if (pmNames) {
-			$.merge(markers, pmNames);
-        }
-		markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&'); });
-		return '(' + markers.join('|') + ')?';
-	};
-   
-	//########################################################################
-	// figure out position of time elements.. cause js cant do named captures
-	//########################################################################
-	var getFormatPositions = function( timeFormat ) {
-		var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
-			orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 };
-
-		if (finds) {
-			for (var i = 0; i < finds.length; i++) {
-				if (orders[finds[i].toString().charAt(0)] == -1) {
-					orders[finds[i].toString().charAt(0)] = i + 1;
+                        else {
+                            for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) {
+                                gridSize[litem]++;
+                                html += '<td data-for="' + litem + '">' + ((m < 10) ? '0' : '') + m + '</td>';
+                            }
+                        }
+
+                        html += '</tr></table></div>';
+                    }
+                    html += '</dd>';
+                }
+
+                // Timezone
+                var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
+                html += '<dt class="ui_tpicker_timezone_label"' + (showTz ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+                html += '<dd class="ui_tpicker_timezone" ' + (showTz ? '' : noDisplay) + '></dd>';
+
+                // Create the elements from string
+                html += '</dl></div>';
+                var $tp = $(html);
+
+                // if we only want time picker...
+                if (o.timeOnly === true) {
+                    $tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
+                    $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+                }
+
+                // add sliders, adjust grids, add events
+                for (i = 0, l = tp_inst.units.length; i < l; i++) {
+                    litem = tp_inst.units[i];
+                    uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+                    show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+                    // add the slider
+                    tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]);
+
+                    // adjust the grid and add click event
+                    if (show && o[litem + 'Grid'] > 0) {
+                        size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']);
+                        $tp.find('.ui_tpicker_' + litem + ' table').css({
+                            width: size + "%",
+                            marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"),
+                            marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0',
+                            borderCollapse: 'collapse'
+                        }).find("td").click(function (e) {
+                            var $t = $(this),
+                                h = $t.html(),
+                                n = parseInt(h.replace(/[^0-9]/g), 10),
+                                ap = h.replace(/[^apm]/ig),
+                                f = $t.data('for'); // loses scope, so we use data-for
+
+                            if (f === 'hour') {
+                                if (ap.indexOf('p') !== -1 && n < 12) {
+                                    n += 12;
+                                }
+                                else {
+                                    if (ap.indexOf('a') !== -1 && n === 12) {
+                                        n = 0;
+                                    }
+                                }
+                            }
+
+                            tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
+
+                            tp_inst._onTimeChange();
+                            tp_inst._onSelectHandler();
+                        }).css({
+                            cursor: 'pointer',
+                            width: (100 / gridSize[litem]) + '%',
+                            textAlign: 'center',
+                            overflow: 'hidden'
+                        });
+                    } // end if grid > 0
+                } // end for loop
+
+                // Add timezone options
+                this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
+                $.fn.append.apply(this.timezone_select,
+                    $.map(o.timezoneList, function (val, idx) {
+                        return $("<option />").val(typeof val === "object" ? val.value : val).text(typeof val === "object" ? val.label : val);
+                    }));
+                if (typeof(this.timezone) !== "undefined" && this.timezone !== null && this.timezone !== "") {
+                    var local_timezone = (new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12)).getTimezoneOffset() * -1;
+                    if (local_timezone === this.timezone) {
+                        selectLocalTimezone(tp_inst);
+                    } else {
+                        this.timezone_select.val(this.timezone);
+                    }
+                } else {
+                    if (typeof(this.hour) !== "undefined" && this.hour !== null && this.hour !== "") {
+                        this.timezone_select.val(o.timezone);
+                    } else {
+                        selectLocalTimezone(tp_inst);
+                    }
+                }
+                this.timezone_select.change(function () {
+                    tp_inst._onTimeChange();
+                    tp_inst._onSelectHandler();
+                });
+                // End timezone options
+
+                // inject timepicker into datepicker
+                var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+                if ($buttonPanel.length) {
+                    $buttonPanel.before($tp);
+                } else {
+                    $dp.append($tp);
+                }
+
+                this.$timeObj = $tp.find('.ui_tpicker_time');
+
+                if (this.inst !== null) {
+                    var timeDefined = this.timeDefined;
+                    this._onTimeChange();
+                    this.timeDefined = timeDefined;
+                }
+
+                // slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+                if (this._defaults.addSliderAccess) {
+                    var sliderAccessArgs = this._defaults.sliderAccessArgs,
+                        rtl = this._defaults.isRTL;
+                    sliderAccessArgs.isRTL = rtl;
+
+                    setTimeout(function () { // fix for inline mode
+                        if ($tp.find('.ui-slider-access').length === 0) {
+                            $tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+                            // fix any grids since sliders are shorter
+                            var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+                            if (sliderAccessWidth) {
+                                $tp.find('table:visible').each(function () {
+                                    var $g = $(this),
+                                        oldWidth = $g.outerWidth(),
+                                        oldMarginLeft = $g.css(rtl ? 'marginRight' : 'marginLeft').toString().replace('%', ''),
+                                        newWidth = oldWidth - sliderAccessWidth,
+                                        newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
+                                        css = { width: newWidth, marginRight: 0, marginLeft: 0 };
+                                    css[rtl ? 'marginRight' : 'marginLeft'] = newMarginLeft;
+                                    $g.css(css);
+                                });
+                            }
+                        }
+                    }, 10);
                 }
+                // end slideAccess integration
+
+                tp_inst._limitMinMaxDateTime(this.inst, true);
             }
-        }
-		return orders;
-	};
-    
-	var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {});
-    
-	var regstr = '^' + timeFormat.toString()
-			.replace(/h{1,2}/ig, '(\\d?\\d)')
-			.replace(/m{1,2}/ig, '(\\d?\\d)')
-			.replace(/s{1,2}/ig, '(\\d?\\d)')
-			.replace(/l{1}/ig, '(\\d?\\d?\\d)')
-			.replace(/t{1,2}/ig, getPatternAmpm(o.amNames, o.pmNames))
-			.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
-			.replace(/\s/g, '\\s?') + o.timeSuffix + '$',
-		order = getFormatPositions(timeFormat),
-		ampm = '',
-		treg;
-
-	treg = timeString.match(new RegExp(regstr, 'i'));
-
-	var resTime = {hour: 0, minute: 0, second: 0, millisec: 0};
-    
-	if (treg) {
-		if (order.t !== -1) {
-			if (treg[order.t] === undefined || treg[order.t].length === 0) {
-				ampm = '';
-				resTime.ampm = '';
-			} else {
-				ampm = $.inArray(treg[order.t], o.amNames) !== -1 ? 'AM' : 'PM';
-				resTime.ampm = o[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
-			}
-		}
-
-		if (order.h !== -1) {
-			if (ampm == 'AM' && treg[order.h] == '12') {
-				resTime.hour = 0; // 12am = 0 hour
-			} else {
-                if (ampm == 'PM' && treg[order.h] != '12') {
-                    resTime.hour = parseInt(treg[order.h],10) + 12; // 12pm = 12 hour, any other pm = hour + 12
-                }
-                else { resTime.hour = Number(treg[order.h]); }
-            }
-		}
-
-		if (order.m !== -1) { resTime.minute = Number(treg[order.m]); }
-		if (order.s !== -1) { resTime.second = Number(treg[order.s]); }
-		if (order.l !== -1) { resTime.millisec = Number(treg[order.l]); }
-		if (order.z !== -1 && treg[order.z] !== undefined) {
-			var tz = treg[order.z].toUpperCase();
-			switch (tz.length) {
-				case 1:	// Z
-					tz = o.timezoneIso8601 ? 'Z' : '+0000';
-					break;
-				case 5:	// +hhmm
-					if (o.timezoneIso8601) {
-						tz = tz.substring(1) == '0000' ?
-							'Z' :
-							tz.substring(0, 3) + ':' + tz.substring(3);
+        },
+
+        /*
+         * This function tries to limit the ability to go outside the
+         * min/max date range
+         */
+        _limitMinMaxDateTime: function (dp_inst, adjustSliders) {
+            var o = this._defaults,
+                dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+            if (!this._defaults.showTimepicker) {
+                return;
+            } // No time so nothing to check here
+
+            if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
+                var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+                    minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+                if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null || this.microsecMinOriginal === null) {
+                    this.hourMinOriginal = o.hourMin;
+                    this.minuteMinOriginal = o.minuteMin;
+                    this.secondMinOriginal = o.secondMin;
+                    this.millisecMinOriginal = o.millisecMin;
+                    this.microsecMinOriginal = o.microsecMin;
+                }
+
+                if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() === dp_date.getTime()) {
+                    this._defaults.hourMin = minDateTime.getHours();
+                    if (this.hour <= this._defaults.hourMin) {
+                        this.hour = this._defaults.hourMin;
+                        this._defaults.minuteMin = minDateTime.getMinutes();
+                        if (this.minute <= this._defaults.minuteMin) {
+                            this.minute = this._defaults.minuteMin;
+                            this._defaults.secondMin = minDateTime.getSeconds();
+                            if (this.second <= this._defaults.secondMin) {
+                                this.second = this._defaults.secondMin;
+                                this._defaults.millisecMin = minDateTime.getMilliseconds();
+                                if (this.millisec <= this._defaults.millisecMin) {
+                                    this.millisec = this._defaults.millisecMin;
+                                    this._defaults.microsecMin = minDateTime.getMicroseconds();
+                                } else {
+                                    if (this.microsec < this._defaults.microsecMin) {
+                                        this.microsec = this._defaults.microsecMin;
+                                    }
+                                    this._defaults.microsecMin = this.microsecMinOriginal;
+                                }
+                            } else {
+                                this._defaults.millisecMin = this.millisecMinOriginal;
+                                this._defaults.microsecMin = this.microsecMinOriginal;
+                            }
+                        } else {
+                            this._defaults.secondMin = this.secondMinOriginal;
+                            this._defaults.millisecMin = this.millisecMinOriginal;
+                            this._defaults.microsecMin = this.microsecMinOriginal;
+                        }
+                    } else {
+                        this._defaults.minuteMin = this.minuteMinOriginal;
+                        this._defaults.secondMin = this.secondMinOriginal;
+                        this._defaults.millisecMin = this.millisecMinOriginal;
+                        this._defaults.microsecMin = this.microsecMinOriginal;
                     }
-					break;
-				case 6:	// +hh:mm
-					if (!o.timezoneIso8601) {
-						tz = tz == 'Z' || tz.substring(1) == '00:00' ?
-							'+0000' :
-							tz.replace(/:/, '');
-					} else {
-                        if (tz.substring(1) == '00:00') {
-                            tz = 'Z';
+                } else {
+                    this._defaults.hourMin = this.hourMinOriginal;
+                    this._defaults.minuteMin = this.minuteMinOriginal;
+                    this._defaults.secondMin = this.secondMinOriginal;
+                    this._defaults.millisecMin = this.millisecMinOriginal;
+                    this._defaults.microsecMin = this.microsecMinOriginal;
+                }
+            }
+
+            if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
+                var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+                    maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+                if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null || this.millisecMaxOriginal === null) {
+                    this.hourMaxOriginal = o.hourMax;
+                    this.minuteMaxOriginal = o.minuteMax;
+                    this.secondMaxOriginal = o.secondMax;
+                    this.millisecMaxOriginal = o.millisecMax;
+                    this.microsecMaxOriginal = o.microsecMax;
+                }
+
+                if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() === dp_date.getTime()) {
+                    this._defaults.hourMax = maxDateTime.getHours();
+                    if (this.hour >= this._defaults.hourMax) {
+                        this.hour = this._defaults.hourMax;
+                        this._defaults.minuteMax = maxDateTime.getMinutes();
+                        if (this.minute >= this._defaults.minuteMax) {
+                            this.minute = this._defaults.minuteMax;
+                            this._defaults.secondMax = maxDateTime.getSeconds();
+                            if (this.second >= this._defaults.secondMax) {
+                                this.second = this._defaults.secondMax;
+                                this._defaults.millisecMax = maxDateTime.getMilliseconds();
+                                if (this.millisec >= this._defaults.millisecMax) {
+                                    this.millisec = this._defaults.millisecMax;
+                                    this._defaults.microsecMax = maxDateTime.getMicroseconds();
+                                } else {
+                                    if (this.microsec > this._defaults.microsecMax) {
+                                        this.microsec = this._defaults.microsecMax;
+                                    }
+                                    this._defaults.microsecMax = this.microsecMaxOriginal;
+                                }
+                            } else {
+                                this._defaults.millisecMax = this.millisecMaxOriginal;
+                                this._defaults.microsecMax = this.microsecMaxOriginal;
+                            }
+                        } else {
+                            this._defaults.secondMax = this.secondMaxOriginal;
+                            this._defaults.millisecMax = this.millisecMaxOriginal;
+                            this._defaults.microsecMax = this.microsecMaxOriginal;
                         }
+                    } else {
+                        this._defaults.minuteMax = this.minuteMaxOriginal;
+                        this._defaults.secondMax = this.secondMaxOriginal;
+                        this._defaults.millisecMax = this.millisecMaxOriginal;
+                        this._defaults.microsecMax = this.microsecMaxOriginal;
                     }
-					break;
-			}
-			resTime.timezone = tz;
-		}
-
-
-		return resTime;
-	}
-
-	return false;
-};
-
-//########################################################################
-// format the time all pretty...
-// format = string format of the time
-// time = a {}, not a Date() for timezones
-// options = essentially the regional[].. amNames, pmNames, ampm
-//########################################################################
-$.datepicker.formatTime = function(format, time, options) {
-	options = options || {};
-	options = $.extend($.timepicker._defaults, options);
-	time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
-
-	var tmptime = format;
-	var ampmName = options.amNames[0];
-
-	var hour = parseInt(time.hour, 10);
-	if (options.ampm) {
-		if (hour > 11){
-			ampmName = options.pmNames[0];
-			if(hour > 12) {
-				hour = hour % 12;
-            }
-		}
-		if (hour === 0) {
-			hour = 12;
-        }
-	}
-	tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) {
-		switch (match.toLowerCase()) {
-			case 'hh': return ('0' + hour).slice(-2);
-			case 'h':  return hour;
-			case 'mm': return ('0' + time.minute).slice(-2);
-			case 'm':  return time.minute;
-			case 'ss': return ('0' + time.second).slice(-2);
-			case 's':  return time.second;
-			case 'l':  return ('00' + time.millisec).slice(-3);
-			case 'z':  return time.timezone;
-			case 't': case 'tt':
-				if (options.ampm) {
-					if (match.length == 1) {
-						ampmName = ampmName.charAt(0);
+                } else {
+                    this._defaults.hourMax = this.hourMaxOriginal;
+                    this._defaults.minuteMax = this.minuteMaxOriginal;
+                    this._defaults.secondMax = this.secondMaxOriginal;
+                    this._defaults.millisecMax = this.millisecMaxOriginal;
+                    this._defaults.microsecMax = this.microsecMaxOriginal;
+                }
+            }
+
+            if (dp_inst.settings.minTime!==null) {
+                var tempMinTime=new Date("01/01/1970 " + dp_inst.settings.minTime);
+                if (this.hour<tempMinTime.getHours()) {
+                    this.hour=this._defaults.hourMin=tempMinTime.getHours();
+                    this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
+                } else if (this.hour===tempMinTime.getHours() && this.minute<tempMinTime.getMinutes()) {
+                    this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
+                } else {
+                    if (this._defaults.hourMin<tempMinTime.getHours()) {
+                        this._defaults.hourMin=tempMinTime.getHours();
+                        this._defaults.minuteMin=tempMinTime.getMinutes();
+                    } else if (this._defaults.hourMin===tempMinTime.getHours()===this.hour && this._defaults.minuteMin<tempMinTime.getMinutes()) {
+                        this._defaults.minuteMin=tempMinTime.getMinutes();
+                    } else {
+                        this._defaults.minuteMin=0;
+                    }
+                }
+            }
+
+            if (dp_inst.settings.maxTime!==null) {
+                var tempMaxTime=new Date("01/01/1970 " + dp_inst.settings.maxTime);
+                if (this.hour>tempMaxTime.getHours()) {
+                    this.hour=this._defaults.hourMax=tempMaxTime.getHours();
+                    this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
+                } else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {
+                    this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
+                } else {
+                    if (this._defaults.hourMax>tempMaxTime.getHours()) {
+                        this._defaults.hourMax=tempMaxTime.getHours();
+                        this._defaults.minuteMax=tempMaxTime.getMinutes();
+                    } else if (this._defaults.hourMax===tempMaxTime.getHours()===this.hour && this._defaults.minuteMax>tempMaxTime.getMinutes()) {
+                        this._defaults.minuteMax=tempMaxTime.getMinutes();
+                    } else {
+                        this._defaults.minuteMax=59;
+                    }
+                }
+            }
+
+            if (adjustSliders !== undefined && adjustSliders === true) {
+                var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
+                    minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
+                    secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
+                    millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
+                    microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10);
+
+                if (this.hour_slider) {
+                    this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax, step: this._defaults.stepHour });
+                    this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
+                }
+                if (this.minute_slider) {
+                    this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax, step: this._defaults.stepMinute });
+                    this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
+                }
+                if (this.second_slider) {
+                    this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax, step: this._defaults.stepSecond });
+                    this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
+                }
+                if (this.millisec_slider) {
+                    this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax, step: this._defaults.stepMillisec });
+                    this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
+                }
+                if (this.microsec_slider) {
+                    this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax, step: this._defaults.stepMicrosec });
+                    this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
+                }
+            }
+
+        },
+
+        /*
+         * when a slider moves, set the internal time...
+         * on time change is also called when the time is updated in the text field
+         */
+        _onTimeChange: function () {
+            if (!this._defaults.showTimepicker) {
+                return;
+            }
+            var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
+                minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
+                second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
+                millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
+                microsec = (this.microsec_slider) ? this.control.value(this, this.microsec_slider, 'microsec') : false,
+                timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+                o = this._defaults,
+                pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
+                pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
+
+            if (typeof(hour) === 'object') {
+                hour = false;
+            }
+            if (typeof(minute) === 'object') {
+                minute = false;
+            }
+            if (typeof(second) === 'object') {
+                second = false;
+            }
+            if (typeof(millisec) === 'object') {
+                millisec = false;
+            }
+            if (typeof(microsec) === 'object') {
+                microsec = false;
+            }
+            if (typeof(timezone) === 'object') {
+                timezone = false;
+            }
+
+            if (hour !== false) {
+                hour = parseInt(hour, 10);
+            }
+            if (minute !== false) {
+                minute = parseInt(minute, 10);
+            }
+            if (second !== false) {
+                second = parseInt(second, 10);
+            }
+            if (millisec !== false) {
+                millisec = parseInt(millisec, 10);
+            }
+            if (microsec !== false) {
+                microsec = parseInt(microsec, 10);
+            }
+            if (timezone !== false) {
+                timezone = timezone.toString();
+            }
+
+            var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+            // If the update was done in the input field, the input field should not be updated.
+            // If the update was done using the sliders, update the input field.
+            var hasChanged = (
+                hour !== parseInt(this.hour,10) || // sliders should all be numeric
+                    minute !== parseInt(this.minute,10) ||
+                    second !== parseInt(this.second,10) ||
+                    millisec !== parseInt(this.millisec,10) ||
+                    microsec !== parseInt(this.microsec,10) ||
+                    (this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) ||
+                    (this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
+                );
+
+            if (hasChanged) {
+
+                if (hour !== false) {
+                    this.hour = hour;
+                }
+                if (minute !== false) {
+                    this.minute = minute;
+                }
+                if (second !== false) {
+                    this.second = second;
+                }
+                if (millisec !== false) {
+                    this.millisec = millisec;
+                }
+                if (microsec !== false) {
+                    this.microsec = microsec;
+                }
+                if (timezone !== false) {
+                    this.timezone = timezone;
+                }
+
+                if (!this.inst) {
+                    this.inst = $.datepicker._getInst(this.$input[0]);
+                }
+
+                this._limitMinMaxDateTime(this.inst, true);
+            }
+            if (this.support.ampm) {
+                this.ampm = ampm;
+            }
+
+            // Updates the time within the timepicker
+            this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
+            if (this.$timeObj) {
+                if (pickerTimeFormat === o.timeFormat) {
+                    this.$timeObj.text(this.formattedTime + pickerTimeSuffix);
+                }
+                else {
+                    this.$timeObj.text($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
+                }
+            }
+
+            this.timeDefined = true;
+            if (hasChanged) {
+                this._updateDateTime();
+                //this.$input.focus(); // may automatically open the picker on setDate
+            }
+        },
+
+        /*
+         * call custom onSelect.
+         * bind to sliders slidestop, and grid click.
+         */
+        _onSelectHandler: function () {
+            var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
+            var inputEl = this.$input ? this.$input[0] : null;
+            if (onSelect && inputEl) {
+                onSelect.apply(inputEl, [this.formattedDateTime, this]);
+            }
+        },
+
+        /*
+         * update our input with the new date time..
+         */
+        _updateDateTime: function (dp_inst) {
+            dp_inst = this.inst || dp_inst;
+            var dtTmp = (dp_inst.currentYear > 0?
+                    new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) :
+                    new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+                dt = $.datepicker._daylightSavingAdjust(dtTmp),
+            //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+            //dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
+                dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+                formatCfg = $.datepicker._getFormatConfig(dp_inst),
+                timeAvailable = dt !== null && this.timeDefined;
+            this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+            var formattedDateTime = this.formattedDate;
+
+            // if a slider was changed but datepicker doesn't have a value yet, set it
+            if (dp_inst.lastVal === "") {
+                dp_inst.currentYear = dp_inst.selectedYear;
+                dp_inst.currentMonth = dp_inst.selectedMonth;
+                dp_inst.currentDay = dp_inst.selectedDay;
+            }
+
+            /*
+             * remove following lines to force every changes in date picker to change the input value
+             * Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker.
+             * If the user manually empty the value in the input field, the date picker will never change selected value.
+             */
+            //if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+            //	return;
+            //}
+
+            if (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === false) {
+                formattedDateTime = this.formattedTime;
+            } else if ((this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) || (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === true)) {
+                formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+            }
+
+            this.formattedDateTime = formattedDateTime;
+
+            if (!this._defaults.showTimepicker) {
+                this.$input.val(this.formattedDate);
+            } else if (this.$altInput && this._defaults.timeOnly === false && this._defaults.altFieldTimeOnly === true) {
+                this.$altInput.val(this.formattedTime);
+                this.$input.val(this.formattedDate);
+            } else if (this.$altInput) {
+                this.$input.val(formattedDateTime);
+                var altFormattedDateTime = '',
+                    altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
+                    altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
+
+                if (!this._defaults.timeOnly) {
+                    if (this._defaults.altFormat) {
+                        altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
+                    }
+                    else {
+                        altFormattedDateTime = this.formattedDate;
+                    }
+
+                    if (altFormattedDateTime) {
+                        altFormattedDateTime += altSeparator;
                     }
-					return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
-				}
-				return '';
-		}
-	});
-
-	tmptime = $.trim(tmptime);
-	return tmptime;
-};
-
-//########################################################################
-// the bad hack :/ override datepicker so it doesnt close on select
-// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
-//########################################################################
-$.datepicker._base_selectDate = $.datepicker._selectDate;
-$.datepicker._selectDate = function (id, dateStr) {
-	var inst = this._getInst($(id)[0]),
-		tp_inst = this._get(inst, 'timepicker');
-
-	if (tp_inst) {
-		tp_inst._limitMinMaxDateTime(inst, true);
-		inst.inline = inst.stay_open = true;
-		//This way the onSelect handler called from calendarpicker get the full dateTime
-		this._base_selectDate(id, dateStr);
-		inst.inline = inst.stay_open = false;
-		this._notifyChange(inst);
-		this._updateDatepicker(inst);
-	}
-	else { this._base_selectDate(id, dateStr); }
-};
-
-//#############################################################################################
-// second bad hack :/ override datepicker so it triggers an event when changing the input field
-// and does not redraw the datepicker on every selectDate event
-//#############################################################################################
-$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
-$.datepicker._updateDatepicker = function(inst) {
-
-	// don't popup the datepicker if there is another instance already opened
-	var input = inst.input[0];
-	if($.datepicker._curInst &&
-	   $.datepicker._curInst != inst &&
-	   $.datepicker._datepickerShowing &&
-	   $.datepicker._lastInput != input) {
-		return;
-	}
-
-	if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
-
-		this._base_updateDatepicker(inst);
-
-		// Reload the time control when changing something in the input text field.
-		var tp_inst = this._get(inst, 'timepicker');
-		if(tp_inst) {
-			tp_inst._addTimePicker(inst);
-
-			if (tp_inst._defaults.useLocalTimezone) { //checks daylight saving with the new date.
-				var date = new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay, 12);
-				selectLocalTimeZone(tp_inst, date);
-				tp_inst._onTimeChange();
-			}
-		}
-	}
-};
-
-//#######################################################################################
-// third bad hack :/ override datepicker so it allows spaces and colon in the input field
-//#######################################################################################
-$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
-$.datepicker._doKeyPress = function(event) {
-	var inst = $.datepicker._getInst(event.target),
-		tp_inst = $.datepicker._get(inst, 'timepicker');
-
-	if (tp_inst) {
-		if ($.datepicker._get(inst, 'constrainInput')) {
-			var ampm = tp_inst._defaults.ampm,
-				dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
-				datetimeChars = tp_inst._defaults.timeFormat.toString()
-								.replace(/[hms]/g, '')
-								.replace(/TT/g, ampm ? 'APM' : '')
-								.replace(/Tt/g, ampm ? 'AaPpMm' : '')
-								.replace(/tT/g, ampm ? 'AaPpMm' : '')
-								.replace(/T/g, ampm ? 'AP' : '')
-								.replace(/tt/g, ampm ? 'apm' : '')
-								.replace(/t/g, ampm ? 'ap' : '') +
-								" " +
-								tp_inst._defaults.separator +
-								tp_inst._defaults.timeSuffix +
-								(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
-								(tp_inst._defaults.amNames.join('')) +
-								(tp_inst._defaults.pmNames.join('')) +
-								dateChars,
-				chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
-			return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
-		}
-	}
-
-	return $.datepicker._base_doKeyPress(event);
-};
-
-//#######################################################################################
-// Override key up event to sync manual input changes.
-//#######################################################################################
-$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
-$.datepicker._doKeyUp = function (event) {
-	var inst = $.datepicker._getInst(event.target),
-		tp_inst = $.datepicker._get(inst, 'timepicker');
-
-	if (tp_inst) {
-		if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
-			try {
-				$.datepicker._updateDatepicker(inst);
-			}
-			catch (err) {
-				$.datepicker.log(err);
-			}
-		}
-	}
-
-	return $.datepicker._base_doKeyUp(event);
-};
-
-//#######################################################################################
-// override "Today" button to also grab the time.
-//#######################################################################################
-$.datepicker._base_gotoToday = $.datepicker._gotoToday;
-$.datepicker._gotoToday = function(id) {
-	var inst = this._getInst($(id)[0]),
-		$dp = inst.dpDiv;
-	this._base_gotoToday(id);
-	var tp_inst = this._get(inst, 'timepicker');
-	selectLocalTimeZone(tp_inst);
-	var now = new Date();
-	this._setTime(inst, now);
-	$( '.ui-datepicker-today', $dp).click();
-};
-
-//#######################################################################################
-// Disable & enable the Time in the datetimepicker
-//#######################################################################################
-$.datepicker._disableTimepickerDatepicker = function(target) {
-	var inst = this._getInst(target);
-    if (!inst) { return; }
-    
-	var tp_inst = this._get(inst, 'timepicker');
-	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-	if (tp_inst) {
-		tp_inst._defaults.showTimepicker = false;
-		tp_inst._updateDateTime(inst);
-	}
-};
-
-$.datepicker._enableTimepickerDatepicker = function(target) {
-	var inst = this._getInst(target);
-    if (!inst) { return; }
-    
-	var tp_inst = this._get(inst, 'timepicker');
-	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-	if (tp_inst) {
-		tp_inst._defaults.showTimepicker = true;
-		tp_inst._addTimePicker(inst); // Could be disabled on page load
-		tp_inst._updateDateTime(inst);
-	}
-};
-
-//#######################################################################################
-// Create our own set time function
-//#######################################################################################
-$.datepicker._setTime = function(inst, date) {
-	var tp_inst = this._get(inst, 'timepicker');
-	if (tp_inst) {
-		var defaults = tp_inst._defaults,
-			// calling _setTime with no date sets time to defaults
-			hour = date ? date.getHours() : defaults.hour,
-			minute = date ? date.getMinutes() : defaults.minute,
-			second = date ? date.getSeconds() : defaults.second,
-			millisec = date ? date.getMilliseconds() : defaults.millisec;
-		//check if within min/max times..
-		// correct check if within min/max times. 	
-		// Rewritten by Scott A. Woodward
-		var hourEq = hour === defaults.hourMin,
-			minuteEq = minute === defaults.minuteMin,
-			secondEq = second === defaults.secondMin;
-		var reset = false;
-		if(hour < defaults.hourMin || hour > defaults.hourMax)  
-			reset = true;
-		else if( (minute < defaults.minuteMin || minute > defaults.minuteMax) && hourEq)
-			reset = true;
-		else if( (second < defaults.secondMin || second > defaults.secondMax ) && hourEq && minuteEq)
-			reset = true;
-		else if( (millisec < defaults.millisecMin || millisec > defaults.millisecMax) && hourEq && minuteEq && secondEq)
-			reset = true;
-		if(reset) {
-			hour = defaults.hourMin;
-			minute = defaults.minuteMin;
-			second = defaults.secondMin;
-			millisec = defaults.millisecMin;
-		}
-		tp_inst.hour = hour;
-		tp_inst.minute = minute;
-		tp_inst.second = second;
-		tp_inst.millisec = millisec;
-		if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
-		if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
-		if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
-		if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
-
-		tp_inst._onTimeChange();
-		tp_inst._updateDateTime(inst);
-	}
-};
-
-//#######################################################################################
-// Create new public method to set only time, callable as $().datepicker('setTime', date)
-//#######################################################################################
-$.datepicker._setTimeDatepicker = function(target, date, withDate) {
-	var inst = this._getInst(target);
-    if (!inst) { return; }
-    
-	var tp_inst = this._get(inst, 'timepicker');
-    
-	if (tp_inst) {
-		this._setDateFromField(inst);
-		var tp_date;
-		if (date) {
-			if (typeof date == "string") {
-				tp_inst._parseTime(date, withDate);
-				tp_date = new Date();
-				tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-			}
-			else { tp_date = new Date(date.getTime()); }
-			if (tp_date.toString() == 'Invalid Date') { tp_date = undefined; }
-			this._setTime(inst, tp_date);
-		}
-	}
-
-};
-
-//#######################################################################################
-// override setDate() to allow setting time too within Date object
-//#######################################################################################
-$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
-$.datepicker._setDateDatepicker = function(target, date) {
-	var inst = this._getInst(target);
-    if (!inst) { return; }
-    
-	var tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
-
-	this._updateDatepicker(inst);
-	this._base_setDateDatepicker.apply(this, arguments);
-	this._setTimeDatepicker(target, tp_date, true);
-};
-
-//#######################################################################################
-// override getDate() to allow getting time too within Date object
-//#######################################################################################
-$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
-$.datepicker._getDateDatepicker = function(target, noDefault) {
-	var inst = this._getInst(target);
-    if (!inst) { return; }
-    
-    var tp_inst = this._get(inst, 'timepicker');
-
-	if (tp_inst) {
-		this._setDateFromField(inst, noDefault);
-		var date = this._getDate(inst);
-		if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) { date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec); }
-		return date;
-	}
-	return this._base_getDateDatepicker(target, noDefault);
-};
-
-//#######################################################################################
-// override parseDate() because UI 1.8.14 throws an error about "Extra characters"
-// An option in datapicker to ignore extra format characters would be nicer.
-//#######################################################################################
-$.datepicker._base_parseDate = $.datepicker.parseDate;
-$.datepicker.parseDate = function(format, value, settings) {
-    var splitRes = splitDateTime(format, value, settings);
-	return $.datepicker._base_parseDate(format, splitRes[0], settings);
-};
-
-//#######################################################################################
-// override formatDate to set date with time to the input
-//#######################################################################################
-$.datepicker._base_formatDate = $.datepicker._formatDate;
-$.datepicker._formatDate = function(inst, day, month, year){
-	var tp_inst = this._get(inst, 'timepicker');
-	if(tp_inst) {
-		tp_inst._updateDateTime(inst);
-		return tp_inst.$input.val();
-	}
-	return this._base_formatDate(inst);
-};
-
-//#######################################################################################
-// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
-//#######################################################################################
-$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
-$.datepicker._optionDatepicker = function(target, name, value) {
-	var inst = this._getInst(target);
-    if (!inst) { return null; }
-    
-	var tp_inst = this._get(inst, 'timepicker');
-	if (tp_inst) {
-		var min = null, max = null, onselect = null;
-		if (typeof name == 'string') { // if min/max was set with the string
-			if (name === 'minDate' || name === 'minDateTime' ) {
-				min = value;
-            }
-			else {
-                if (name === 'maxDate' || name === 'maxDateTime') {
-                    max = value;
+                }
+
+                if (this._defaults.altTimeFormat) {
+                    altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
                 }
                 else {
-                    if (name === 'onSelect') {
-                        onselect = value;
+                    altFormattedDateTime += this.formattedTime + altTimeSuffix;
+                }
+                this.$altInput.val(altFormattedDateTime);
+            } else {
+                this.$input.val(formattedDateTime);
+            }
+
+            this.$input.trigger("change");
+        },
+
+        _onFocus: function () {
+            if (!this.$input.val() && this._defaults.defaultValue) {
+                this.$input.val(this._defaults.defaultValue);
+                var inst = $.datepicker._getInst(this.$input.get(0)),
+                    tp_inst = $.datepicker._get(inst, 'timepicker');
+                if (tp_inst) {
+                    if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+                        try {
+                            $.datepicker._updateDatepicker(inst);
+                        } catch (err) {
+                            $.timepicker.log(err);
+                        }
                     }
                 }
             }
-		} else {
-            if (typeof name == 'object') { //if min/max was set with the JSON
-                if (name.minDate) {
-                    min = name.minDate;
+        },
+
+        /*
+         * Small abstraction to control types
+         * We can add more, just be sure to follow the pattern: create, options, value
+         */
+        _controls: {
+            // slider methods
+            slider: {
+                create: function (tp_inst, obj, unit, val, min, max, step) {
+                    var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
+                    return obj.prop('slide', null).slider({
+                        orientation: "horizontal",
+                        value: rtl ? val * -1 : val,
+                        min: rtl ? max * -1 : min,
+                        max: rtl ? min * -1 : max,
+                        step: step,
+                        slide: function (event, ui) {
+                            tp_inst.control.value(tp_inst, $(this), unit, rtl ? ui.value * -1 : ui.value);
+                            tp_inst._onTimeChange();
+                        },
+                        stop: function (event, ui) {
+                            tp_inst._onSelectHandler();
+                        }
+                    });
+                },
+                options: function (tp_inst, obj, unit, opts, val) {
+                    if (tp_inst._defaults.isRTL) {
+                        if (typeof(opts) === 'string') {
+                            if (opts === 'min' || opts === 'max') {
+                                if (val !== undefined) {
+                                    return obj.slider(opts, val * -1);
+                                }
+                                return Math.abs(obj.slider(opts));
+                            }
+                            return obj.slider(opts);
+                        }
+                        var min = opts.min,
+                            max = opts.max;
+                        opts.min = opts.max = null;
+                        if (min !== undefined) {
+                            opts.max = min * -1;
+                        }
+                        if (max !== undefined) {
+                            opts.min = max * -1;
+                        }
+                        return obj.slider(opts);
+                    }
+                    if (typeof(opts) === 'string' && val !== undefined) {
+                        return obj.slider(opts, val);
+                    }
+                    return obj.slider(opts);
+                },
+                value: function (tp_inst, obj, unit, val) {
+                    if (tp_inst._defaults.isRTL) {
+                        if (val !== undefined) {
+                            return obj.slider('value', val * -1);
+                        }
+                        return Math.abs(obj.slider('value'));
+                    }
+                    if (val !== undefined) {
+                        return obj.slider('value', val);
+                    }
+                    return obj.slider('value');
+                }
+            },
+            // select methods
+            select: {
+                create: function (tp_inst, obj, unit, val, min, max, step) {
+                    var sel = '<select class="ui-timepicker-select" data-unit="' + unit + '" data-min="' + min + '" data-max="' + max + '" data-step="' + step + '">',
+                        format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
+
+                    for (var i = min; i <= max; i += step) {
+                        sel += '<option value="' + i + '"' + (i === val ? ' selected' : '') + '>';
+                        if (unit === 'hour') {
+                            sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig, '')), {hour: i}, tp_inst._defaults);
+                        }
+                        else if (unit === 'millisec' || unit === 'microsec' || i >= 10) { sel += i; }
+                        else {sel += '0' + i.toString(); }
+                        sel += '</option>';
+                    }
+                    sel += '</select>';
+
+                    obj.children('select').remove();
+
+                    $(sel).appendTo(obj).change(function (e) {
+                        tp_inst._onTimeChange();
+                        tp_inst._onSelectHandler();
+                    });
+
+                    return obj;
+                },
+                options: function (tp_inst, obj, unit, opts, val) {
+                    var o = {},
+                        $t = obj.children('select');
+                    if (typeof(opts) === 'string') {
+                        if (val === undefined) {
+                            return $t.data(opts);
+                        }
+                        o[opts] = val;
+                    }
+                    else { o = opts; }
+                    return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
+                },
+                value: function (tp_inst, obj, unit, val) {
+                    var $t = obj.children('select');
+                    if (val !== undefined) {
+                        return $t.val(val);
+                    }
+                    return $t.val();
+                }
+            }
+        } // end _controls
+
+    });
+
+    $.fn.extend({
+        /*
+         * shorthand just to use timepicker.
+         */
+        timepicker: function (o) {
+            o = o || {};
+            var tmp_args = Array.prototype.slice.call(arguments);
+
+            if (typeof o === 'object') {
+                tmp_args[0] = $.extend(o, {
+                    timeOnly: true
+                });
+            }
+
+            return $(this).each(function () {
+                $.fn.datetimepicker.apply($(this), tmp_args);
+            });
+        },
+
+        /*
+         * extend timepicker to datepicker
+         */
+        datetimepicker: function (o) {
+            o = o || {};
+            var tmp_args = arguments;
+
+            if (typeof(o) === 'string') {
+                if (o === 'getDate') {
+                    return $.fn.datepicker.apply($(this[0]), tmp_args);
                 } else {
-                    if (name.minDateTime) {
-                        min = name.minDateTime;
+                    return this.each(function () {
+                        var $t = $(this);
+                        $t.datepicker.apply($t, tmp_args);
+                    });
+                }
+            } else {
+                return this.each(function () {
+                    var $t = $(this);
+                    $t.datepicker($.timepicker._newInst($t, o)._defaults);
+                });
+            }
+        }
+    });
+
+    /*
+     * Public Utility to parse date and time
+     */
+    $.datepicker.parseDateTime = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+        var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+        if (parseRes.timeObj) {
+            var t = parseRes.timeObj;
+            parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+            parseRes.date.setMicroseconds(t.microsec);
+        }
+
+        return parseRes.date;
+    };
+
+    /*
+     * Public utility to parse time
+     */
+    $.datepicker.parseTime = function (timeFormat, timeString, options) {
+        var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {}),
+            iso8601 = (timeFormat.replace(/\'.*?\'/g, '').indexOf('Z') !== -1);
+
+        // Strict parse requires the timeString to match the timeFormat exactly
+        var strictParse = function (f, s, o) {
+
+            // pattern for standard and localized AM/PM markers
+            var getPatternAmpm = function (amNames, pmNames) {
+                var markers = [];
+                if (amNames) {
+                    $.merge(markers, amNames);
+                }
+                if (pmNames) {
+                    $.merge(markers, pmNames);
+                }
+                markers = $.map(markers, function (val) {
+                    return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
+                });
+                return '(' + markers.join('|') + ')?';
+            };
+
+            // figure out position of time elements.. cause js cant do named captures
+            var getFormatPositions = function (timeFormat) {
+                var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|c{1}|t{1,2}|z|'.*?')/g),
+                    orders = {
+                        h: -1,
+                        m: -1,
+                        s: -1,
+                        l: -1,
+                        c: -1,
+                        t: -1,
+                        z: -1
+                    };
+
+                if (finds) {
+                    for (var i = 0; i < finds.length; i++) {
+                        if (orders[finds[i].toString().charAt(0)] === -1) {
+                            orders[finds[i].toString().charAt(0)] = i + 1;
+                        }
+                    }
+                }
+                return orders;
+            };
+
+            var regstr = '^' + f.toString()
+                    .replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+                        var ml = match.length;
+                        switch (match.charAt(0).toLowerCase()) {
+                            case 'h':
+                                return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+                            case 'm':
+                                return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+                            case 's':
+                                return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+                            case 'l':
+                                return '(\\d?\\d?\\d)';
+                            case 'c':
+                                return '(\\d?\\d?\\d)';
+                            case 'z':
+                                return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
+                            case 't':
+                                return getPatternAmpm(o.amNames, o.pmNames);
+                            default:    // literal escaped in quotes
+                                return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
+                        }
+                    })
+                    .replace(/\s/g, '\\s?') +
+                    o.timeSuffix + '$',
+                order = getFormatPositions(f),
+                ampm = '',
+                treg;
+
+            treg = s.match(new RegExp(regstr, 'i'));
+
+            var resTime = {
+                hour: 0,
+                minute: 0,
+                second: 0,
+                millisec: 0,
+                microsec: 0
+            };
+
+            if (treg) {
+                if (order.t !== -1) {
+                    if (treg[order.t] === undefined || treg[order.t].length === 0) {
+                        ampm = '';
+                        resTime.ampm = '';
                     } else {
-                        if (name.maxDate) {
-                            max = name.maxDate;
+                        ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
+                        resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
+                    }
+                }
+
+                if (order.h !== -1) {
+                    if (ampm === 'AM' && treg[order.h] === '12') {
+                        resTime.hour = 0; // 12am = 0 hour
+                    } else {
+                        if (ampm === 'PM' && treg[order.h] !== '12') {
+                            resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
                         } else {
-                            if (name.maxDateTime) {
-                                max = name.maxDateTime;
-                            }
+                            resTime.hour = Number(treg[order.h]);
+                        }
+                    }
+                }
+
+                if (order.m !== -1) {
+                    resTime.minute = Number(treg[order.m]);
+                }
+                if (order.s !== -1) {
+                    resTime.second = Number(treg[order.s]);
+                }
+                if (order.l !== -1) {
+                    resTime.millisec = Number(treg[order.l]);
+                }
+                if (order.c !== -1) {
+                    resTime.microsec = Number(treg[order.c]);
+                }
+                if (order.z !== -1 && treg[order.z] !== undefined) {
+                    resTime.timezone = $.timepicker.timezoneOffsetNumber(treg[order.z]);
+                }
+
+
+                return resTime;
+            }
+            return false;
+        };// end strictParse
+
+        // First try JS Date, if that fails, use strictParse
+        var looseParse = function (f, s, o) {
+            try {
+                var d = new Date('2012-01-01 ' + s);
+                if (isNaN(d.getTime())) {
+                    d = new Date('2012-01-01T' + s);
+                    if (isNaN(d.getTime())) {
+                        d = new Date('01/01/2012 ' + s);
+                        if (isNaN(d.getTime())) {
+                            throw "Unable to parse time with native Date: " + s;
                         }
                     }
                 }
+
+                return {
+                    hour: d.getHours(),
+                    minute: d.getMinutes(),
+                    second: d.getSeconds(),
+                    millisec: d.getMilliseconds(),
+                    microsec: d.getMicroseconds(),
+                    timezone: d.getTimezoneOffset() * -1
+                };
+            }
+            catch (err) {
+                try {
+                    return strictParse(f, s, o);
+                }
+                catch (err2) {
+                    $.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
+                }
             }
+            return false;
+        }; // end looseParse
+
+        if (typeof o.parse === "function") {
+            return o.parse(timeFormat, timeString, o);
         }
-		if(min) { //if min was set
-			if (min === 0) {
-				min = new Date();
-            } else {
-				min = new Date(min);
+        if (o.parse === 'loose') {
+            return looseParse(timeFormat, timeString, o);
+        }
+        return strictParse(timeFormat, timeString, o);
+    };
+
+    /**
+     * Public utility to format the time
+     * @param {string} format format of the time
+     * @param {Object} time Object not a Date for timezones
+     * @param {Object} [options] essentially the regional[].. amNames, pmNames, ampm
+     * @returns {string} the formatted time
+     */
+    $.datepicker.formatTime = function (format, time, options) {
+        options = options || {};
+        options = $.extend({}, $.timepicker._defaults, options);
+        time = $.extend({
+            hour: 0,
+            minute: 0,
+            second: 0,
+            millisec: 0,
+            microsec: 0,
+            timezone: null
+        }, time);
+
+        var tmptime = format,
+            ampmName = options.amNames[0],
+            hour = parseInt(time.hour, 10);
+
+        if (hour > 11) {
+            ampmName = options.pmNames[0];
+        }
+
+        tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+            switch (match) {
+                case 'HH':
+                    return ('0' + hour).slice(-2);
+                case 'H':
+                    return hour;
+                case 'hh':
+                    return ('0' + convert24to12(hour)).slice(-2);
+                case 'h':
+                    return convert24to12(hour);
+                case 'mm':
+                    return ('0' + time.minute).slice(-2);
+                case 'm':
+                    return time.minute;
+                case 'ss':
+                    return ('0' + time.second).slice(-2);
+                case 's':
+                    return time.second;
+                case 'l':
+                    return ('00' + time.millisec).slice(-3);
+                case 'c':
+                    return ('00' + time.microsec).slice(-3);
+                case 'z':
+                    return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, false);
+                case 'Z':
+                    return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, true);
+                case 'T':
+                    return ampmName.charAt(0).toUpperCase();
+                case 'TT':
+                    return ampmName.toUpperCase();
+                case 't':
+                    return ampmName.charAt(0).toLowerCase();
+                case 'tt':
+                    return ampmName.toLowerCase();
+                default:
+                    return match.replace(/'/g, "");
+            }
+        });
+
+        return tmptime;
+    };
+
+    /*
+     * the bad hack :/ override datepicker so it doesn't close on select
+     // inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+     */
+    $.datepicker._base_selectDate = $.datepicker._selectDate;
+    $.datepicker._selectDate = function (id, dateStr) {
+        var inst = this._getInst($(id)[0]),
+            tp_inst = this._get(inst, 'timepicker');
+
+        if (tp_inst && inst.settings.showTimepicker) {
+            tp_inst._limitMinMaxDateTime(inst, true);
+            inst.inline = inst.stay_open = true;
+            //This way the onSelect handler called from calendarpicker get the full dateTime
+            this._base_selectDate(id, dateStr);
+            inst.inline = inst.stay_open = false;
+            this._notifyChange(inst);
+            this._updateDatepicker(inst);
+        } else {
+            this._base_selectDate(id, dateStr);
+        }
+    };
+
+    /*
+     * second bad hack :/ override datepicker so it triggers an event when changing the input field
+     * and does not redraw the datepicker on every selectDate event
+     */
+    $.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+    $.datepicker._updateDatepicker = function (inst) {
+
+        // don't popup the datepicker if there is another instance already opened
+        var input = inst.input[0];
+        if ($.datepicker._curInst && $.datepicker._curInst !== inst && $.datepicker._datepickerShowing && $.datepicker._lastInput !== input) {
+            return;
+        }
+
+        if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+            this._base_updateDatepicker(inst);
+
+            // Reload the time control when changing something in the input text field.
+            var tp_inst = this._get(inst, 'timepicker');
+            if (tp_inst) {
+                tp_inst._addTimePicker(inst);
+            }
+        }
+    };
+
+    /*
+     * third bad hack :/ override datepicker so it allows spaces and colon in the input field
+     */
+    $.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+    $.datepicker._doKeyPress = function (event) {
+        var inst = $.datepicker._getInst(event.target),
+            tp_inst = $.datepicker._get(inst, 'timepicker');
+
+        if (tp_inst) {
+            if ($.datepicker._get(inst, 'constrainInput')) {
+                var ampm = tp_inst.support.ampm,
+                    tz = tp_inst._defaults.showTimezone !== null ? tp_inst._defaults.showTimezone : tp_inst.support.timezone,
+                    dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+                    datetimeChars = tp_inst._defaults.timeFormat.toString()
+                        .replace(/[hms]/g, '')
+                        .replace(/TT/g, ampm ? 'APM' : '')
+                        .replace(/Tt/g, ampm ? 'AaPpMm' : '')
+                        .replace(/tT/g, ampm ? 'AaPpMm' : '')
+                        .replace(/T/g, ampm ? 'AP' : '')
+                        .replace(/tt/g, ampm ? 'apm' : '')
+                        .replace(/t/g, ampm ? 'ap' : '') +
+                        " " + tp_inst._defaults.separator +
+                        tp_inst._defaults.timeSuffix +
+                        (tz ? tp_inst._defaults.timezoneList.join('') : '') +
+                        (tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) +
+                        dateChars,
+                    chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+                return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+            }
+        }
+
+        return $.datepicker._base_doKeyPress(event);
+    };
+
+    /*
+     * Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
+     * Update any alternate field to synchronise with the main field.
+     */
+    $.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
+    $.datepicker._updateAlternate = function (inst) {
+        var tp_inst = this._get(inst, 'timepicker');
+        if (tp_inst) {
+            var altField = tp_inst._defaults.altField;
+            if (altField) { // update alternate field too
+                var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
+                    date = this._getDate(inst),
+                    formatCfg = $.datepicker._getFormatConfig(inst),
+                    altFormattedDateTime = '',
+                    altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator,
+                    altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
+                    altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
+
+                altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
+                if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
+                    if (tp_inst._defaults.altFormat) {
+                        altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
+                    }
+                    else {
+                        altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
+                    }
+                }
+                $(altField).val(altFormattedDateTime);
+            }
+        }
+        else {
+            $.datepicker._base_updateAlternate(inst);
+        }
+    };
+
+    /*
+     * Override key up event to sync manual input changes.
+     */
+    $.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+    $.datepicker._doKeyUp = function (event) {
+        var inst = $.datepicker._getInst(event.target),
+            tp_inst = $.datepicker._get(inst, 'timepicker');
+
+        if (tp_inst) {
+            if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+                try {
+                    $.datepicker._updateDatepicker(inst);
+                } catch (err) {
+                    $.timepicker.log(err);
+                }
             }
+        }
+
+        return $.datepicker._base_doKeyUp(event);
+    };
+
+    /*
+     * override "Today" button to also grab the time.
+     */
+    $.datepicker._base_gotoToday = $.datepicker._gotoToday;
+    $.datepicker._gotoToday = function (id) {
+        var inst = this._getInst($(id)[0]),
+            $dp = inst.dpDiv;
+        this._base_gotoToday(id);
+        var tp_inst = this._get(inst, 'timepicker');
+        selectLocalTimezone(tp_inst);
+        var now = new Date();
+        this._setTime(inst, now);
+        $('.ui-datepicker-today', $dp).click();
+    };
+
+    /*
+     * Disable & enable the Time in the datetimepicker
+     */
+    $.datepicker._disableTimepickerDatepicker = function (target) {
+        var inst = this._getInst(target);
+        if (!inst) {
+            return;
+        }
+
+        var tp_inst = this._get(inst, 'timepicker');
+        $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+        if (tp_inst) {
+            inst.settings.showTimepicker = false;
+            tp_inst._defaults.showTimepicker = false;
+            tp_inst._updateDateTime(inst);
+        }
+    };
 
-			tp_inst._defaults.minDate = min;
-			tp_inst._defaults.minDateTime = min;
-		} else if (max) { //if max was set
-			if(max===0) {
-				max=new Date();
+    $.datepicker._enableTimepickerDatepicker = function (target) {
+        var inst = this._getInst(target);
+        if (!inst) {
+            return;
+        }
+
+        var tp_inst = this._get(inst, 'timepicker');
+        $(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+        if (tp_inst) {
+            inst.settings.showTimepicker = true;
+            tp_inst._defaults.showTimepicker = true;
+            tp_inst._addTimePicker(inst); // Could be disabled on page load
+            tp_inst._updateDateTime(inst);
+        }
+    };
+
+    /*
+     * Create our own set time function
+     */
+    $.datepicker._setTime = function (inst, date) {
+        var tp_inst = this._get(inst, 'timepicker');
+        if (tp_inst) {
+            var defaults = tp_inst._defaults;
+
+            // calling _setTime with no date sets time to defaults
+            tp_inst.hour = date ? date.getHours() : defaults.hour;
+            tp_inst.minute = date ? date.getMinutes() : defaults.minute;
+            tp_inst.second = date ? date.getSeconds() : defaults.second;
+            tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
+            tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
+
+            //check if within min/max times..
+            tp_inst._limitMinMaxDateTime(inst, true);
+
+            tp_inst._onTimeChange();
+            tp_inst._updateDateTime(inst);
+        }
+    };
+
+    /*
+     * Create new public method to set only time, callable as $().datepicker('setTime', date)
+     */
+    $.datepicker._setTimeDatepicker = function (target, date, withDate) {
+        var inst = this._getInst(target);
+        if (!inst) {
+            return;
+        }
+
+        var tp_inst = this._get(inst, 'timepicker');
+
+        if (tp_inst) {
+            this._setDateFromField(inst);
+            var tp_date;
+            if (date) {
+                if (typeof date === "string") {
+                    tp_inst._parseTime(date, withDate);
+                    tp_date = new Date();
+                    tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+                    tp_date.setMicroseconds(tp_inst.microsec);
+                } else {
+                    tp_date = new Date(date.getTime());
+                    tp_date.setMicroseconds(date.getMicroseconds());
+                }
+                if (tp_date.toString() === 'Invalid Date') {
+                    tp_date = undefined;
+                }
+                this._setTime(inst, tp_date);
+            }
+        }
+
+    };
+
+    /*
+     * override setDate() to allow setting time too within Date object
+     */
+    $.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+    $.datepicker._setDateDatepicker = function (target, date) {
+        var inst = this._getInst(target);
+        if (!inst) {
+            return;
+        }
+
+        if (typeof(date) === 'string') {
+            date = new Date(date);
+            if (!date.getTime()) {
+                $.timepicker.log("Error creating Date object from string.");
+            }
+        }
+
+        var tp_inst = this._get(inst, 'timepicker');
+        var tp_date;
+        if (date instanceof Date) {
+            tp_date = new Date(date.getTime());
+            tp_date.setMicroseconds(date.getMicroseconds());
+        } else {
+            tp_date = date;
+        }
+
+        // This is important if you are using the timezone option, javascript's Date
+        // object will only return the timezone offset for the current locale, so we
+        // adjust it accordingly.  If not using timezone option this won't matter..
+        // If a timezone is different in tp, keep the timezone as is
+        if (tp_inst && tp_date) {
+            // look out for DST if tz wasn't specified
+            if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+                tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
+            }
+            date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+            tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
+        }
+
+        this._updateDatepicker(inst);
+        this._base_setDateDatepicker.apply(this, arguments);
+        this._setTimeDatepicker(target, tp_date, true);
+    };
+
+    /*
+     * override getDate() to allow getting time too within Date object
+     */
+    $.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+    $.datepicker._getDateDatepicker = function (target, noDefault) {
+        var inst = this._getInst(target);
+        if (!inst) {
+            return;
+        }
+
+        var tp_inst = this._get(inst, 'timepicker');
+
+        if (tp_inst) {
+            // if it hasn't yet been defined, grab from field
+            if (inst.lastVal === undefined) {
+                this._setDateFromField(inst, noDefault);
+            }
+
+            var date = this._getDate(inst);
+            if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
+                date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+                date.setMicroseconds(tp_inst.microsec);
+
+                // This is important if you are using the timezone option, javascript's Date
+                // object will only return the timezone offset for the current locale, so we
+                // adjust it accordingly.  If not using timezone option this won't matter..
+                if (tp_inst.timezone != null) {
+                    // look out for DST if tz wasn't specified
+                    if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+                        tp_inst.timezone = date.getTimezoneOffset() * -1;
+                    }
+                    date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+                }
+            }
+            return date;
+        }
+        return this._base_getDateDatepicker(target, noDefault);
+    };
+
+    /*
+     * override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+     * An option in datapicker to ignore extra format characters would be nicer.
+     */
+    $.datepicker._base_parseDate = $.datepicker.parseDate;
+    $.datepicker.parseDate = function (format, value, settings) {
+        var date;
+        try {
+            date = this._base_parseDate(format, value, settings);
+        } catch (err) {
+            // Hack!  The error message ends with a colon, a space, and
+            // the "extra" characters.  We rely on that instead of
+            // attempting to perfectly reproduce the parsing algorithm.
+            if (err.indexOf(":") >= 0) {
+                date = this._base_parseDate(format, value.substring(0, value.length - (err.length - err.indexOf(':') - 2)), settings);
+                $.timepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
             } else {
-				max= new Date(max);
+                throw err;
             }
-			tp_inst._defaults.maxDate = max;
-			tp_inst._defaults.maxDateTime = max;
-		} else if (onselect) {
-			tp_inst._defaults.onSelect = onselect;
         }
-	}
-	if (value === undefined) {
-		return this._base_optionDatepicker(target, name);
-    }
-	return this._base_optionDatepicker(target, name, value);
-};
-
-//#######################################################################################
-// jQuery extend now ignores nulls!
-//#######################################################################################
-function extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props) {
-		if (props[name] === null || props[name] === undefined) {
-			target[name] = props[name];
+        return date;
+    };
+
+    /*
+     * override formatDate to set date with time to the input
+     */
+    $.datepicker._base_formatDate = $.datepicker._formatDate;
+    $.datepicker._formatDate = function (inst, day, month, year) {
+        var tp_inst = this._get(inst, 'timepicker');
+        if (tp_inst) {
+            tp_inst._updateDateTime(inst);
+            return tp_inst.$input.val();
         }
-    }
-	return target;
-}
-
-//#######################################################################################
-// Splits datetime string into date ans time substrings.
-// Throws exception when date can't be parsed
-// If only date is present, time substring eill be '' 
-//#######################################################################################
-var splitDateTime = function(dateFormat, dateTimeString, dateSettings)
-{
-	try {
-		var date = $.datepicker._base_parseDate(dateFormat, dateTimeString, dateSettings);
-	} catch (err) {
-		if (err.indexOf(":") >= 0) {
-			// Hack!  The error message ends with a colon, a space, and
-			// the "extra" characters.  We rely on that instead of
-			// attempting to perfectly reproduce the parsing algorithm.
-            var dateStringLength = dateTimeString.length-(err.length-err.indexOf(':')-2);
-            var timeString = dateTimeString.substring(dateStringLength);
-
-            return [dateTimeString.substring(0, dateStringLength), dateTimeString.substring(dateStringLength)];
-            
-		} else {
-			throw err;
-		}
-	}
-	return [dateTimeString, ''];
-};
-
-//#######################################################################################
-// Internal function to parse datetime interval
-// Returns: {date: Date, timeObj: Object}, where
-//   date - parsed date without time (type Date)
-//   timeObj = {hour: , minute: , second: , millisec: } - parsed time. Optional
-//#######################################################################################
-var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings)
-{
-    var date;
-    var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings);
-	date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
-    if (splitRes[1] !== '')
-    {
-        var timeString = splitRes[1];
-        var separator = timeSettings && timeSettings.separator ? timeSettings.separator : $.timepicker._defaults.separator;            
-        if ( timeString.indexOf(separator) !== 0) {
-            throw 'Missing time separator';
+        return this._base_formatDate(inst);
+    };
+
+    /*
+     * override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+     */
+    $.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+    $.datepicker._optionDatepicker = function (target, name, value) {
+        var inst = this._getInst(target),
+            name_clone;
+        if (!inst) {
+            return null;
+        }
+
+        var tp_inst = this._get(inst, 'timepicker');
+        if (tp_inst) {
+            var min = null,
+                max = null,
+                onselect = null,
+                overrides = tp_inst._defaults.evnts,
+                fns = {},
+                prop;
+            if (typeof name === 'string') { // if min/max was set with the string
+                if (name === 'minDate' || name === 'minDateTime') {
+                    min = value;
+                } else if (name === 'maxDate' || name === 'maxDateTime') {
+                    max = value;
+                } else if (name === 'onSelect') {
+                    onselect = value;
+                } else if (overrides.hasOwnProperty(name)) {
+                    if (typeof (value) === 'undefined') {
+                        return overrides[name];
+                    }
+                    fns[name] = value;
+                    name_clone = {}; //empty results in exiting function after overrides updated
+                }
+            } else if (typeof name === 'object') { //if min/max was set with the JSON
+                if (name.minDate) {
+                    min = name.minDate;
+                } else if (name.minDateTime) {
+                    min = name.minDateTime;
+                } else if (name.maxDate) {
+                    max = name.maxDate;
+                } else if (name.maxDateTime) {
+                    max = name.maxDateTime;
+                }
+                for (prop in overrides) {
+                    if (overrides.hasOwnProperty(prop) && name[prop]) {
+                        fns[prop] = name[prop];
+                    }
+                }
+            }
+            for (prop in fns) {
+                if (fns.hasOwnProperty(prop)) {
+                    overrides[prop] = fns[prop];
+                    if (!name_clone) { name_clone = $.extend({}, name); }
+                    delete name_clone[prop];
+                }
+            }
+            if (name_clone && isEmptyObject(name_clone)) { return; }
+            if (min) { //if min was set
+                if (min === 0) {
+                    min = new Date();
+                } else {
+                    min = new Date(min);
+                }
+                tp_inst._defaults.minDate = min;
+                tp_inst._defaults.minDateTime = min;
+            } else if (max) { //if max was set
+                if (max === 0) {
+                    max = new Date();
+                } else {
+                    max = new Date(max);
+                }
+                tp_inst._defaults.maxDate = max;
+                tp_inst._defaults.maxDateTime = max;
+            } else if (onselect) {
+                tp_inst._defaults.onSelect = onselect;
+            }
+        }
+        if (value === undefined) {
+            return this._base_optionDatepicker.call($.datepicker, target, name);
+        }
+        return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+    };
+
+    /*
+     * jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
+     * it will return false for all objects
+     */
+    var isEmptyObject = function (obj) {
+        var prop;
+        for (prop in obj) {
+            if (obj.hasOwnProperty(prop)) {
+                return false;
+            }
         }
-        timeString = timeString.substring(separator.length);
-        var parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
-        if (parsedTime === null) {
+        return true;
+    };
+
+    /*
+     * jQuery extend now ignores nulls!
+     */
+    var extendRemove = function (target, props) {
+        $.extend(target, props);
+        for (var name in props) {
+            if (props[name] === null || props[name] === undefined) {
+                target[name] = props[name];
+            }
+        }
+        return target;
+    };
+
+    /*
+     * Determine by the time format which units are supported
+     * Returns an object of booleans for each unit
+     */
+    var detectSupport = function (timeFormat) {
+        var tf = timeFormat.replace(/'.*?'/g, '').toLowerCase(), // removes literals
+            isIn = function (f, t) { // does the format contain the token?
+                return f.indexOf(t) !== -1 ? true : false;
+            };
+        return {
+            hour: isIn(tf, 'h'),
+            minute: isIn(tf, 'm'),
+            second: isIn(tf, 's'),
+            millisec: isIn(tf, 'l'),
+            microsec: isIn(tf, 'c'),
+            timezone: isIn(tf, 'z'),
+            ampm: isIn(tf, 't') && isIn(timeFormat, 'h'),
+            iso8601: isIn(timeFormat, 'Z')
+        };
+    };
+
+    /*
+     * Converts 24 hour format into 12 hour
+     * Returns 12 hour without leading 0
+     */
+    var convert24to12 = function (hour) {
+        hour %= 12;
+
+        if (hour === 0) {
+            hour = 12;
+        }
+
+        return String(hour);
+    };
+
+    var computeEffectiveSetting = function (settings, property) {
+        return settings && settings[property] ? settings[property] : $.timepicker._defaults[property];
+    };
+
+    /*
+     * Splits datetime string into date and time substrings.
+     * Throws exception when date can't be parsed
+     * Returns {dateString: dateString, timeString: timeString}
+     */
+    var splitDateTime = function (dateTimeString, timeSettings) {
+        // The idea is to get the number separator occurrences in datetime and the time format requested (since time has
+        // fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
+        var separator = computeEffectiveSetting(timeSettings, 'separator'),
+            format = computeEffectiveSetting(timeSettings, 'timeFormat'),
+            timeParts = format.split(separator), // how many occurrences of separator may be in our format?
+            timePartsLen = timeParts.length,
+            allParts = dateTimeString.split(separator),
+            allPartsLen = allParts.length;
+
+        if (allPartsLen > 1) {
+            return {
+                dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
+                timeString: allParts.splice(0, timePartsLen).join(separator)
+            };
+        }
+
+        return {
+            dateString: dateTimeString,
+            timeString: ''
+        };
+    };
+
+    /*
+     * Internal function to parse datetime interval
+     * Returns: {date: Date, timeObj: Object}, where
+     *   date - parsed date without time (type Date)
+     *   timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
+     */
+    var parseDateTimeInternal = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+        var date,
+            parts,
+            parsedTime;
+
+        parts = splitDateTime(dateTimeString, timeSettings);
+        date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
+
+        if (parts.timeString === '') {
+            return {
+                date: date
+            };
+        }
+
+        parsedTime = $.datepicker.parseTime(timeFormat, parts.timeString, timeSettings);
+
+        if (!parsedTime) {
             throw 'Wrong time format';
         }
-        return {date: date, timeObj: parsedTime};
-    } else {
-        return {date: date};
-    }
-};
-
-//#######################################################################################
-// Internal function to set timezone_select to the local timezone
-//#######################################################################################
-var selectLocalTimeZone = function(tp_inst, date)
-{
-	if (tp_inst && tp_inst.timezone_select) {
-		tp_inst._defaults.useLocalTimezone = true;
-		var now = typeof date !== 'undefined' ? date : new Date();
-		var tzoffset = timeZoneString(now);
-		if (tp_inst._defaults.timezoneIso8601) {
-			tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+
+        return {
+            date: date,
+            timeObj: parsedTime
+        };
+    };
+
+    /*
+     * Internal function to set timezone_select to the local timezone
+     */
+    var selectLocalTimezone = function (tp_inst, date) {
+        if (tp_inst && tp_inst.timezone_select) {
+            var now = date || new Date();
+            tp_inst.timezone_select.val(-now.getTimezoneOffset());
         }
-		tp_inst.timezone_select.val(tzoffset);
-	}
-};
-
-// Input: Date Object
-// Output: String with timezone offset, e.g. '+0100'
-var timeZoneString = function(date)
-{
-	var off = date.getTimezoneOffset() * -10100 / 60;
-	var timezone = (off >= 0 ? '+' : '-') + Math.abs(off).toString().substr(1);
-	return timezone;
-};
-
-$.timepicker = new Timepicker(); // singleton instance
-$.timepicker.version = "1.0.1";
+    };
+
+    /*
+     * Create a Singleton Instance
+     */
+    $.timepicker = new Timepicker();
+
+    /**
+     * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
+     * @param {number} tzMinutes if not a number, less than -720 (-1200), or greater than 840 (+1400) this value is returned
+     * @param {boolean} iso8601 if true formats in accordance to iso8601 "+12:45"
+     * @return {string}
+     */
+    $.timepicker.timezoneOffsetString = function (tzMinutes, iso8601) {
+        if (isNaN(tzMinutes) || tzMinutes > 840 || tzMinutes < -720) {
+            return tzMinutes;
+        }
+
+        var off = tzMinutes,
+            minutes = off % 60,
+            hours = (off - minutes) / 60,
+            iso = iso8601 ? ':' : '',
+            tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
+
+        if (tz === '+00:00') {
+            return 'Z';
+        }
+        return tz;
+    };
+
+    /**
+     * Get the number in minutes that represents a timezone string
+     * @param  {string} tzString formatted like "+0500", "-1245", "Z"
+     * @return {number} the offset minutes or the original string if it doesn't match expectations
+     */
+    $.timepicker.timezoneOffsetNumber = function (tzString) {
+        var normalized = tzString.toString().replace(':', ''); // excuse any iso8601, end up with "+1245"
+
+        if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
+            return 0;
+        }
+
+        if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
+            return tzString;
+        }
+
+        return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
+            ((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
+                parseInt(normalized.substr(3, 2), 10))); // minutes
+    };
+
+    /**
+     * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
+     * @param  {Date} date
+     * @param  {string} toTimezone formatted like "+0500", "-1245"
+     * @return {Date}
+     */
+    $.timepicker.timezoneAdjust = function (date, toTimezone) {
+        var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
+        if (!isNaN(toTz)) {
+            date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz);
+        }
+        return date;
+    };
+
+    /**
+     * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
+     * enforce date range limits.
+     * n.b. The input value must be correctly formatted (reformatting is not supported)
+     * @param  {Element} startTime
+     * @param  {Element} endTime
+     * @param  {Object} options Options for the timepicker() call
+     * @return {jQuery}
+     */
+    $.timepicker.timeRange = function (startTime, endTime, options) {
+        return $.timepicker.handleRange('timepicker', startTime, endTime, options);
+    };
+
+    /**
+     * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
+     * enforce date range limits.
+     * @param  {Element} startTime
+     * @param  {Element} endTime
+     * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+     *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+     * @param  {string} method Can be used to specify the type of picker to be added
+     * @return {jQuery}
+     */
+    $.timepicker.datetimeRange = function (startTime, endTime, options) {
+        $.timepicker.handleRange('datetimepicker', startTime, endTime, options);
+    };
+
+    /**
+     * Calls `datepicker` on the `startTime` and `endTime` elements, and configures them to
+     * enforce date range limits.
+     * @param  {Element} startTime
+     * @param  {Element} endTime
+     * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+     *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+     * @return {jQuery}
+     */
+    $.timepicker.dateRange = function (startTime, endTime, options) {
+        $.timepicker.handleRange('datepicker', startTime, endTime, options);
+    };
+
+    /**
+     * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+     * enforce date range limits.
+     * @param  {string} method Can be used to specify the type of picker to be added
+     * @param  {Element} startTime
+     * @param  {Element} endTime
+     * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+     *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+     * @return {jQuery}
+     */
+    $.timepicker.handleRange = function (method, startTime, endTime, options) {
+        options = $.extend({}, {
+            minInterval: 0, // min allowed interval in milliseconds
+            maxInterval: 0, // max allowed interval in milliseconds
+            start: {},      // options for start picker
+            end: {}         // options for end picker
+        }, options);
+
+        // for the mean time this fixes an issue with calling getDate with timepicker()
+        var timeOnly = false;
+        if(method === 'timepicker'){
+            timeOnly = true;
+            method = 'datetimepicker';
+        }
+
+        function checkDates(changed, other) {
+            var startdt = startTime[method]('getDate'),
+                enddt = endTime[method]('getDate'),
+                changeddt = changed[method]('getDate');
+
+            if (startdt !== null) {
+                var minDate = new Date(startdt.getTime()),
+                    maxDate = new Date(startdt.getTime());
+
+                minDate.setMilliseconds(minDate.getMilliseconds() + options.minInterval);
+                maxDate.setMilliseconds(maxDate.getMilliseconds() + options.maxInterval);
+
+                if (options.minInterval > 0 && minDate > enddt) { // minInterval check
+                    endTime[method]('setDate', minDate);
+                }
+                else if (options.maxInterval > 0 && maxDate < enddt) { // max interval check
+                    endTime[method]('setDate', maxDate);
+                }
+                else if (startdt > enddt) {
+                    other[method]('setDate', changeddt);
+                }
+            }
+        }
+
+        function selected(changed, other, option) {
+            if (!changed.val()) {
+                return;
+            }
+            var date = changed[method].call(changed, 'getDate');
+            if (date !== null && options.minInterval > 0) {
+                if (option === 'minDate') {
+                    date.setMilliseconds(date.getMilliseconds() + options.minInterval);
+                }
+                if (option === 'maxDate') {
+                    date.setMilliseconds(date.getMilliseconds() - options.minInterval);
+                }
+            }
+            if (date.getTime) {
+                other[method].call(other, 'option', option, date);
+            }
+        }
+
+        $.fn[method].call(startTime, $.extend({
+            timeOnly: timeOnly,
+            onClose: function (dateText, inst) {
+                checkDates($(this), endTime);
+            },
+            onSelect: function (selectedDateTime) {
+                selected($(this), endTime, 'minDate');
+            }
+        }, options, options.start));
+        $.fn[method].call(endTime, $.extend({
+            timeOnly: timeOnly,
+            onClose: function (dateText, inst) {
+                checkDates($(this), startTime);
+            },
+            onSelect: function (selectedDateTime) {
+                selected($(this), startTime, 'maxDate');
+            }
+        }, options, options.end));
+
+        checkDates(startTime, endTime);
+        selected(startTime, endTime, 'minDate');
+        selected(endTime, startTime, 'maxDate');
+        return $([startTime.get(0), endTime.get(0)]);
+    };
+
+    /**
+     * Log error or data to the console during error or debugging
+     * @param  {Object} err pass any type object to log to the console during error or debugging
+     * @return {void}
+     */
+    $.timepicker.log = function (err) {
+        if (window.console) {
+            window.console.log(err);
+        }
+    };
+
+    /*
+     * Add util object to allow access to private methods for testability.
+     */
+    $.timepicker._util = {
+        _extendRemove: extendRemove,
+        _isEmptyObject: isEmptyObject,
+        _convert24to12: convert24to12,
+        _detectSupport: detectSupport,
+        _selectLocalTimezone: selectLocalTimezone,
+        _computeEffectiveSetting: computeEffectiveSetting,
+        _splitDateTime: splitDateTime,
+        _parseDateTimeInternal: parseDateTimeInternal
+    };
+
+    /*
+     * Microsecond support
+     */
+    if (!Date.prototype.getMicroseconds) {
+        Date.prototype.microseconds = 0;
+        Date.prototype.getMicroseconds = function () { return this.microseconds; };
+        Date.prototype.setMicroseconds = function (m) {
+            this.setMilliseconds(this.getMilliseconds() + Math.floor(m / 1000));
+            this.microseconds = m % 1000;
+            return this;
+        };
+    }
+
+    /*
+     * Keep up with the version
+     */
+    $.timepicker.version = "1.4.4";
 
 })(jQuery);

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików