rails_admin 0.4.2 → 0.4.3

data/app/assets/javascripts/rails_admin/custom/ui.coffee

@@ -0,0 +1 @@
+#= override this file in your application to add custom behaviour

data/app/assets/javascripts/rails_admin/jquery.remotipart.fixed.js

@@ -0,0 +1,72 @@
+//= require jquery.iframe-transport.js
+//= require_self
+
+
+// This file is frozen in RailsAdmin to cope with https://github.com/JangoSteve/remotipart/pull/50
+
+(function($) {
+
+  var remotipart;
+
+  $.remotipart = remotipart = {
+
+    setup: function(form) {
+      form
+        // Allow setup part of $.rails.handleRemote to setup remote settings before canceling default remote handler
+        // This is required in order to change the remote settings using the form details
+        .one('ajax:beforeSend.remotipart', function(e, xhr, settings){
+          // Delete the beforeSend bindings, since we're about to re-submit via ajaxSubmit with the beforeSubmit
+          // hook that was just setup and triggered via the default `$.rails.handleRemote`
+          // delete settings.beforeSend;
+          delete settings.beforeSend;
+
+          settings.iframe      = true;
+          settings.files       = $($.rails.fileInputSelector, form);
+          settings.data        = form.serializeArray();
+          settings.processData = false;
+
+          // Modify some settings to integrate JS request with rails helpers and middleware
+          if (settings.dataType === undefined) { settings.dataType = 'script *'; }
+          settings.data.push({name: 'remotipart_submitted', value: true});
+
+          // Allow remotipartSubmit to be cancelled if needed
+          if ($.rails.fire(form, 'ajax:remotipartSubmit', [xhr, settings])) {
+            // Second verse, same as the first
+            $.rails.ajax(settings);
+          }
+
+          //Run cleanup
+          remotipart.teardown(form);
+
+          // Cancel the jQuery UJS request
+          return false;
+        })
+
+        // Keep track that we just set this particular form with Remotipart bindings
+        // Note: The `true` value will get over-written with the `settings.dataType` from the `ajax:beforeSend` handler
+        .data('remotipartSubmitted', true);
+    },
+
+    teardown: function(form) {
+      form
+        .unbind('ajax:beforeSend.remotipart')
+        .removeData('remotipartSubmitted')
+    }
+  };
+
+  $(document).on('ajax:aborted:file', 'form', function(){
+    var form = $(this);
+
+    remotipart.setup(form);
+
+    // If browser does not support submit bubbling, then this live-binding will be called before direct
+    // bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
+    if (!$.support.submitBubbles && $().jquery < '1.7' && $.rails.callFormSubmitBindings(form) === false) return $.rails.stopEverything(e);
+
+    // Manually call jquery-ujs remote call so that it can setup form and settings as usual,
+    // and trigger the `ajax:beforeSend` callback to which remotipart binds functionality.
+    $.rails.handleRemote(form);
+    return false;
+  });
+
+})(jQuery);

data/app/assets/javascripts/rails_admin/jquery.ui.timepicker.js

@@ -1,59 +1,58 @@
 /*
- * jQuery UI Timepicker 0.2.9
- *
- * Copyright 2010-2011, Francois Gelinas
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://fgelinas.com/code/timepicker
- *
- * Depends:
- *  jquery.ui.core.js
- *  jquery.ui.position.js (only if position settngs are used)
- *
- * Change version 0.1.0 - moved the t-rex up here
- *
-                                                  ____
-       ___                                      .-~. /_"-._
-      `-._~-.                                  / /_ "~o\  :Y
-          \  \                                / : \~x.  ` ')
-           ]  Y                              /  |  Y< ~-.__j
-          /   !                        _.--~T : l  l<  /.-~
-         /   /                 ____.--~ .   ` l /~\ \<|Y
-        /   /             .-~~"        /| .    ',-~\ \L|
-       /   /             /     .^   \ Y~Y \.^>/l_   "--'
-      /   Y           .-"(  .  l__  j_j l_/ /~_.-~    .
-     Y    l          /    \  )    ~~~." / `/"~ / \.__/l_
-     |     \     _.-"      ~-{__     l  :  l._Z~-.___.--~
-     |      ~---~           /   ~~"---\_  ' __[>
-     l  .                _.^   ___     _>-y~
-      \  \     .      .-~   .-~   ~>--"  /
-       \  ~---"            /     ./  _.-'
-        "-.,_____.,_  _.--~\     _.-~
-                    ~~     (   _}       -Row
-                           `. ~(
-                             )  \
-                            /,`--'~\--'~\
-                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-                             ->T-Rex<-
+* jQuery UI Timepicker 0.3.1
+*
+* Copyright 2010-2011, Francois Gelinas
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*
+* http://fgelinas.com/code/timepicker
+*
+* Depends:
+* jquery.ui.core.js
+* jquery.ui.position.js (only if position settngs are used)
+*
+* Change version 0.1.0 - moved the t-rex up here
+*
+____
+___ .-~. /_"-._
+`-._~-. / /_ "~o\ :Y
+\ \ / : \~x. ` ')
+] Y / | Y< ~-.__j
+/ ! _.--~T : l l< /.-~
+/ / ____.--~ . ` l /~\ \<|Y
+/ / .-~~" /| . ',-~\ \L|
+/ / / .^ \ Y~Y \.^>/l_ "--'
+/ Y .-"( . l__ j_j l_/ /~_.-~ .
+Y l / \ ) ~~~." / `/"~ / \.__/l_
+| \ _.-" ~-{__ l : l._Z~-.___.--~
+| ~---~ / ~~"---\_ ' __[>
+l . _.^ ___ _>-y~
+\ \ . .-~ .-~ ~>--" /
+\ ~---" / ./ _.-'
+"-.,_____.,_ _.--~\ _.-~
+~~ ( _} -Row
+`. ~(
+) \
+/,`--'~\--'~\
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+->T-Rex<-
 */
 
-(function ($, undefined) {
+(function ($) {
 
-    $.extend($.ui, { timepicker: { version: "0.2.9"} });
+    $.extend($.ui, { timepicker: { version: "0.3.1"} });
 
-    var PROP_NAME = 'timepicker';
-    var tpuuid = new Date().getTime();
+    var PROP_NAME = 'timepicker',
+        tpuuid = new Date().getTime();
 
     /* 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. */
+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.debug = true; // Change this to true to start debugging
         this._curInst = null; // The current instance in use
-        this._isInline = false; // true if the instance is displayed inline
         this._disabledInputs = []; // List of time picker inputs that have been disabled
         this._timepickerShowing = false; // True if the popup picker is showing , false if not
         this._inDialog = false; // True if showing within a "dialog", false if not
@@ -65,61 +64,61 @@
 
         this.regional = []; // Available regional settings, indexed by language code
         this.regional[''] = { // Default regional settings
-            hourText: 'Hour',           // Display text for hours section
-            minuteText: 'Minute',       // Display text for minutes link
-            amPmText: ['AM', 'PM'],     // Display text for AM PM
-            closeButtonText: 'Done',        // Text for the confirmation button (ok button)
-            nowButtonText: 'Now',           // Text for the now button
-            deselectButtonText: 'Deselect'  // Text for the deselect button
+            hourText: 'Hour', // Display text for hours section
+            minuteText: 'Minute', // Display text for minutes link
+            amPmText: ['AM', 'PM'], // Display text for AM PM
+            closeButtonText: 'Done', // Text for the confirmation button (ok button)
+            nowButtonText: 'Now', // Text for the now button
+            deselectButtonText: 'Deselect' // Text for the deselect button
         };
         this._defaults = { // Global defaults for all the time picker instances
-            showOn: 'focus',    // 'focus' for popup on focus,
+            showOn: 'focus', // 'focus' for popup on focus,
                                 // 'button' for trigger button, or 'both' for either (not yet implemented)
-            button: null,                   // 'button' element that will trigger the timepicker
-            showAnim: 'fadeIn',             // Name of jQuery animation for popup
-            showOptions: {},                // Options for enhanced animations
-            appendText: '',                 // Display text following the input box, e.g. showing the format
-
-            beforeShow: null,               // Define a callback function executed before the timepicker is shown
-            onSelect: null,                 // Define a callback function when a hour / minutes is selected
-            onClose: null,                  // Define a callback function when the timepicker is closed
-
-            timeSeparator: ':',             // The character to use to separate hours and minutes.
-            periodSeparator: ' ',           // The character to use to separate the time from the time period.
-            showPeriod: false,              // Define whether or not to show AM/PM with selected time
-            showPeriodLabels: true,         // Show the AM/PM labels on the left of the time picker
-            showLeadingZero: true,          // Define whether or not to show a leading zero for hours < 10. [true/false]
-            showMinutesLeadingZero: true,   // Define whether or not to show a leading zero for minutes < 10.
-            altField: '',                   // Selector for an alternate field to store selected time into
-            defaultTime: 'now',             // Used as default time when input field is empty or for inline timePicker
+            button: null, // 'button' element that will trigger the timepicker
+            showAnim: 'fadeIn', // Name of jQuery animation for popup
+            showOptions: {}, // Options for enhanced animations
+            appendText: '', // Display text following the input box, e.g. showing the format
+
+            beforeShow: null, // Define a callback function executed before the timepicker is shown
+            onSelect: null, // Define a callback function when a hour / minutes is selected
+            onClose: null, // Define a callback function when the timepicker is closed
+
+            timeSeparator: ':', // The character to use to separate hours and minutes.
+            periodSeparator: ' ', // The character to use to separate the time from the time period.
+            showPeriod: false, // Define whether or not to show AM/PM with selected time
+            showPeriodLabels: true, // Show the AM/PM labels on the left of the time picker
+            showLeadingZero: true, // Define whether or not to show a leading zero for hours < 10. [true/false]
+            showMinutesLeadingZero: true, // Define whether or not to show a leading zero for minutes < 10.
+            altField: '', // Selector for an alternate field to store selected time into
+            defaultTime: 'now', // Used as default time when input field is empty or for inline timePicker
                                             // (set to 'now' for the current time, '' for no highlighted time)
-            myPosition: 'left top',         // Position of the dialog relative to the input.
+            myPosition: 'left top', // Position of the dialog relative to the input.
                                             // see the position utility for more info : http://jqueryui.com/demos/position/
-            atPosition: 'left bottom',      // Position of the input element to match
+            atPosition: 'left bottom', // Position of the input element to match
                                             // Note : if the position utility is not loaded, the timepicker will attach left top to left bottom
             //NEW: 2011-02-03
-            onHourShow: null,          // callback for enabling / disabling on selectable hours  ex : function(hour) { return true; }
-            onMinuteShow: null,             // callback for enabling / disabling on time selection  ex : function(hour,minute) { return true; }
+            onHourShow: null,   // callback for enabling / disabling on selectable hours ex : function(hour) { return true; }
+            onMinuteShow: null, // callback for enabling / disabling on time selection ex : function(hour,minute) { return true; }
 
             hours: {
-                starts: 0,                  // first displayed hour
-                ends: 23                    // last displayed hour
+                starts: 0, // first displayed hour
+                ends: 23 // last displayed hour
             },
             minutes: {
-                starts: 0,                  // first displayed minute
-                ends: 55,                   // last displayed minute
-                interval: 5                 // interval of displayed minutes
+                starts: 0, // first displayed minute
+                ends: 55, // last displayed minute
+                interval: 5 // interval of displayed minutes
             },
-            rows: 4,                        // number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2
+            rows: 4, // number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2
             // 2011-08-05 0.2.4
-            showHours: true,                // display the hours section of the dialog
-            showMinutes: true,              // display the minute section of the dialog
-            optionalMinutes: false,         // optionally parse inputs of whole hours with minutes omitted
+            showHours: true, // display the hours section of the dialog
+            showMinutes: true, // display the minute section of the dialog
+            optionalMinutes: false, // optionally parse inputs of whole hours with minutes omitted
 
             // buttons
-            showCloseButton: false,         // shows an OK button to confirm the edit
-            showNowButton: false,           // Shows the 'now' button
-            showDeselectButton: false       // Shows the deselect time button
+            showCloseButton: false, // shows an OK button to confirm the edit
+            showNowButton: false, // Shows the 'now' button
+            showDeselectButton: false // Shows the deselect time button
 
         };
         $.extend(this._defaults, this.regional['']);
@@ -142,16 +141,16 @@
         },
 
         /* 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 */
+@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;
         },
 
         /* Attach the time picker to a jQuery selection.
-        @param  target    element - the target input field or division or span
-        @param  settings  object - the new settings to use for this time picker instance (anonymous) */
+@param target element - the target input field or division or span
+@param settings object - the new settings to use for this time picker instance (anonymous) */
         _attachTimepicker: function (target, settings) {
             // check for settings on the control itself - in namespace 'time:'
             var inlineSettings = null;
@@ -193,7 +192,7 @@
                 id: id, input: target, // associated target
                 inline: inline, // is timepicker inline or not :
                 tpDiv: (!inline ? this.tpDiv : // presentation div
-                    $('<div class="' + this._inlineClass + ' ui-timepicker ui-widget  ui-helper-clearfix"></div>'))
+                    $('<div class="' + this._inlineClass + ' ui-timepicker ui-widget ui-helper-clearfix"></div>'))
             };
         },
 
@@ -229,9 +228,9 @@
                     case 13:
                         $.timepicker._updateSelectedValue(inst);
                         $.timepicker._hideTimepicker();
-
-            return false; // don't submit the form
-            break; // select the value on enter
+                            
+return false; // don't submit the form
+break; // select the value on enter
                     case 27: $.timepicker._hideTimepicker();
                         break; // hide on escape
                     default: handled = false;
@@ -316,8 +315,8 @@
         },
 
         /* Pop-up the time picker for a given input field.
-        @param  input  element - the input field attached to the time picker or
-        event - if triggered by focus */
+@param input element - the input field attached to the time picker or
+event - if triggered by focus */
         _showTimepicker: function (input) {
             input = input.target || input;
             if (input.nodeName.toLowerCase() != 'input') { input = $('input', input.parentNode)[0]; } // find from button/image trigger
@@ -363,7 +362,7 @@
 
 
             // position with the ui position utility, if loaded
-            if ( ( ! inst.inline )  && ( typeof $.ui.position == 'object' ) ) {
+            if ( ( ! inst.inline ) && ( typeof $.ui.position == 'object' ) ) {
                 inst.tpDiv.position({
                     of: inst.input,
                     my: $.timepicker._get( inst, 'myPosition' ),
@@ -385,7 +384,7 @@
             // and adjust position before showing
             offset = $.timepicker._checkOffset(inst, offset, isFixed);
             inst.tpDiv.css({ position: ($.timepicker._inDialog && $.blockUI ?
-          'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
+'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none',
                 left: offset.left + 'px', top: offset.top + 'px'
             });
             if ( ! inst.inline ) {
@@ -396,9 +395,9 @@
                     $.timepicker._timepickerShowing = true;
                     var borders = $.timepicker._getBorders(inst.tpDiv);
                     inst.tpDiv.find('iframe.ui-timepicker-cover'). // IE6- only
-          css({ left: -borders[0], top: -borders[1],
-              width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
-          });
+css({ left: -borders[0], top: -borders[1],
+width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
+});
                 };
 
                 // Fixed the zIndex problem for real (I hope) - FG - v 0.2.9
@@ -409,7 +408,7 @@
                     inst.tpDiv.show(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess);
                 }
                 else {
-                    inst.tpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess);
+                    inst.tpDiv.show((showAnim ? duration : null), postProcess);
                 }
                 if (!showAnim || !duration) { postProcess(); }
                 if (inst.input.is(':visible') && !inst.input.is(':disabled')) { inst.input.focus(); }
@@ -433,6 +432,16 @@
             }
         },
 
+        /* Refresh the time picker
+@param target element - The target input field or inline container element. */
+        _refreshTimepicker: function(target) {
+            var inst = this._getInst(target);
+            if (inst) {
+                this._updateTimepicker(inst);
+            }
+        },
+
+
         /* Generate the time picker content. */
         _updateTimepicker: function (inst) {
             inst.tpDiv.empty().append(this._generateHTML(inst));
@@ -444,11 +453,11 @@
             var borders = $.timepicker._getBorders(inst.tpDiv),
                 self = this;
             inst.tpDiv
-      .find('iframe.ui-timepicker-cover') // IE6- only
-        .css({ left: -borders[0], top: -borders[1],
-            width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
-        })
-      .end()
+.find('iframe.ui-timepicker-cover') // IE6- only
+.css({ left: -borders[0], top: -borders[1],
+width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight()
+})
+.end()
             // after the picker html is appended bind the click & double click events (faster in IE this way
             // then letting the browser interpret the inline events)
             // the binding for the minute cells also exists in _updateMinuteDisplay
@@ -462,26 +471,26 @@
                 .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectHours, this))
                 .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectHours, this))
             .end()
-      .find('.ui-timepicker td a')
+.find('.ui-timepicker td a')
                 .unbind()
-        .bind('mouseout', function () {
-            $(this).removeClass('ui-state-hover');
-            if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).removeClass('ui-timepicker-prev-hover');
-            if (this.className.indexOf('ui-timepicker-next') != -1) $(this).removeClass('ui-timepicker-next-hover');
-        })
-        .bind('mouseover', function () {
-            if ( ! self._isDisabledTimepicker(inst.inline ? inst.tpDiv.parent()[0] : inst.input[0])) {
-                $(this).parents('.ui-timepicker-calendar').find('a').removeClass('ui-state-hover');
-                $(this).addClass('ui-state-hover');
-                if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).addClass('ui-timepicker-prev-hover');
-                if (this.className.indexOf('ui-timepicker-next') != -1) $(this).addClass('ui-timepicker-next-hover');
-            }
-        })
-      .end()
-      .find('.' + this._dayOverClass + ' a')
-        .trigger('mouseover')
-      .end()
-            .find('.ui-timepicker-now').bind("click",function(e) {
+.bind('mouseout', function () {
+$(this).removeClass('ui-state-hover');
+if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).removeClass('ui-timepicker-prev-hover');
+if (this.className.indexOf('ui-timepicker-next') != -1) $(this).removeClass('ui-timepicker-next-hover');
+})
+.bind('mouseover', function () {
+if ( ! self._isDisabledTimepicker(inst.inline ? inst.tpDiv.parent()[0] : inst.input[0])) {
+$(this).parents('.ui-timepicker-calendar').find('a').removeClass('ui-state-hover');
+$(this).addClass('ui-state-hover');
+if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).addClass('ui-timepicker-prev-hover');
+if (this.className.indexOf('ui-timepicker-next') != -1) $(this).addClass('ui-timepicker-next-hover');
+}
+})
+.end()
+.find('.' + this._dayOverClass + ' a')
+.trigger('mouseover')
+.end()
+            .find('.ui-timepicker-now').bind("click", function(e) {
                     $.timepicker.selectNow(e);
             }).end()
             .find('.ui-timepicker-deselect').bind("click",function(e) {
@@ -521,7 +530,7 @@
                 showDeselectButton = this._get(inst, 'showDeselectButton'),
                 deselectButtonText = this._get(inst, 'deselectButtonText'),
                 showButtonPanel = showCloseButton || showNowButton || showDeselectButton;
-
+            
 
 
             // prepare all hours and minutes, makes it easier to distribute by rows
@@ -544,7 +553,7 @@
                 amRows = Math.floor(amItems / hours.length * rows);
                 pmRows = Math.floor(pmItems / hours.length * rows);
 
-                // assign the extra row to the period that is more densly populated
+                // assign the extra row to the period that is more densely populated
                 if (rows != amRows + pmRows) {
                     // Make sure: AM Has Items and either PM Does Not, AM has no rows yet, or AM is more dense
                     if (amItems && (!pmItems || !amRows || (pmRows && amItems / amRows >= pmItems / pmRows))) {
@@ -555,7 +564,14 @@
                 }
                 amFirstRow = Math.min(amRows, 1);
                 pmFirstRow = amRows + 1;
-                hoursPerRow = Math.ceil(Math.max(amItems / amRows, pmItems / pmRows));
+
+                if (amRows == 0) {
+                    hoursPerRow = Math.ceil(pmItems / pmRows);
+                } else if (pmRows == 0) {
+                    hoursPerRow = Math.ceil(amItems / amRows);
+                } else {
+                    hoursPerRow = Math.ceil(Math.max(amItems / amRows, pmItems / pmRows));
+                }
             }
 
 
@@ -589,8 +605,8 @@
                     }
                     html += '</tr>';
                 }
-                html += '</tr></table>' + // Close the hours cells table
-                        '</td>';          // Close the Hour td
+                html += '</table>' + // Close the hours cells table
+                        '</td>'; // Close the Hour td
             }
 
             if (showMinutes) {
@@ -598,7 +614,7 @@
                 html += this._generateHTMLMinutes(inst);
                 html += '</td>';
             }
-
+            
             html += '</tr>';
 
 
@@ -623,16 +639,11 @@
                 html += buttonPanel + '</div></td></tr>';
             }
             html += '</table>';
-
-             /* IE6 IFRAME FIX (taken from datepicker 1.5.3, fixed in 0.1.2 */
-            html += ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
-                '<iframe src="javascript:false;" class="ui-timepicker-cover" frameborder="0"></iframe>' : '');
-
             return html;
         },
 
         /* Special function that update the minutes selection in currently visible timepicker
-         * called on hour selection when onMinuteShow is defined  */
+* called on hour selection when onMinuteShow is defined */
         _updateMinuteDisplay: function (inst) {
             var newHtml = this._generateHTMLMinutes(inst);
             inst.tpDiv.find('td.ui-timepicker-minutes').html(newHtml);
@@ -640,17 +651,17 @@
                 // after the picker html is appended bind the click & double click events (faster in IE this way
                 // then letting the browser interpret the inline events)
                 // yes I know, duplicate code, sorry
-/*                .find('.ui-timepicker-minute-cell')
-                    .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
-                    .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this));
+/* .find('.ui-timepicker-minute-cell')
+.bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this))
+.bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this));
 */
 
         },
 
         /*
-         * Generate the minutes table
-         * This is separated from the _generateHTML function because is can be called separately (when hours changes)
-         */
+* Generate the minutes table
+* This is separated from the _generateHTML function because is can be called separately (when hours changes)
+*/
         _generateHTMLMinutes: function (inst) {
 
             var m, row, html = '',
@@ -675,8 +686,8 @@
             minutesPerRow = Math.round(minutes.length / rows + 0.49); // always round up
 
             /*
-             * The minutes table
-             */
+* The minutes table
+*/
             // if currently selected minute is not enabled, we have a problem and need to select a new minute.
             if (onMinuteShow &&
                 (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours , inst.minutes]) == false) ) {
@@ -696,7 +707,7 @@
                     minuteLabel +
                     '</div>' +
                     '<table class="ui-timepicker">';
-
+            
             minuteCounter = 0;
             for (row = 1; row <= rows; row++) {
                 html += '<tr>';
@@ -733,7 +744,7 @@
 
             var html = "";
             var enabled = true;
-            var onHourShow = this._get(inst, 'onHourShow');    //custom callback
+            var onHourShow = this._get(inst, 'onHourShow'); //custom callback
 
             if (hour == undefined) {
                 html = '<td><span class="ui-state-default ui-state-disabled">&nbsp;</span></td>';
@@ -741,7 +752,7 @@
             }
 
             if (onHourShow) {
-              enabled = onHourShow.apply((inst.input ? inst.input[0] : null), [hour]);
+             enabled = onHourShow.apply((inst.input ? inst.input[0] : null), [hour]);
             }
 
             if (enabled) {
@@ -753,26 +764,26 @@
                    '</a></td>';
             }
             else {
-              html =
-                '<td>' +
-                    '<span class="ui-state-default ui-state-disabled ' +
-                    (hour == inst.hours ? ' ui-state-active ' : ' ') +
-                    '">' +
-                    displayHour.toString() +
-                    '</span>' +
-                '</td>';
+             html =
+             '<td>' +
+'<span class="ui-state-default ui-state-disabled ' +
+(hour == inst.hours ? ' ui-state-active ' : ' ') +
+'">' +
+displayHour.toString() +
+'</span>' +
+'</td>';
             }
             return html;
         },
 
         /* Generate the content of a "Hour" cell */
         _generateHTMLMinuteCell: function (inst, minute, displayText) {
-           var html = "";
+         var html = "";
              var enabled = true;
              var onMinuteShow = this._get(inst, 'onMinuteShow');    //custom callback
              if (onMinuteShow) {
-               //NEW: 2011-02-03  we should give the hour as a parameter as well!
-               enabled = onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours,minute]);    //trigger callback
+             //NEW: 2011-02-03 we should give the hour as a parameter as well!
+              enabled = onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours,minute]);   //trigger callback
              }
 
              if (minute == undefined) {
@@ -781,32 +792,52 @@
              }
 
              if (enabled) {
-               html = '<td class="ui-timepicker-minute-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-minute="' + minute.toString() + '" >' +
-                     '<a class="ui-state-default ' +
-                     (minute == inst.minutes ? 'ui-state-active' : '') +
-                     '" >' +
-                     displayText +
-                     '</a></td>';
+html = '<td class="ui-timepicker-minute-cell" data-timepicker-instance-id="#' + inst.id.replace(/\\\\/g,"\\") + '" data-minute="' + minute.toString() + '" >' +
+'<a class="ui-state-default ' +
+(minute == inst.minutes ? 'ui-state-active' : '') +
+'" >' +
+displayText +
+'</a></td>';
              }
              else {
 
-              html = '<td>' +
-                   '<span class="ui-state-default ui-state-disabled" >' +
-                     displayText +
-                   '</span>' +
+             html = '<td>' +
+'<span class="ui-state-default ui-state-disabled" >' +
+displayText +
+'</span>' +
                  '</td>';
              }
              return html;
         },
 
 
+        /* Detach a timepicker from its control.
+@param target element - the target input field or division or span */
+        _destroyTimepicker: function(target) {
+            var $target = $(target);
+            var inst = $.data(target, PROP_NAME);
+            if (!$target.hasClass(this.markerClassName)) {
+                return;
+            }
+            var nodeName = target.nodeName.toLowerCase();
+            $.removeData(target, PROP_NAME);
+            if (nodeName == 'input') {
+                inst.append.remove();
+                inst.trigger.remove();
+                $target.removeClass(this.markerClassName)
+                    .unbind('focus.timepicker', this._showTimepicker)
+                    .unbind('click.timepicker', this._adjustZIndex);
+            } else if (nodeName == 'div' || nodeName == 'span')
+                $target.removeClass(this.markerClassName).empty();
+        },
+
         /* Enable the date picker to a jQuery selection.
-           @param  target    element - the target input field or division or span */
+@param target element - the target input field or division or span */
         _enableTimepicker: function(target) {
             var $target = $(target),
                 target_id = $target.attr('id'),
                 inst = $.data(target, PROP_NAME);
-
+            
             if (!$target.hasClass(this.markerClassName)) {
                 return;
             }
@@ -830,7 +861,7 @@
         },
 
         /* Disable the time picker to a jQuery selection.
-           @param  target    element - the target input field or division or span */
+@param target element - the target input field or division or span */
         _disableTimepicker: function(target) {
             var $target = $(target);
             var inst = $.data(target, PROP_NAME);
@@ -862,8 +893,8 @@
         },
 
         /* Is the first field in a jQuery collection disabled as a timepicker?
-        @param  target_id element - the target input field or division or span
-        @return boolean - true if disabled, false if enabled */
+@param target_id element - the target input field or division or span
+@return boolean - true if disabled, false if enabled */
         _isDisabledTimepicker: function (target_id) {
             if ( ! target_id) { return false; }
             for (var i = 0; i < this._disabledInputs.length; i++) {
@@ -887,9 +918,9 @@
 
             // now check if datepicker is showing outside window viewport - move to a better place if so.
             offset.left -= Math.min(offset.left, (offset.left + tpWidth > viewWidth && viewWidth > tpWidth) ?
-      Math.abs(offset.left + tpWidth - viewWidth) : 0);
+Math.abs(offset.left + tpWidth - viewWidth) : 0);
             offset.top -= Math.min(offset.top, (offset.top + tpHeight > viewHeight && viewHeight > tpHeight) ?
-      Math.abs(tpHeight + inputHeight) : 0);
+Math.abs(tpHeight + inputHeight) : 0);
 
             return offset;
         },
@@ -906,14 +937,14 @@
         },
 
         /* Retrieve the size of left and top borders for an element.
-        @param  elem  (jQuery object) the element of interest
-        @return  (number[2]) the left and top borders */
+@param elem (jQuery object) the element of interest
+@return (number[2]) the left and top borders */
         _getBorders: function (elem) {
             var convert = function (value) {
                 return { thin: 1, medium: 2, thick: 3}[value] || value;
             };
             return [parseFloat(convert(elem.css('border-left-width'))),
-      parseFloat(convert(elem.css('border-top-width')))];
+parseFloat(convert(elem.css('border-top-width')))];
         },
 
 
@@ -922,15 +953,15 @@
             if (!$.timepicker._curInst) { return; }
             var $target = $(event.target);
             if ($target[0].id != $.timepicker._mainDivId &&
-        $target.parents('#' + $.timepicker._mainDivId).length == 0 &&
-        !$target.hasClass($.timepicker.markerClassName) &&
-        !$target.hasClass($.timepicker._triggerClass) &&
-        $.timepicker._timepickerShowing && !($.timepicker._inDialog && $.blockUI))
+$target.parents('#' + $.timepicker._mainDivId).length == 0 &&
+!$target.hasClass($.timepicker.markerClassName) &&
+!$target.hasClass($.timepicker._triggerClass) &&
+$.timepicker._timepickerShowing && !($.timepicker._inDialog && $.blockUI))
                 $.timepicker._hideTimepicker();
         },
 
         /* Hide the time picker from view.
-        @param  input  element - the input field attached to the time picker */
+@param input element - the input field attached to the time picker */
         _hideTimepicker: function (input) {
             var inst = this._curInst;
             if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
@@ -946,16 +977,12 @@
                 }
                 else {
                     inst.tpDiv[(showAnim == 'slideDown' ? 'slideUp' :
-              (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
+(showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess);
                 }
                 if (!showAnim) { postProcess(); }
-                var onClose = this._get(inst, 'onClose');
-                if (onClose) {
-                    onClose.apply(
-                        (inst.input ? inst.input[0] : null),
-              [(inst.input ? inst.input.val() : ''), inst]);  // trigger custom callback
-                }
+
                 this._timepickerShowing = false;
+
                 this._lastInput = null;
                 if (this._inDialog) {
                     this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
@@ -965,6 +992,14 @@
                     }
                 }
                 this._inDialog = false;
+
+                var onClose = this._get(inst, 'onClose');
+                 if (onClose) {
+                     onClose.apply(
+                         (inst.input ? inst.input[0] : null),
+  [(inst.input ? inst.input.val() : ''), inst]); // trigger custom callback
+                 }
+
             }
         },
 
@@ -976,9 +1011,9 @@
         },
 
         /* Retrieve the instance data for the target control.
-        @param  target  element - the target input field or division or span
-        @return  object - the associated instance data
-        @throws  error if a jQuery problem getting data */
+@param target element - the target input field or division or span
+@return object - the associated instance data
+@throws error if a jQuery problem getting data */
         _getInst: function (target) {
             try {
                 return $.data(target, PROP_NAME);
@@ -991,7 +1026,7 @@
         /* Get a setting value, defaulting if necessary. */
         _get: function (inst, name) {
             return inst.settings[name] !== undefined ?
-      inst.settings[name] : this._defaults[name];
+inst.settings[name] : this._defaults[name];
         },
 
         /* Parse existing time and initialise time picker. */
@@ -1022,13 +1057,13 @@
         },
 
         /* Update or retrieve the settings for an existing time picker.
-           @param  target  element - the target input field or division or span
-           @param  name    object - the new settings to update or
-                           string - the name of the setting to change or retrieve,
-                           when retrieving also 'all' for all instance settings or
-                           'defaults' for all global defaults
-           @param  value   any - the new value for the setting
-                       (omit if above is an object or to retrieve a value) */
+@param target element - the target input field or division or span
+@param name object - the new settings to update or
+string - the name of the setting to change or retrieve,
+when retrieving also 'all' for all instance settings or
+'defaults' for all global defaults
+@param value any - the new value for the setting
+(omit if above is an object or to retrieve a value) */
         _optionTimepicker: function(target, name, value) {
             var inst = this._getInst(target);
             if (arguments.length == 2 && typeof name == 'string') {
@@ -1052,26 +1087,31 @@
 
 
         /* Set the time for a jQuery selection.
-      @param  target  element - the target input field or division or span
-      @param  time    String - the new time */
-      _setTimeTimepicker: function(target, time) {
-        var inst = this._getInst(target);
-        if (inst) {
-          this._setTime(inst, time);
-          this._updateTimepicker(inst);
-          this._updateAlternate(inst, time);
-        }
-      },
+@param target element - the target input field or division or span
+@param time String - the new time */
+_setTimeTimepicker: function(target, time) {
+var inst = this._getInst(target);
+if (inst) {
+this._setTime(inst, time);
+     this._updateTimepicker(inst);
+this._updateAlternate(inst, time);
+}
+},
 
         /* Set the time directly. */
         _setTime: function(inst, time, noChange) {
             var origHours = inst.hours;
             var origMinutes = inst.minutes;
-            var time = this.parseTime(inst, time);
-            inst.hours = time.hours;
-            inst.minutes = time.minutes;
+            if (time instanceof Date) {
+                inst.hours = time.getHours();
+                inst.minutes = time.getMinutes();
+            } else {
+                var time = this.parseTime(inst, time);
+                inst.hours = time.hours;
+                inst.minutes = time.minutes;
+            }
 
-            if ((origHours != inst.hours || origMinutes != inst.minuts) && !noChange) {
+            if ((origHours != inst.hours || origMinutes != inst.minutes) && !noChange) {
                 inst.input.trigger('change');
             }
             this._updateTimepicker(inst);
@@ -1089,12 +1129,15 @@
         },
 
         /*
-        * Parse a time string into hours and minutes
-        */
+* Parse a time string into hours and minutes
+*/
         parseTime: function (inst, timeVal) {
             var retVal = new Object();
             retVal.hours = -1;
             retVal.minutes = -1;
+            
+            if(!timeVal)
+                return '';
 
             var timeSeparator = this._get(inst, 'timeSeparator'),
                 amPmText = this._get(inst, 'amPmText'),
@@ -1128,16 +1171,14 @@
                     retVal.hours = 0;
                 }
             }
-
+            
             return retVal;
         },
 
-        selectNow: function(e) {
-
-            var id = $(e.target).attr("data-timepicker-instance-id"),
+        selectNow: function(event) {
+            var id = $(event.target).attr("data-timepicker-instance-id"),
                 $target = $(id),
                 inst = this._getInst($target[0]);
-
             //if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; }
             var currentTime = new Date();
             inst.hours = currentTime.getHours();
@@ -1147,8 +1188,8 @@
             this._hideTimepicker();
         },
 
-        deselectTime: function(e) {
-            var id = $(e.target).attr("data-timepicker-instance-id"),
+        deselectTime: function(event) {
+            var id = $(event.target).attr("data-timepicker-instance-id"),
                 $target = $(id),
                 inst = this._getInst($target[0]);
             inst.hours = -1;
@@ -1231,7 +1272,7 @@
             this._updateAlternate(inst, newTime);
             return newTime;
         },
-
+        
         /* this function process selected time and return it parsed according to instance options */
         _getParsedTime: function(inst) {
 
@@ -1239,8 +1280,10 @@
                 return '';
             }
 
-            if ((inst.hours < 0) || (inst.hours > 23)) { inst.hours = 12; }
-            if ((inst.minutes < 0) || (inst.minutes > 59)) { inst.minutes = 0; }
+            // default to 0 AM if hours is not valid
+            if ((inst.hours < inst.hours.starts) || (inst.hours > inst.hours.ends )) { inst.hours = 0; }
+            // default to 0 minutes if minute is not valid
+            if ((inst.minutes < inst.minutes.starts) || (inst.minutes > inst.minutes.ends)) { inst.minutes = 0; }
 
             var period = "",
                 showPeriod = (this._get(inst, 'showPeriod') == true),
@@ -1254,6 +1297,10 @@
                 displayHours = selectedHours ? selectedHours : 0,
                 parsedTime = '';
 
+            // fix some display problem when hours or minutes are not selected yet
+            if (displayHours == -1) { displayHours = 0 }
+            if (selectedMinutes == -1) { selectedMinutes = 0 }
+
             if (showPeriod) {
                 if (inst.hours == 0) {
                     displayHours = 12;
@@ -1287,10 +1334,10 @@
             if (showHours) {
                 if (period.length > 0) { parsedTime += this._get(inst, 'periodSeparator') + period; }
             }
-
+            
             return parsedTime;
         },
-
+        
         /* Update any alternate field to synchronise with the main field. */
         _updateAlternate: function(inst, newTime) {
             var altField = this._get(inst, 'altField');
@@ -1301,6 +1348,19 @@
             }
         },
 
+        _getTimeAsDateTimepicker: function(input) {
+            var inst = this._getInst(input);
+            if (inst.hours == -1 && inst.minutes == -1) {
+                return '';
+            }
+
+            // default to 0 AM if hours is not valid
+            if ((inst.hours < inst.hours.starts) || (inst.hours > inst.hours.ends )) { inst.hours = 0; }
+            // default to 0 minutes if minute is not valid
+            if ((inst.minutes < inst.minutes.starts) || (inst.minutes > inst.minutes.ends)) { inst.minutes = 0; }
+
+            return new Date(0, 0, 0, inst.hours, inst.minutes, 0);
+        },
         /* This might look unused but it's called by the $.fn.timepicker function with param getTime */
         /* added v 0.2.3 - gitHub issue #5 - Thanks edanuff */
         _getTimeTimepicker : function(input) {
@@ -1323,30 +1383,32 @@
 
 
     /* Invoke the timepicker functionality.
-    @param  options  string - a command, optionally followed by additional parameters or
-    Object - settings for attaching new timepicker functionality
-    @return  jQuery object */
+@param options string - a command, optionally followed by additional parameters or
+Object - settings for attaching new timepicker functionality
+@return jQuery object */
     $.fn.timepicker = function (options) {
 
         /* Initialise the time picker. */
         if (!$.timepicker.initialized) {
             $(document).mousedown($.timepicker._checkExternalClick).
-      find('body').append($.timepicker.tpDiv);
+find('body').append($.timepicker.tpDiv);
             $.timepicker.initialized = true;
         }
 
+
+
         var otherArgs = Array.prototype.slice.call(arguments, 1);
-        if (typeof options == 'string' && (options == 'getTime' || options == 'getHour' || options == 'getMinute' ))
+        if (typeof options == 'string' && (options == 'getTime' || options == 'getTimeAsDate' || options == 'getHour' || options == 'getMinute' ))
             return $.timepicker['_' + options + 'Timepicker'].
-          apply($.timepicker, [this[0]].concat(otherArgs));
+apply($.timepicker, [this[0]].concat(otherArgs));
         if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string')
             return $.timepicker['_' + options + 'Timepicker'].
                 apply($.timepicker, [this[0]].concat(otherArgs));
         return this.each(function () {
             typeof options == 'string' ?
-      $.timepicker['_' + options + 'Timepicker'].
-        apply($.timepicker, [this].concat(otherArgs)) :
-      $.timepicker._attachTimepicker(this, options);
+$.timepicker['_' + options + 'Timepicker'].
+apply($.timepicker, [this].concat(otherArgs)) :
+$.timepicker._attachTimepicker(this, options);
         });
     };
 
@@ -1362,10 +1424,10 @@
     $.timepicker = new Timepicker(); // singleton instance
     $.timepicker.initialized = false;
     $.timepicker.uuid = new Date().getTime();
-    $.timepicker.version = "0.2.9";
+    $.timepicker.version = "0.3.1";
 
     // Workaround for #4055
     // Add another global to avoid noConflict issues with inline event handlers
     window['TP_jQuery_' + tpuuid] = $;
 
-})(jQuery);
+})(jQuery);