venus 0.7.11 → 0.8.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dde72a4b2fc22998b65ad817f9f31ae2f43043eb
+  data.tar.gz: 805bf4481c2dc8482c513eb519716a9c482ece41
+SHA512:
+  metadata.gz: 639643e9a6c1ffdaad86301dc1e22daa694cf25c0b8f59460b91a25404cca942534fa5c18e754579ab72eab8202b1a16981bb5b0e9207691fcd6f55d7829388b
+  data.tar.gz: 680bd55bdb50edb49fbc82d2b454a8b57bde97d42b43be7f10047bf8cb9a366e9e1c3d79afb0a19742d1a859f0e40998e54763e79cabbddcd38743c36c36c8e2

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+## 0.8.6
+
+Features:
+  
+  - Add unicorn generator, `rails generate venus:unicorn`.
+  - Ask generate venus:puma after generate venus:deploy.
+  - Add puma server generator, `rails generate venus:puma`.
+  - Newrelic 3.6.5 generator.
+  - Sentry generator for cloud exceptions storage.
+  - Hipchat generator for deploy notification.
+  - better_errors generator for rendering errors clearly.
+  - Bind better_errors generator into init generator.
+  - rails_panel generator for debugging request in Chrome.
+  - Bind rails_panel generator into init generator.
+
+Updates:
+
+  - Always upload files config hint in config/asset_sync.rb
+  - Replace rmagick to mini_magick in carrierwave generator.
+  - Upgrade sidekiq to 2.12.4 .
+  - Remove HAML in init generator.
+  - Upgrade timepicker to 1.3 .
+  - Upgrade chosen-rails to 0.9.15 .
+  - Upgrade jqueryui-rails to 4.0.3 .
+
+Fixes:
+
+  - Simple form config for bootstrap.

data/README.md

@@ -10,7 +10,7 @@ Installation
 ```ruby
 group :development do
   ...
-  gem 'venus', '~> 0.7.11'
+  gem 'venus', '~> 0.8.6'
   ...
 end
 ```
@@ -30,6 +30,48 @@ end
 Usage
 =====
 
+* rails_panel generator for debugging request in Chrome.
+
+  ```
+  rails generate venus:rails_panel
+  ```
+  
+* better_errors generator for rendering errors clearly.
+
+  ```
+  rails generate venus:better_errors
+  ```
+  
+* Hipchat generator for notification while deploy.
+
+  ```
+  rails generate venus:hipchat
+  ```
+  
+* getsentry.com installation for cloud exceptions storage.
+
+  ```
+  rails generate venus:sentry
+  ```
+  
+* `newrelic_rpm` gem.
+
+  ```
+  rails generate venus:newrelic
+  ```
+  
+* `puma` server
+
+  ```
+  rails generate venus:puma
+  ```
+
+* `unicorn` for zero downtime deployment
+
+  ```
+  rails generate venus:unicorn
+  ```
+
 * `asset_sync` for upload assets files to AWS S3 after precompile
 
   ```
@@ -142,7 +184,6 @@ Usage
 TODO
 ====
 
-* Unicorn setup for capistrano.
 * MongoDB configuration.
 * RailsAdmin or ActiveAdmin.
 * Amazon Elastic Cache & cells.

data/lib/generators/venus/asset_sync/asset_sync_generator.rb

@@ -16,10 +16,11 @@ module Venus
         @settings[:aws_assets_bucket] = ask?("AWS S3 bucket for assets sync", app_name) unless key_in_settingslogic?("aws_assets_bucket")
         @settings[:aws_assets_host] = ask?("AWS S3 host for assets sync", "#{app_name}.s3-website-us-east-1.amazonaws.com") unless key_in_settingslogic?("aws_assets_host")
         @settings[:aws_assets_path_prefix] = ask?("AWS S3 assets path prefix", "") unless key_in_settingslogic?("aws_assets_path_prefix")
+        # @has_ckeditor_rails = ask?("has ckeditor-rails?", false)
       end
 
       def set_gemfile
-        append_gem_into_group(:assets, "asset_sync", "~> 0.5.4")
+        add_gem("asset_sync", "~> 0.5.4")
         bundle_install
       end
 
@@ -32,7 +33,9 @@ module Venus
 
       def production_rb
         to_file = "config/environments/production.rb"
-        line = "  config.action_controller.asset_host = #{@settinglogic_class}.aws_assets_host"
+        # if(@has_ckeditor_rails) 
+        line =  "#  config.relative_url_root = \"http://\#{#{@settinglogic_class}.aws_assets_host}\"\n"
+        line += "  config.action_controller.asset_host = #{@settinglogic_class}.aws_assets_host"
         unless file_has_content?(to_file, line)
           comment_lines(to_file, /config\.action_controller\.asset_host/)
           insert_line_into_file(to_file, line, :before => /\nend[\n]*$/)

data/lib/generators/venus/asset_sync/templates/asset_sync.rb.erb

@@ -8,7 +8,11 @@ AssetSync.configure do |config|
   config.fog_region = <%= @settinglogic_class %>.aws_assets_region
   #
   # Don't delete files from the store
-  config.existing_remote_files = "delete"
+  # config.existing_remote_files: "keep" # Existing pre-compiled assets on S3 will be kept
+  # To delete existing remote files.
+  # config.existing_remote_files: "delete"
+  # To ignore existing remote files and overwrite.
+  # config.existing_remote_files: "ignore"
   #
   # Automatically replace files with their equivalent gzip compressed version
   # config.gzip_compression = true
@@ -19,4 +23,7 @@ AssetSync.configure do |config|
   #
   # Fail silently.  Useful for environments such as Heroku
   # config.fail_silently = true
+  #
+  # For always upload files
+  # config.always_upload = ["application.css", "application.js"]
 end

data/lib/generators/venus/better_errors/better_errors_generator.rb

@@ -0,0 +1,27 @@
+module Venus
+  module Generators
+    class BetterErrorsGenerator < Base
+      desc "Setup better errors"
+
+      def name
+        "better_error"
+      end
+
+      def asks
+        # @sublime = ask?("Use Sublime Text")
+      end
+
+      def gemfile
+        append_gem_into_group("development", "better_errors")
+        # append_gem_into_group("development", "binding_of_caller") if @sublime
+        bundle_install
+      end
+
+      def sublime
+        # template("better_errors.erb", "config/initializers/better_errors.rb") if @sublime
+        # say "Download sublime-handler (https://github.com/asuth/subl-handler) to open subl:// protocol" if @sublime
+      end
+
+    end
+  end
+end

data/lib/generators/venus/better_errors/templates/better_errors.erb

@@ -0,0 +1 @@
+BetterErrors.editor = :sublime if defined? BetterErrors

data/lib/generators/venus/bootstrap/templates/simple_form_config.erb

@@ -1,6 +1,8 @@
 
+  config.label_class = "control-label"
+  config.form_class = "form-horizontal"
+
   config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
-    config.form_class = "form-horizontal"
     b.use :placeholder
     b.use :label, :wrap_with => { :class => 'control-label' }
     b.wrapper :tag => 'div', :class => 'controls' do |ba|
@@ -12,7 +14,6 @@
 
 <% if @unicorn %>
   config.wrappers :admin, :tag => :div, :class => 'control-group' do |b|
-    config.form_class = "form-horizontal"
     b.use :placeholder
     b.use :label, :wrap_with => { :class => 'control-label', :tag => false }
     b.wrapper :tag => :div, :class => 'controls' do |ba|

data/lib/generators/venus/carrierwave/carrierwave_generator.rb

@@ -30,7 +30,7 @@ module Venus
         else
           add_gem("carrierwave", "0.7.1")
         end
-        add_gem('rmagick') if @imagemagick
+        add_gem('mini_magick', "~> 3.6.0") if @imagemagick
         add_gem("carrierwave-meta", '~> 0.0.4') if @carrierwave_meta
         add_gem('fog') if @fog
         bundle_install

data/lib/generators/venus/carrierwave/templates/uploader.erb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class <%=@sample_uploader.to_s.camelize%>Uploader < CarrierWave::Uploader::Base
 <%- if @imagemagick %>
-  include CarrierWave::RMagick<% end %>
+  include CarrierWave::MiniMagick<% end %>
 <%- if @carrierwave_meta %>
   include CarrierWave::Meta<% end %>
 

data/lib/generators/venus/chosen/chosen_generator.rb

@@ -13,7 +13,7 @@ module Venus
       end
 
       def gem
-        add_gem('chosen-rails', '~> 0.9.11.2')
+        add_gem('chosen-rails', '~> 0.9.15')
         bundle_install
       end
 

data/lib/generators/venus/deploy/deploy_generator.rb

@@ -11,6 +11,7 @@ module Venus
         @use_rvm = ask?('use rvm?', true)
         @use_assets_pipline = ask?('use assets pipline?', true)
         @use_passenger = ask?('use passenger?', true)
+        @use_puma = ask?('use puma server?', true) unless @use_passenger
         @git_uri = ask?('your git repository url?', 'git@github.com:foo/myapp.git')
         @stage = ask_stage_infomation
         if ask?('has staging server?', true)
@@ -53,6 +54,12 @@ module Venus
         end
       end
 
+      def puma
+        if @use_puma
+          generate "venus:puma"
+        end
+      end
+
       private
 
       def ask_stage_infomation(prefix = 'production')

data/lib/generators/venus/helpers.rb

@@ -191,7 +191,7 @@ module Venus
           value = '' if opts[:secret] && is_example
           inserted_value = (value.index("\n") ? value : "\"#{value}\"")
           line = "  #{key}: #{inserted_value}"
-          if file_has_content?(to_file, "defaults: &defaults\n")
+          if file_has_content?(to_file, "defaults: &defaults")
             insert_line_into_file(to_file, line, :after => "defaults: &defaults")
           else
             insert_line_into_file(to_file, line, :after => "development:")

data/lib/generators/venus/hipchat/hipchat_generator.rb

@@ -0,0 +1,35 @@
+module Venus
+  module Generators
+    class HipchatGenerator < Base
+      desc "Setup hipchat"
+
+      def name
+        "hipchat"
+      end
+
+      def asks
+        @is_repository_private = ask?("Is project private", false)
+        settingslogic_dependent unless @is_repository_private
+        @token = ask?("HipChat API token", "")
+        @room = ask?("HipChat room for deploy notification", "")
+      end
+
+      def settings
+        unless @is_repository_private
+          insert_settingslogics("hipchat_token", @token, :secret => true) unless key_in_settingslogic?("hipchat_token")
+          insert_settingslogics("hipchat_room", @room) unless key_in_settingslogic?("hipchat_room")
+        end
+      end
+
+      def gemfile
+        add_gem("hipchat", "~> 0.10.0")
+        bundle_install
+      end
+
+      def configs
+        concat_template("config/deploy.rb", "deploy.rb.erb")
+      end
+
+    end
+  end
+end

data/lib/generators/venus/hipchat/templates/deploy.rb.erb

@@ -0,0 +1,23 @@
+
+<% if @is_repository_private %>
+require 'hipchat/capistrano'
+set :hipchat_token, "<%= @token %>"
+set :hipchat_room_name, "<%= @room %>"
+set :hipchat_announce, true
+set :hipchat_color, 'purple'
+set :hipchat_success_color, 'green'
+set :hipchat_failed_color, 'red'
+set :hipchat_message_format, 'text'
+<% else %>
+settings = YAML.load_file(File.dirname(__FILE__) + "/<%= @settinglogic_yml %>")[rails_env]
+if settings["hipchat_token"].to_s.length > 0
+  require 'hipchat/capistrano'
+  set :hipchat_token, settings["hipchat_token"]
+  set :hipchat_room_name, settings["hipchat_room"]
+  set :hipchat_announce, true
+  set :hipchat_color, 'purple'
+  set :hipchat_success_color, 'green'
+  set :hipchat_failed_color, 'red'
+  set :hipchat_message_format, 'text'
+end
+<% end %>

data/lib/generators/venus/init/init_generator.rb

@@ -8,21 +8,11 @@ module Venus
       end
 
       def asks
-        @gems = {}
         @paginate = ask?('install paginate gem "kaminari"?', true) unless has_gem?('kaminari')
-        generate 'venus:paginate' if @paginate
-
         @whenever = ask?('install scheduling gem "whenever"?', true) unless has_gem?('whenever')
-        generate 'venus:cron' if @whenever
-
-        [:haml].each do |gemname|
-          @gems[gemname] = ask?("install gem '#{gemname}'?", true)
-        end
-
         @simple_form = ask?('install gem "simple_form"?', true) unless has_gem?('simple_form')
-        if @simple_form
-          generate "venus:simple_form"
-        end
+        @better_errors = ask?("install gem 'better_errors'", true)
+        @rails_panel = ask?("install gem 'rails_panel'", true)
 
         @remove_gems = []
         ["coffee-rails", "sass-rails"].each do |gem_name|
@@ -67,19 +57,6 @@ module Venus
         end
       end
 
-      def gems
-        @is_append = !file_has_content?('Gemfile','group :development do')
-        if @is_append
-          concat_template('Gemfile', 'gem_developments.erb')
-        else
-          insert_template('Gemfile', 'gem_developments.erb', :after => 'group :development do')
-        end
-        @gems.each do |gemname, ans|
-          add_gem(gemname.to_s) if ans
-        end
-        bundle_install
-      end
-
       def gitignore
         add_gitignore ".DS_Store"
         add_gitignore "/public/assets"
@@ -92,6 +69,14 @@ module Venus
         end
       end
 
+      def asked_gems
+        generate 'venus:paginate' if @paginate
+        generate 'venus:cron' if @whenever
+        generate "venus:simple_form" if @simple_form
+        generate "venus:better_errors" if @better_errors
+        generate "venus:rails_panel" if @rails_panel
+      end
+
     end
   end
 end

data/lib/generators/venus/jqueryui/jqueryui_generator.rb

@@ -12,14 +12,14 @@ module Venus
         @target_css = ask?('target content append for css file?', 'application.css')
         @datepicker = ask?('setup for datepicker?', true)
         if @datepicker
-          puts "datepicker lang list: https://github.com/joliss/jquery-ui-rails/tree/master/vendor/assets/javascripts"
+          puts "datepicker lang list: https://github.com/joliss/jquery-ui-rails/blob/master/app/assets/javascripts"
           @datepicker_lang = ask?('datepicker language?', '')
           @datetimepicler = ask?('setup timepicker ?', true)
         end
       end
 
       def gem
-        add_gem('jquery-ui-rails', '~> 4.0.1')
+        add_gem('jquery-ui-rails', '~> 4.0.3')
         bundle_install
       end
 

data/lib/generators/venus/jqueryui/templates/jquery.timepicker.css

@@ -3,4 +3,8 @@
 .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; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; }
+.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }

data/lib/generators/venus/jqueryui/templates/jquery.timepicker.js

@@ -1,1326 +1,2103 @@
 /*
-* jQuery timepicker addon
-* By: Trent Richardson [http://trentrichardson.com]
-* Version 1.0.0
-* Last Modified: 02/05/2012
-*
-* Copyright 2012 Trent Richardson
-* Dual licensed under the MIT and 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; }
-*/
+ * jQuery timepicker addon
+ * By: Trent Richardson [http://trentrichardson.com]
+ * Version 1.3
+ * Last Modified: 05/05/2013
+ *
+ * Copyright 2013 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
+ */
+
+/*jslint evil: true, white: false, undef: false, nomen: 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.0" } });
-
-/* 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'
+  /*
+  * Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+  */
+  $.ui.timepicker = $.ui.timepicker || {};
+  if ($.ui.timepicker.version) {
+    return;
+  }
+
+  /*
+  * Extend jQueryUI, get it started with our version number
+  */
+  $.extend($.ui, {
+    timepicker: {
+      version: "1.3"
+    }
+  });
+
+  /* 
+  * 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,
+      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,
+      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['']);
   };
-  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,
+
+  $.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,
     hour: 0,
     minute: 0,
     second: 0,
     millisec: 0,
-    timezone: '+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,
-    timezoneIso8609: false,
+    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,
-    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: '+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;
+    units: ['hour','minute','second','millisec', 'microsec'],
+    support: {},
+    control: 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 = {},
+              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;
+            }
+          }
         }
       }
-    }
-    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.timezoneIso8609)
-        timezoneList = $.map(timezoneList, function(val) {
-          return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
-        });
-      tp_inst._defaults.timezoneList = timezoneList;
-    }
 
-    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"); });
-
-    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();
-    }
+        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] = o[i] || null;
+            }
+        }
 
-    // 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());
-    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) {
-    var regstr = this._defaults.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, this._getPatternAmpm())
-        .replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
-        .replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$',
-      order = this._getFormatPositions(),
-      ampm = '',
-      treg;
-
-    if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
-
-    if (withDate || !this._defaults.timeOnly) {
-      // the time should come after x number of characters and a space.
-      // x = at least the length of text specified by the date format
-      var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
-      // escape special regex characters in the seperator
-      var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
-      regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;
-    }
+        tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, 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();
+      });
 
-    treg = timeString.match(new RegExp(regstr, 'i'));
+      // 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:''));
 
-    if (treg) {
-      if (order.t !== -1) {
-        if (treg[order.t] === undefined || treg[order.t].length === 0) {
-          ampm = '';
-          this.ampm = '';
-        } else {
-          ampm = $.inArray(treg[order.t].toUpperCase(), this.amNames) !== -1 ? 'AM' : 'PM';
-          this.ampm = this._defaults[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+      // controlType is string - key to our this._controls
+      if(typeof(tp_inst._defaults.controlType) === 'string'){
+        if(tp_inst._defaults.controlType == 'slider' && typeof(jQuery.ui.slider) === 'undefined'){
+          tp_inst._defaults.controlType = 'select';
         }
+        tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
       }
-
-      if (order.h !== -1) {
-        if (ampm == 'AM' && treg[order.h] == '12')
-          this.hour = 0; // 12am = 0 hour
-        else if (ampm == 'PM' && treg[order.h] != '12')
-          this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12
-        else this.hour = Number(treg[order.h]);
+      // controlType is an object and must implement create, options, value methods
+      else{ 
+        tp_inst.control = tp_inst._defaults.controlType;
       }
 
-      if (order.m !== -1) this.minute = Number(treg[order.m]);
-      if (order.s !== -1) this.second = Number(treg[order.s]);
-      if (order.l !== -1) this.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 = this._defaults.timezoneIso8609 ? 'Z' : '+0000';
-          break;
-        case 5: // +hhmm
-          if (this._defaults.timezoneIso8609)
-            tz = tz.substring(1) == '0000'
-               ? 'Z'
-               : tz.substring(0, 3) + ':' + tz.substring(3);
-          break;
-        case 6: // +hh:mm
-          if (!this._defaults.timezoneIso8609)
-            tz = tz == 'Z' || tz.substring(1) == '00:00'
-               ? '+0000'
-               : tz.replace(/:/, '');
-          else if (tz.substring(1) == '00:00')
-            tz = 'Z';
-          break;
+      // 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) };
         }
-        this.timezone = tz;
+      }
+      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 (o.altField) {
+        tp_inst.$altInput = $(o.altField).css({
+          cursor: 'pointer'
+        }).focus(function() {
+          $input.trigger("focus");
+        });
       }
 
-      return true;
+      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();
+      }
 
-    }
-    return false;
-  },
-
-  //########################################################################
-  // pattern for standard and localized AM/PM markers
-  //########################################################################
-  _getPatternAmpm: function() {
-    var markers = [],
-      o = this._defaults;
-    if (o.amNames)
-      $.merge(markers, o.amNames);
-    if (o.pmNames)
-      $.merge(markers, o.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
-  //########################################################################
-  _getFormatPositions: function() {
-    var finds = this._defaults.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;
-
-    return orders;
-  },
-
-  //########################################################################
-  // 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';
+      // 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;
           }
-          html += '<td>' + tmph + '</td>';
+          $.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;
         }
-
-        html += '</tr></table></div>';
+        return true;
+      } else {
+        var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+        if (!timeObj) {
+          return false;
+        }
+        $.extend(this, timeObj);
+        return true;
       }
-      html += '</dd>';
+    },
+
+    /*
+    * 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>';
+              }
+            }
+            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>';
+              }
+            }
 
-      // 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>';
+            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>';
 
-      if (o.showMinute && o.minuteGrid > 0) {
-        html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+        // Create the elements from string
+        html += '</dl></div>';
+        var $tp = $(html);
 
-        for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
-          minuteGridSize++;
-          html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
+        // 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
 
-        html += '</tr></table></div>';
-      }
-      html += '</dd>';
+        // 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);
+        }
 
-      // 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>';
+        this.$timeObj = $tp.find('.ui_tpicker_time');
 
-      if (o.showSecond && o.secondGrid > 0) {
-        html += '<div style="padding-left: 1px"><table><tr>';
+        if (this.inst !== null) {
+          var timeDefined = this.timeDefined;
+          this._onTimeChange();
+          this.timeDefined = timeDefined;
+        }
 
-        for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
-          secondGridSize++;
-          html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
+        // 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
 
-        html += '</tr></table></div>';
       }
-      html += '</dd>';
+    },
+
+    /*
+    * 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;
+        }
 
-      // 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 (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;
+          }
+        } 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 (o.showMillisec && o.millisecGrid > 0) {
-        html += '<div style="padding-left: 1px"><table><tr>';
+      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);
 
-        for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
-          millisecGridSize++;
-          html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
+        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;
         }
 
-        html += '</tr></table></div>';
+        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;
+          }
+        } 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;
+        }
       }
-      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>';
+      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);
 
-      html += '</dl></div>';
-      $tp = $(html);
+        if (this.hour_slider) {
+          this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax });
+          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 });
+          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 });
+          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 });
+          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 });
+          this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
+        }
+      }
 
-        // 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();
+    },
+
+    /*
+    * 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.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;
       }
 
-      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();
-        }
-      });
+      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);
+      }
 
+      var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
 
-      // 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();
+      // 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 || microsec != this.microsec 
+                || (this.ampm.length > 0 && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) 
+                || (this.timezone !== null && 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 (microsec !== false) {
+          this.microsec = microsec;
+        }
+        if (timezone !== false) {
+          this.timezone = timezone;
         }
-      });
 
-      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();
+        if (!this.inst) {
+          this.inst = $.datepicker._getInst(this.$input[0]);
         }
-      });
 
-      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._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.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);
-        })
-      );
-      this.timezone_select.val((typeof this.timezone != "undefined" && this.timezone != null && this.timezone != "") ? this.timezone : o.timezone);
-      this.timezone_select.change(function() {
-        tp_inst._onTimeChange();
-      });
+      this.timeDefined = true;
+      if (hasChanged) {
+        this._updateDateTime();
+      }
+    },
+
+    /*
+    * 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 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;
+      
+      // 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) {
+        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.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;
+          }
+        }
 
-      // 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;
+        if(this._defaults.altTimeFormat){
+          altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
+        }
+        else{
+          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);
             }
-            tp_inst.hour_slider.slider("option", "value", h);
-            tp_inst._onTimeChange();
-            tp_inst._onSelectHandler();
-          }).css({
-            cursor: 'pointer',
-            width: (100 / hourGridSize) + '%',
-            textAlign: 'center',
-            overflow: 'hidden'
-          });
-        });
+          }
+        }
       }
+    },
+
+    /*
+    * 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();
 
-      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());
+          $(sel).appendTo(obj).change(function(e){
             tp_inst._onTimeChange();
             tp_inst._onSelectHandler();
-          }).css({
-            cursor: 'pointer',
-            width: (100 / minuteGridSize) + '%',
-            textAlign: 'center',
-            overflow: 'hidden'
           });
-        });
+
+          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
 
-      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'
-          });
+  });
+
+  $.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
         });
       }
 
-      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'
+      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);
         });
       }
+    }
+  });
 
-      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);
+  /*
+  * 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);
+      parseRex.date.setMicroseconds(t.microsec);
+    }
 
-      if (this.inst !== null) {
-        var timeDefined = this.timeDefined;
-        this._onTimeChange();
-        this.timeDefined = timeDefined;
-      }
+    return parseRes.date;
+  };
 
-      //Emulate datepicker onSelect behavior. Call on slidestop.
-      var onSelectDelegate = function() {
-        tp_inst._onSelectHandler();
+  /*
+  * 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('|') + ')?';
       };
-      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 });
-              });
+
+      // 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;
             }
           }
-        },0);
-      }
-      // end slideAccess integration
+        }
+        return orders;
+      };
 
-    }
-  },
-
-  //########################################################################
-  // 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;
-      }
+      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(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();
+      if (treg) {
+        if (order.t !== -1) {
+          if (treg[order.t] === undefined || treg[order.t].length === 0) {
+            ampm = '';
+            resTime.ampm = '';
           } else {
-            if(this.millisec < this._defaults.millisecMin)
-              this.millisec = this._defaults.millisecMin;
-            this._defaults.millisecMin = this.millisecMinOriginal;
+            ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
+            resTime.ampm = o[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
           }
-        } 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 (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.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(o.parse === 'loose'){
+      return looseParse(timeFormat, timeString, o);
     }
+    return strictParse(timeFormat, timeString, o);
+  };
 
-    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);
+  /*
+  * Public utility to format the time
+  * 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: 0
+    }, time);
+
+    var tmptime = format,
+      ampmName = options.amNames[0],
+      hour = parseInt(time.hour, 10);
+
+    if (hour > 11) {
+      ampmName = options.pmNames[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;
+    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, "") || "'";
       }
+    });
 
-      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;
+    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);
+      }
+    }
+  };
+
+  /*
+  * 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
+  */
+  $.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
+  /* Update any alternate field to synchronise with the main field. */
+  $.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;
           }
-        } 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;
+        $(altField).val(altFormattedDateTime);
       }
     }
+    else{
+      $.datepicker._base_updateAlternate(inst);
+    }
+  };
 
-    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);
+  /*
+  * 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);
+        }
+      }
     }
 
-  },
-
-
-  //########################################################################
-  // 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);
+    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;
     }
-    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]);
+
+    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);
     }
-  },
-
-  //########################################################################
-  // 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;
-    if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
+  };
+
+  $.datepicker._enableTimepickerDatepicker = function(target) {
+    var inst = this._getInst(target);
+    if (!inst) {
       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;
+    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);
     }
+  };
 
-    this.formattedDateTime = formattedDateTime;
+  /*
+  * 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;
 
-    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);
-    }
+      // 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;
 
-    this.$input.trigger("change");
-  }
+      //check if within min/max times.. 
+      tp_inst._limitMinMaxDateTime(inst, true);
 
-});
+      tp_inst._onTimeChange();
+      tp_inst._updateDateTime(inst);
+    }
+  };
 
-$.fn.extend({
-  //########################################################################
-  // shorthand just to use timepicker..
-  //########################################################################
-  timepicker: function(o) {
-    o = o || {};
-    var tmp_args = arguments;
+  /*
+  * 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;
+    }
 
-    if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true });
+    var tp_inst = this._get(inst, 'timepicker');
 
-    return $(this).each(function() {
-      $.fn.datetimepicker.apply($(this), tmp_args);
-    });
-  },
-
-  //########################################################################
-  // extend timepicker to datepicker
-  //########################################################################
-  datetimepicker: function(o) {
-    o = o || {};
-    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);
-        });
+    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());
+        }
+        if (tp_date.toString() == 'Invalid Date') {
+          tp_date = undefined;
+        }
+        this._setTime(inst, tp_date);
+      }
     }
-    else
-      return this.each(function() {
-        var $t = $(this);
-        $t.datepicker($.timepicker._newInst($t, o)._defaults);
-      });
-  }
-});
-
-//########################################################################
-// 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;
+
+  };
+
+  /*
+  * 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 (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);
-          return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
-        }
-        return '';
+
+    var tp_inst = this._get(inst, 'timepicker'),
+      tp_date = (date instanceof Date) ? new Date(date.getTime()) : 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_inst.timezone != null){
+      date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+      tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
     }
-  });
 
-  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;
-  }
+    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;
+    }
 
-  if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+    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){
+          date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+        }
+      }
+      return date;
+    }
+    return this._base_getDateDatepicker(target, noDefault);
+  };
 
-    this._base_updateDatepicker(inst);
+  /*
+  * 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 {
+        throw err;
+      }
+    }
+    return date;
+  };
 
-    // Reload the time control when changing something in the input text field.
+  /*
+  * 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._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._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);
+    if (tp_inst) {
+      tp_inst._updateDateTime(inst);
+      return tp_inst.$input.val();
     }
-  }
+    return this._base_formatDate(inst);
+  };
 
-  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);
+  /*
+  * 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(obj)) {
+        return false;
       }
-      catch (err) {
-        $.datepicker.log(err);
+    }
+    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;
+  };
 
-  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 now = new Date();
-  var tp_inst = this._get(inst, 'timepicker');
-  if (tp_inst && tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
-    var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60
-    var tzsign = tzoffset > 0 ? '-' : '+';
-    tzoffset = Math.abs(tzoffset);
-    var tzmin = tzoffset % 60;
-    tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
-    if (tp_inst._defaults.timezoneIso8609)
-      tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
-    tp_inst.timezone_select.val(tzoffset);
-  }
-  this._setTime(inst, now);
-  $( '.ui-datepicker-today', $dp).click();
-};
-
-//#######################################################################################
-// Disable & enable the Time in the datetimepicker
-//#######################################################################################
-$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
-  var inst = this._getInst(target),
-  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, date, withDate) {
-  var inst = this._getInst(target),
-  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..
-    if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax) || (millisec < defaults.millisecMin || millisec > defaults.millisecMax)) {
-      hour = defaults.hourMin;
-      minute = defaults.minuteMin;
-      second = defaults.secondMin;
-      millisec = defaults.millisecMin;
+  /*
+  * 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('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) {
+    if (hour > 12) {
+      hour = hour - 12;
     }
 
-    tp_inst.hour = hour;
-    tp_inst.minute = minute;
-    tp_inst.second = second;
-    tp_inst.millisec = millisec;
+    if (hour === 0) {
+      hour = 12;
+    }
 
-    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);
+    return String(hour);
+  };
 
-    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),
-    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);
+  /*
+  * Splits datetime string into date ans time substrings.
+  * Throws exception when date can't be parsed
+  * Returns [dateString, timeString]
+  */
+  var splitDateTime = function(dateFormat, dateTimeString, dateSettings, timeSettings) {
+    try {
+      // The idea is to get the number separator occurances 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 = timeSettings && timeSettings.separator ? timeSettings.separator : $.timepicker._defaults.separator,
+        format = timeSettings && timeSettings.timeFormat ? timeSettings.timeFormat : $.timepicker._defaults.timeFormat,
+        timeParts = format.split(separator), // how many occurances of separator may be in our format?
+        timePartsLen = timeParts.length,
+        allParts = dateTimeString.split(separator),
+        allPartsLen = allParts.length;
+
+      if (allPartsLen > 1) {
+        return [
+            allParts.splice(0,allPartsLen-timePartsLen).join(separator),
+            allParts.splice(0,timePartsLen).join(separator)
+          ];
+      }
+
+    } catch (err) {
+      $.timepicker.log('Could not split the date from the time. Please check the following datetimepicker options' +
+          "\nthrown error: " + err +
+          "\ndateTimeString" + dateTimeString +
+          "\ndateFormat = " + dateFormat +
+          "\nseparator = " + timeSettings.separator +
+          "\ntimeFormat = " + timeSettings.timeFormat);
+
+      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),
+          timeString = dateTimeString.substring(dateStringLength);
+
+        return [$.trim(dateTimeString.substring(0, dateStringLength)), $.trim(dateTimeString.substring(dateStringLength))];
+
+      } else {
+        throw err;
       }
-      else tp_date = new Date(date.getTime());
-      if (tp_date.toString() == 'Invalid Date') tp_date = undefined;
-      this._setTime(inst, tp_date);
     }
-  }
+    return [dateTimeString, ''];
+  };
 
-};
-
-//#######################################################################################
-// 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),
-  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),
-    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 date;
-  try {
-    date = this._base_parseDate(format, value, settings);
-  } 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.
-      date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
+  /*
+  * 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;
+    var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings);
+    date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
+    if (splitRes[1] !== '') {
+      var timeString = splitRes[1],
+        parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
+
+      if (parsedTime === null) {
+        throw 'Wrong time format';
+      }
+      return {
+        date: date,
+        timeObj: parsedTime
+      };
     } else {
-      // The underlying error was not related to the time
-      throw err;
+      return {
+        date: date
+      };
     }
-  }
-  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 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),
-    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;
-      else if (name === 'onSelect')
-        onselect = value;
-    } 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;
+  };
+
+  /*
+  * 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 = typeof date !== 'undefined' ? date : new Date();
+      tp_inst.timezone_select.val(now.getTimezoneOffset()*-1);
+    }
+  };
+
+  /*
+  * Create a Singleton Insance
+  */
+  $.timepicker = new Timepicker();
+
+  /**
+   * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
+   * @param  number if not a number this value is returned
+   * @param boolean if true formats in accordance to iso8601 "+12:45"
+   * @return string
+   */
+  $.timepicker.timezoneOffsetString = function(tzMinutes, iso8601) {
+    if(isNaN(tzMinutes) || tzMinutes > 840){
+      return tzMinutes;
+    }
+
+    var off = tzMinutes,
+      minutes = off % 60,
+      hours = (off - minutes) / 60,
+      iso = iso8601? ':':'',
+      tz = (off >= 0 ? '+' : '-') + ('0' + (hours * 101).toString()).slice(-2) + iso + ('0' + (minutes * 101).toString()).slice(-2);
+    
+    if(tz == '+00:00'){
+      return 'Z';
+    }
+    return tz;
+  };
+
+  /**
+   * Get the number in minutes that represents a timezone string
+   * @param  string formated like "+0500", "-1245"
+   * @return number
+   */
+  $.timepicker.timezoneOffsetNumber = function(tzString) {
+    tzString = tzString.toString().replace(':',''); // excuse any iso8601, end up with "+1245"
+
+    if(tzString.toUpperCase() === 'Z'){ // if iso8601 with Z, its 0 minute offset
+      return 0;
+    }
+
+    if(!/^(\-|\+)\d{4}$/.test(tzString)){ // possibly a user defined tz, so just give it back
+      return tzString;
+    }
+
+    return ((tzString.substr(0,1) =='-'? -1 : 1) * // plus or minus
+          ((parseInt(tzString.substr(1,2),10)*60) + // hours (converted to minutes)
+          parseInt(tzString.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
+   * @param  string formated like "+0500", "-1245"
+   * @return date
+   */
+  $.timepicker.timezoneAdjust = function(date, toTimezone) {
+    var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
+    if(!isNaN(toTz)){
+      var currTz = date.getTimezoneOffset()*-1,
+        diff = currTz - toTz; // difference in minutes
+
+      date.setMinutes(date.getMinutes()+diff);
+    }
+    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  obj 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  obj 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 `method` on the `startTime` and `endTime` elements, and configures them to
+   * enforce date range limits.
+   * @param  Element startTime
+   * @param  Element endTime
+   * @param  obj 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  obj 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);
+
+    $.fn[method].call(startTime, $.extend({
+      onClose: function(dateText, inst) {
+        checkDates($(this), endTime);
+      },
+      onSelect: function(selectedDateTime) {
+        selected($(this), endTime, 'minDate');
+      }
+    }, options, options.start));
+    $.fn[method].call(endTime, $.extend({
+      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');
+
+    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);
+        }
+      }
     }
-    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;
+
+    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);
+      }
+    }
+    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){
+      console.log(err);
+    }
+  };
+
+  /*
+  * Rough microsecond support
+  */
+  if(!Date.prototype.getMicroseconds){
+    Date.microseconds = 0;
+    Date.prototype.getMicroseconds = function(){ return this.microseconds; };
+    Date.prototype.setMicroseconds = function(m){ this.microseconds = m; return this; };
   }
-  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 target;
-};
-
-$.timepicker = new Timepicker(); // singleton instance
-$.timepicker.version = "1.0.0";
+
+  /*
+  * Keep up with the version
+  */
+  $.timepicker.version = "1.3";
 
 })(jQuery);