pickadate-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bff9abfe44be28299cf0476db7df35d0f06a2eb
-  data.tar.gz: aa22306029c2d465c55af70a43cd96c196c91adf
+  metadata.gz: ee040041eef6c517e68b6879b8a780c6bdedd8ac
+  data.tar.gz: fbc696df4935a0b63e33134e53735b186a9ff8f1
 SHA512:
-  metadata.gz: 2875e44174b3f403691b2ad4e8988333b48523f484253b4a8ad97d590e4a9fb7f5aaaed49cdfbe486fddf6d4b68d31e36768ec5e42f9c3eaebf202aa25e91ee1
-  data.tar.gz: 164be77a8e98e992f0f2779893c16737f6397c55b922fd71ccd2cce9b66b38bfb73f4fcd808e1c1a903d35910cac4fbdbe8f3ddd70c7d89f6aaf9376c00df004
+  metadata.gz: 83d3eee2474fdb0ec31f6c9f9b14b41d258dcd00235131c5569b26a1b2a6ba4dd18eaed2c7a9ee6a1f12308958e55d02e522f2b6bd75accedda2cd98e4cad9ee
+  data.tar.gz: 1666b78ee8359dcf46538f6ef0a475436dc62b166469157a8ecbd5125cd6e853b35845f2d449495c4ee671145a5fb7db48f597a07c634cb7494f7ad04acd888d

data/README.md

@@ -1,6 +1,6 @@
 # Pickadate-Rails [![Gem Version](https://badge.fury.io/rb/pickadate-rails.png)](http://badge.fury.io/rb/pickadate-rails)
 
-## Pickadate Version: 3.3.0
+## Pickadate Version: 3.3.1
 
 Easily add [pickadate.js](https://github.com/amsul/pickadate.js) to your Rails 3.1+ application using the asset pipeline.
 

data/lib/pickadate-rails/version.rb

@@ -1,3 +1,3 @@
 module PickadateRails
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/vendor/assets/javascripts/pickadate/picker.date.js

@@ -1,6 +1,6 @@
 
 /*!
- * Date picker for pickadate.js v3.3.0
+ * Date picker for pickadate.js v3.3.1
  * http://amsul.github.io/pickadate.js/date.htm
  */
 
@@ -185,7 +185,7 @@ DatePicker.prototype.create = function( type, value, options ) {
     }
 
     // If it’s an object, use the native date object.
-    else if ( Picker._.isObject( value ) && Picker._.isInteger( value.pick ) ) {
+    else if ( $.isPlainObject( value ) && Picker._.isInteger( value.pick ) ) {
         value = value.obj
     }
 
@@ -235,7 +235,7 @@ DatePicker.prototype.now = function( type, value, options ) {
  */
 DatePicker.prototype.navigate = function( type, value, options ) {
 
-    if ( Picker._.isObject( value ) ) {
+    if ( $.isPlainObject( value ) ) {
 
         var targetDateObject = new Date( value.year, value.month + ( options && options.nav ? options.nav : 0 ), 1 ),
             year = targetDateObject.getFullYear(),
@@ -307,7 +307,7 @@ DatePicker.prototype.validate = function( type, dateObject, options ) {
         interval = options && options.interval ? options.interval : 1,
 
         // Check if the calendar enabled dates are inverted.
-        isInverted = calendar.item.enable === -1,
+        isFlippedBase = calendar.item.enable === -1,
 
         // Check if we have any enabled dates after/before now.
         hasEnabledBeforeTarget, hasEnabledAfterTarget,
@@ -320,7 +320,7 @@ DatePicker.prototype.validate = function( type, dateObject, options ) {
         reachedMin, reachedMax,
 
         // Check if the calendar is inverted and at least one weekday is enabled.
-        hasEnabledWeekdays = isInverted && calendar.item.disable.filter( function( value ) {
+        hasEnabledWeekdays = isFlippedBase && calendar.item.disable.filter( function( value ) {
 
             // If there’s a date, check where it is relative to the target.
             if ( $.isArray( value ) ) {
@@ -346,15 +346,15 @@ DatePicker.prototype.validate = function( type, dateObject, options ) {
     // • Inverted and all dates disabled.
     // • ..and anything else.
     if ( !options.nav ) if (
-        /* 1 */ ( !isInverted && calendar.disabled( dateObject ) ) ||
-        /* 2 */ ( isInverted && calendar.disabled( dateObject ) && ( hasEnabledWeekdays || hasEnabledBeforeTarget || hasEnabledAfterTarget ) ) ||
+        /* 1 */ ( !isFlippedBase && calendar.disabled( dateObject ) ) ||
+        /* 2 */ ( isFlippedBase && calendar.disabled( dateObject ) && ( hasEnabledWeekdays || hasEnabledBeforeTarget || hasEnabledAfterTarget ) ) ||
         /* 3 */ ( dateObject.pick <= minLimitObject.pick || dateObject.pick >= maxLimitObject.pick )
     ) {
 
 
         // When inverted, flip the direction if there aren’t any enabled weekdays
         // and there are no enabled dates in the direction of the interval.
-        if ( isInverted && !hasEnabledWeekdays && ( ( !hasEnabledAfterTarget && interval > 0 ) || ( !hasEnabledBeforeTarget && interval < 0 ) ) ) {
+        if ( isFlippedBase && !hasEnabledWeekdays && ( ( !hasEnabledAfterTarget && interval > 0 ) || ( !hasEnabledBeforeTarget && interval < 0 ) ) ) {
             interval *= -1
         }
 
@@ -407,7 +407,7 @@ DatePicker.prototype.disabled = function( dateObject ) {
     var calendar = this,
 
         // Filter through the disabled dates to check if this is one.
-        isDisabledDate = !!calendar.item.disable.filter( function( dateToDisable ) {
+        isDisabledMatch = calendar.item.disable.filter( function( dateToDisable ) {
 
             // If the date is a number, match the weekday with 0index and `firstDay` check.
             if ( Picker._.isInteger( dateToDisable ) ) {
@@ -418,12 +418,16 @@ DatePicker.prototype.disabled = function( dateObject ) {
             if ( $.isArray( dateToDisable ) || Picker._.isDate( dateToDisable ) ) {
                 return dateObject.pick === calendar.create( dateToDisable ).pick
             }
-        }).length
+        })
 
+    // If this date matches a disabled date, confirm it’s not inverted.
+    isDisabledMatch = isDisabledMatch.length && !isDisabledMatch.filter(function( dateToDisable ) {
+        return $.isArray( dateToDisable ) && dateToDisable[3] == 'inverted'
+    }).length
 
     // Check the calendar “enabled” flag and respectively flip the
     // disabled state. Then also check if it’s beyond the min/max limits.
-    return calendar.item.enable === -1 ? !isDisabledDate : isDisabledDate ||
+    return calendar.item.enable === -1 ? !isDisabledMatch : isDisabledMatch ||
         dateObject.pick < calendar.item.min.pick ||
         dateObject.pick > calendar.item.max.pick
 
@@ -438,7 +442,7 @@ DatePicker.prototype.parse = function( type, value, options ) {
     var calendar = this,
         parsingObject = {}
 
-    if ( !value || Picker._.isInteger( value ) || $.isArray( value ) || Picker._.isDate( value ) || Picker._.isObject( value ) && Picker._.isInteger( value.pick ) ) {
+    if ( !value || Picker._.isInteger( value ) || $.isArray( value ) || Picker._.isDate( value ) || $.isPlainObject( value ) && Picker._.isInteger( value.pick ) ) {
         return value
     }
 
@@ -587,11 +591,11 @@ DatePicker.prototype.flipItem = function( type, value/*, options*/ ) {
 
     var calendar = this,
         collection = calendar.item.disable,
-        isInverted = calendar.item.enable === -1
+        isFlippedBase = calendar.item.enable === -1
 
     // Flip the enabled and disabled dates.
     if ( value == 'flip' ) {
-        calendar.item.enable = isInverted ? 1 : -1
+        calendar.item.enable = isFlippedBase ? 1 : -1
     }
 
     // Reset the collection and enable the base state.
@@ -610,28 +614,79 @@ DatePicker.prototype.flipItem = function( type, value/*, options*/ ) {
     else if ( $.isArray( value ) ) {
 
         // Check if we have to add/remove from collection.
-        if ( !isInverted && type == 'enable' || isInverted && type == 'disable' ) {
-            collection = calendar.removeDisabled( collection, value )
-        }
-        else if ( !isInverted && type == 'disable' || isInverted && type == 'enable' ) {
+        if ( isFlippedBase && type == 'enable' || !isFlippedBase && type == 'disable' ) {
             collection = calendar.addDisabled( collection, value )
         }
+        else if ( !isFlippedBase && type == 'enable' ) {
+            collection = calendar.addEnabled( collection, value )
+        }
+        else if ( isFlippedBase && type == 'disable' ) {
+            collection = calendar.removeDisabled( collection, value )
+        }
     }
 
     return collection
 } //DatePicker.prototype.flipItem
 
 
+/**
+ * Add an enabled (inverted) item to the disabled collection.
+ */
+DatePicker.prototype.addEnabled = function( collection, item ) {
+
+    var calendar = this
+
+    // Go through each item to enable.
+    item.map( function( timeUnit ) {
+
+        // Check if the time unit is already within the collection.
+        if ( calendar.filterDisabled( collection, timeUnit, 1 ).length ) {
+
+            // Remove the unit directly from the collection.
+            collection = calendar.removeDisabled( collection, [timeUnit] )
+
+            // If the unit is an array and it falls within a
+            // disabled weekday, invert it and then insert it.
+            if (
+                $.isArray( timeUnit ) &&
+                collection.filter( function( disabledDate ) {
+                    return Picker._.isInteger( disabledDate ) && calendar.create( timeUnit ).day === disabledDate - 1
+                }).length
+            ) {
+                timeUnit = timeUnit.slice(0)
+                timeUnit.push( 'inverted' )
+                collection.push( timeUnit )
+            }
+        }
+    })
+
+    // Return the final collection.
+    return collection
+} //DatePicker.prototype.addEnabled
+
+
 /**
  * Add an item to the disabled collection.
  */
 DatePicker.prototype.addDisabled = function( collection, item ) {
+
     var calendar = this
+
+    // Go through each item to disable.
     item.map( function( timeUnit ) {
+
+        // Add the time unit if it isn’t already within the collection.
         if ( !calendar.filterDisabled( collection, timeUnit ).length ) {
             collection.push( timeUnit )
         }
+
+        // If the time unit is an array and falls within the range, just remove it.
+        else if ( $.isArray( timeUnit ) && calendar.filterDisabled( collection, timeUnit, 1 ).length ) {
+            collection = calendar.removeDisabled( collection, [timeUnit] )
+        }
     })
+
+    // Return the final collection.
     return collection
 } //DatePicker.prototype.addDisabled
 
@@ -640,10 +695,17 @@ DatePicker.prototype.addDisabled = function( collection, item ) {
  * Remove an item from the disabled collection.
  */
 DatePicker.prototype.removeDisabled = function( collection, item ) {
+
     var calendar = this
+
+    // Go through each item to enable.
     item.map( function( timeUnit ) {
+
+        // Filter each item out of the collection.
         collection = calendar.filterDisabled( collection, timeUnit, 1 )
     })
+
+    // Return the final colleciton.
     return collection
 } //DatePicker.prototype.removeDisabled
 

data/vendor/assets/javascripts/pickadate/picker.js

@@ -1,6 +1,6 @@
 
 /*!
- * pickadate.js v3.3.0, 2013/10/13
+ * pickadate.js v3.3.1, 2013/12/04
  * By Amsul, http://amsul.ca
  * Hosted on http://amsul.github.io/pickadate.js
  * Licensed under MIT
@@ -92,7 +92,7 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                 // and set as readonly to prevent keyboard popup.
                 ELEMENT.autofocus = ELEMENT == document.activeElement
                 ELEMENT.type = 'text'
-                ELEMENT.readOnly = true
+                ELEMENT.readOnly = !SETTINGS.editable
 
 
                 // Create a new picker component with the settings.
@@ -110,10 +110,28 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                             event.stopPropagation()
                         },
 
-                        // If the click is not on the root holder, stop it from bubbling to the doc.
+                        // When something within the root holder is clicked, stop it
+                        // from bubbling to the doc.
                         'mousedown click': function( event ) {
-                            if ( event.target != P.$root.children()[ 0 ] ) {
+
+                            var target = event.target
+
+                            // Make sure the target isn’t the root holder so it can bubble up.
+                            if ( target != P.$root.children()[ 0 ] ) {
+
                                 event.stopPropagation()
+
+                                // * For mousedown events, cancel the default action in order to
+                                //   prevent cases where focus is shifted onto external elements
+                                //   when using things like jQuery mobile or MagnificPopup (ref: #249 & #120).
+                                if ( event.type == 'mousedown' && !$( target ).is( ':input' ) ) {
+
+                                    event.preventDefault()
+
+                                    // Re-focus onto the element so that users can click away
+                                    // from elements focused within the picker.
+                                    ELEMENT.focus()
+                                }
                             }
                         }
                     }).
@@ -131,7 +149,7 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                             activeElement = activeElement && ( activeElement.type || activeElement.href )
 
                         // If it’s disabled or nothing inside is actively focused, re-focus the element.
-                        if ( targetDisabled || !$.contains( P.$root[0], activeElement ) ) {
+                        if ( targetDisabled || activeElement && !$.contains( P.$root[0], activeElement ) ) {
                             ELEMENT.focus()
                         }
 
@@ -175,8 +193,20 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                 }
 
 
-                // Add the class and bind the events on the element.
-                $ELEMENT.addClass( CLASSES.input ).
+                // Prepare the input element.
+                $ELEMENT.
+
+                    // Store the picker data by component name.
+                    data( NAME, P ).
+
+                    // Add the “input” class name.
+                    addClass( CLASSES.input ).
+
+                    // If there’s a `data-value`, update the value of the element.
+                    val( $ELEMENT.data( 'value' ) ? PickerConstructor._.trigger( P.component.formats.toString, P.component, [ SETTINGS.format, P.component.item.select ] ) : ELEMENT.value ).
+
+                    // Insert the hidden input after the element.
+                    after( P._hidden ).
 
                     // On focus/click, open the picker and adjust the root “focused” state.
                     on( 'focus.P' + STATE.id + ' click.P' + STATE.id, focusToOpen ).
@@ -186,7 +216,10 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                         if ( P._hidden ) {
                             P._hidden.value = ELEMENT.value ? PickerConstructor._.trigger( P.component.formats.toString, P.component, [ SETTINGS.formatSubmit, P.component.item.select ] ) : ''
                         }
-                    }).
+                    })
+
+                // Only bind keydown events if the element isn’t editable.
+                if ( !SETTINGS.editable ) $ELEMENT.
 
                     // Handle keyboard event based on the picker being opened or not.
                     on( 'keydown.P' + STATE.id, function( event ) {
@@ -214,16 +247,7 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                             if ( isKeycodeDelete ) { P.clear().close() }
                             else { P.open() }
                         }
-                    }).
-
-                    // If there’s a `data-value`, update the value of the element.
-                    val( $ELEMENT.data( 'value' ) ? PickerConstructor._.trigger( P.component.formats.toString, P.component, [ SETTINGS.format, P.component.item.select ] ) : ELEMENT.value ).
-
-                    // Insert the hidden input after the element.
-                    after( P._hidden ).
-
-                    // Store the picker data by component name.
-                    data( NAME, P )
+                    })
 
 
                 // Insert the root as specified in the settings.
@@ -337,11 +361,18 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                     // Bind the document events.
                     $document.on( 'click.P' + STATE.id + ' focusin.P' + STATE.id, function( event ) {
 
+                        var target = event.target
+
                         // If the target of the event is not the element, close the picker picker.
                         // * Don’t worry about clicks or focusins on the root because those don’t bubble up.
                         //   Also, for Firefox, a click on an `option` element bubbles up directly
                         //   to the doc. So make sure the target wasn't the doc.
-                        if ( event.target != ELEMENT && event.target != document ) P.close()
+                        if ( target != ELEMENT && target != document ) {
+
+                            // If the target was the holder that covers the screen,
+                            // keep the element focused to maintain tabindex.
+                            P.close( target === P.$root.children()[0] )
+                        }
 
                     }).on( 'keydown.P' + STATE.id, function( event ) {
 
@@ -445,9 +476,12 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
             set: function( thing, value, options ) {
 
                 var thingItem, thingValue,
-                    thingIsObject = PickerConstructor._.isObject( thing ),
+                    thingIsObject = $.isPlainObject( thing ),
                     thingObject = thingIsObject ? thing : {}
 
+                // Make sure we have usable options.
+                options = thingIsObject && $.isPlainObject( value ) ? value : options || {}
+
                 if ( thing ) {
 
                     // If the thing isn’t an object, make it one.
@@ -463,7 +497,7 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
 
                         // First, if the item exists and there’s a value, set it.
                         if ( P.component.item[ thingItem ] ) {
-                            P.component.set( thingItem, thingValue, options || {} )
+                            P.component.set( thingItem, thingValue, options )
                         }
 
                         // Then, check to update the element value and broadcast a change.
@@ -478,8 +512,8 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                     P.render()
                 }
 
-                // Trigger queued “set” events and pass the `thingObject`.
-                return P.trigger( 'set', thingObject )
+                // When the method isn’t muted, trigger queued “set” events and pass the `thingObject`.
+                return options.muted ? P : P.trigger( 'set', thingObject )
             }, //set
 
 
@@ -518,7 +552,7 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
             on: function( thing, method ) {
 
                 var thingName, thingMethod,
-                    thingIsObject = PickerConstructor._.isObject( thing ),
+                    thingIsObject = $.isPlainObject( thing ),
                     thingObject = thingIsObject ? thing : {}
 
                 if ( thing ) {
@@ -740,14 +774,6 @@ PickerConstructor._ = {
     },
 
 
-    /**
-     * Tell if something is an object.
-     */
-    isObject: function( value ) {
-        return {}.toString.call( value ).indexOf( 'Object' ) > -1
-    },
-
-
     /**
      * Tell if something is a date object.
      */

data/vendor/assets/javascripts/pickadate/picker.time.js

@@ -1,6 +1,6 @@
 
 /*!
- * Time picker for pickadate.js v3.3.0
+ * Time picker for pickadate.js v3.3.1
  * http://amsul.github.io/pickadate.js/time.htm
  */
 
@@ -102,7 +102,7 @@ function TimePicker( picker, settings ) {
             var $pickerHolder = picker.$root.children(),
                 $viewset = $pickerHolder.find( '.' + settings.klass.viewset )
             if ( $viewset.length ) {
-                $pickerHolder[ 0 ].scrollTop += $viewset.position().top - ( $viewset[ 0 ].clientHeight * 2 )
+                $pickerHolder[ 0 ].scrollTop = ~~$viewset.position().top - ( $viewset[ 0 ].clientHeight * 2 )
             }
         }).
         on( 'open', function() {
@@ -170,30 +170,41 @@ TimePicker.prototype.create = function( type, value, options ) {
 
     var clock = this
 
-    // If there's no value, use the type as the value.
+    // If there’s no value, use the type as the value.
     value = value === undefined ? type : value
 
-    // If it's an object, use the "pick" value.
-    if ( Picker._.isObject( value ) && Picker._.isInteger( value.pick ) ) {
+    // If it’s a date object, convert it into an array.
+    if ( Picker._.isDate( value ) ) {
+        value = [ value.getHours(), value.getMinutes() ]
+    }
+
+    // If it’s an object, use the “pick” value.
+    if ( $.isPlainObject( value ) && Picker._.isInteger( value.pick ) ) {
         value = value.pick
     }
 
-    // If it's an array, convert it into minutes.
+    // If it’s an array, convert it into minutes.
     else if ( $.isArray( value ) ) {
         value = +value[ 0 ] * MINUTES_IN_HOUR + (+value[ 1 ])
     }
 
-    // If no valid value is passed, set it to "now".
+    // If no valid value is passed, set it to “now”.
     else if ( !Picker._.isInteger( value ) ) {
         value = clock.now( type, value, options )
     }
 
-    // If we're setting the max, make sure it's greater than the min.
+    // If we’re setting the max, make sure it’s greater than the min.
     if ( type == 'max' && value < clock.item.min.pick ) {
         value += MINUTES_IN_DAY
     }
 
-    // Normalize it into a "reachable" interval.
+    // If the value doesn’t fall directly on the interval,
+    // add one interval to indicate it as “passed”.
+    if ( type != 'min' && type != 'max' && (value - clock.item.min.pick) % clock.item.interval !== 0 ) {
+        value += clock.item.interval
+    }
+
+    // Normalize it into a “reachable” interval.
     value = clock.normalize( type, value, options )
 
     // Return the compiled object.
@@ -208,7 +219,7 @@ TimePicker.prototype.create = function( type, value, options ) {
         // The time in total minutes.
         time: ( MINUTES_IN_DAY + value ) % MINUTES_IN_DAY,
 
-        // Reference to the "relative" value to pick.
+        // Reference to the “relative” value to pick.
         pick: value
     }
 } //TimePicker.prototype.create
@@ -222,6 +233,9 @@ TimePicker.prototype.now = function( type, value/*, options*/ ) {
     var date = new Date(),
         dateMinutes = date.getHours() * MINUTES_IN_HOUR + date.getMinutes()
 
+    // Make sure “now” falls within the interval range.
+    dateMinutes -= dateMinutes % this.item.interval
+
     // If the value is a number, adjust by that many intervals because
     // the time has passed. In the case of “midnight” and a negative `min`,
     // increase the value by 2. Otherwise increase it by 1.
@@ -244,12 +258,12 @@ TimePicker.prototype.now = function( type, value/*, options*/ ) {
  */
 TimePicker.prototype.normalize = function( type, value/*, options*/ ) {
 
-    var minObject = this.item.min, interval = this.item.interval,
+    var interval = this.item.interval,
 
-        // If setting min and it doesn’t exist, don’t shift anything.
+        // If setting min time, don’t shift anything.
         // Otherwise get the value and min difference and then
         // normalize the difference with the interval.
-        difference = type == 'min' && !minObject ? 0 : ( value - minObject.pick ) % interval
+        difference = type == 'min' ? 0 : ( value - this.item.min.pick ) % interval
 
     // If it’s a negative value, add one interval to keep it as “passed”.
     return value - ( difference + ( value < 0 ? interval : 0 ) )
@@ -263,18 +277,18 @@ TimePicker.prototype.measure = function( type, value, options ) {
 
     var clock = this
 
-    // If it's anything false-y, set it to the default.
+    // If it’s anything false-y, set it to the default.
     if ( !value ) {
         value = type == 'min' ? [ 0, 0 ] : [ HOURS_IN_DAY - 1, MINUTES_IN_HOUR - 1 ]
     }
 
-    // If it's a literal true, or an integer, make it relative to now.
+    // If it’s a literal true, or an integer, make it relative to now.
     else if ( value === true || Picker._.isInteger( value ) ) {
         value = clock.now( type, value, options )
     }
 
-    // If it's an object already, just normalize it.
-    else if ( Picker._.isObject( value ) && Picker._.isInteger( value.pick ) ) {
+    // If it’s an object already, just normalize it.
+    else if ( $.isPlainObject( value ) && Picker._.isInteger( value.pick ) ) {
         value = clock.normalize( type, value.pick, options )
     }
 
@@ -320,21 +334,28 @@ TimePicker.prototype.disabled = function( timeObject ) {
         clock = this,
 
         // Filter through the disabled times to check if this is one.
-        isDisabledTime = clock.item.disable.filter( function( timeToDisable ) {
+        isDisabledMatch = clock.item.disable.filter( function( timeToDisable ) {
 
             // If the time is a number, match the hours.
             if ( Picker._.isInteger( timeToDisable ) ) {
                 return timeObject.hour == timeToDisable
             }
 
-            // If it's an array, create the object and match the times.
-            if ( $.isArray( timeToDisable ) ) {
+            // If it’s an array, create the object and match the times.
+            if ( $.isArray( timeToDisable ) || Picker._.isDate( timeToDisable ) ) {
                 return timeObject.pick == clock.create( timeToDisable ).pick
             }
-        }).length
+        })
+
+    // If this time matches a disabled time, confirm it’s not inverted.
+    isDisabledMatch = isDisabledMatch.length && !isDisabledMatch.filter(function( timeToDisable ) {
+        return $.isArray( timeToDisable ) && timeToDisable[2] == 'inverted'
+    }).length
 
     // If the clock is "enabled" flag is flipped, flip the condition.
-    return clock.item.enable === -1 ? !isDisabledTime : isDisabledTime
+    return clock.item.enable === -1 ? !isDisabledMatch : isDisabledMatch ||
+        timeObject.pick < clock.item.min.pick ||
+        timeObject.pick > clock.item.max.pick
 } //TimePicker.prototype.disabled
 
 
@@ -384,7 +405,7 @@ TimePicker.prototype.parse = function( type, value, options ) {
     var clock = this,
         parsingObject = {}
 
-    if ( !value || Picker._.isInteger( value ) || $.isArray( value ) || Picker._.isDate( value ) || Picker._.isObject( value ) && Picker._.isInteger( value.pick ) ) {
+    if ( !value || Picker._.isInteger( value ) || $.isArray( value ) || Picker._.isDate( value ) || $.isPlainObject( value ) && Picker._.isInteger( value.pick ) ) {
         return value
     }
 
@@ -491,11 +512,11 @@ TimePicker.prototype.flipItem = function( type, value/*, options*/ ) {
 
     var clock = this,
         collection = clock.item.disable,
-        isFlipped = clock.item.enable === -1
+        isFlippedBase = clock.item.enable === -1
 
     // Flip the enabled and disabled times.
     if ( value == 'flip' ) {
-        clock.item.enable = isFlipped ? 1 : -1
+        clock.item.enable = isFlippedBase ? 1 : -1
     }
 
     // Reset the collection and enable the base state.
@@ -514,29 +535,79 @@ TimePicker.prototype.flipItem = function( type, value/*, options*/ ) {
     else if ( $.isArray( value ) ) {
 
         // Check if we have to add/remove from collection.
-        if ( !isFlipped && type == 'enable' || isFlipped && type == 'disable' ) {
-            collection = clock.removeDisabled( collection, value )
-        }
-        else if ( !isFlipped && type == 'disable' || isFlipped && type == 'enable' ) {
+        if ( isFlippedBase && type == 'enable' || !isFlippedBase && type == 'disable' ) {
             collection = clock.addDisabled( collection, value )
         }
+        else if ( !isFlippedBase && type == 'enable' ) {
+            collection = clock.addEnabled( collection, value )
+        }
+        else if ( isFlippedBase && type == 'disable' ) {
+            collection = clock.removeDisabled( collection, value )
+        }
     }
 
     return collection
 } //TimePicker.prototype.flipItem
 
 
+/**
+ * Add an enabled (inverted) item to the disabled collection.
+ */
+TimePicker.prototype.addEnabled = function( collection, item ) {
+
+    var clock = this
+
+    // Go through each item to enable.
+    item.map( function( timeUnit ) {
+
+        // Check if the time unit is already within the collection.
+        if ( clock.filterDisabled( collection, timeUnit, 1 ).length ) {
+
+            // Remove the unit directly from the collection.
+            collection = clock.removeDisabled( collection, [timeUnit] )
+
+            // If the unit is an array and it falls within a
+            // disabled weekday, invert it and then insert it.
+            if (
+                $.isArray( timeUnit ) &&
+                collection.filter( function( disabledHour ) {
+                    return Picker._.isInteger( disabledHour ) && clock.create( timeUnit ).hour === disabledHour
+                }).length
+            ) {
+                timeUnit = timeUnit.slice(0)
+                timeUnit.push( 'inverted' )
+                collection.push( timeUnit )
+            }
+        }
+    })
+
+    // Return the final collection.
+    return collection
+} //TimePicker.prototype.addEnabled
+
+
 /**
  * Add an item to the disabled collection.
  */
 TimePicker.prototype.addDisabled = function( collection, item ) {
+
     var clock = this
-    if ( item === false ) collection = []
-    else item.map( function( timeUnit ) {
+
+    // Go through each item to disable.
+    item.map( function( timeUnit ) {
+
+        // Add the time unit if it isn’t already within the collection.
         if ( !clock.filterDisabled( collection, timeUnit ).length ) {
             collection.push( timeUnit )
         }
+
+        // If the time unit is an array and falls within the range, just remove it.
+        else if ( $.isArray( timeUnit ) && clock.filterDisabled( collection, timeUnit, 1 ).length ) {
+            collection = clock.removeDisabled( collection, [timeUnit] )
+        }
     })
+
+    // Return the final collection.
     return collection
 } //TimePicker.prototype.addDisabled
 
@@ -545,10 +616,17 @@ TimePicker.prototype.addDisabled = function( collection, item ) {
  * Remove an item from the disabled collection.
  */
 TimePicker.prototype.removeDisabled = function( collection, item ) {
+
     var clock = this
+
+    // Go through each item to enable.
     item.map( function( timeUnit ) {
+
+        // Filter each item out of the collection.
         collection = clock.filterDisabled( collection, timeUnit, 1 )
     })
+
+    // Return the final colleciton.
     return collection
 } //TimePicker.prototype.removeDisabled
 

data/vendor/assets/javascripts/pickadate/translations/fr_FR.js

@@ -1,13 +1,13 @@
 // French
 
 jQuery.extend( jQuery.fn.pickadate.defaults, {
-    monthsFull: [ 'janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre' ],
-    monthsShort: [ 'jan', 'fev', 'mar', 'avr', 'mai', 'juin', 'juil', 'aou', 'sep', 'oct', 'nov', 'dec' ],
-    weekdaysFull: [ 'dimanche', 'lundi', 'mardy', 'mercredi', 'jeudi', 'vendredi', 'samedi' ],
-    weekdaysShort: [ 'dim', 'lun', 'mar', 'mer', 'jeu', 'ven', 'sam' ],
-    today: 'aujourd\'hui',
-    clear: 'effacer',
+    monthsFull: [ 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre' ],
+    monthsShort: [ 'Jan', 'Fev', 'Mar', 'Avr', 'Mai', 'Juin', 'Juil', 'Aou', 'Sep', 'Oct', 'Nov', 'Dec' ],
+    weekdaysFull: [ 'Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi' ],
+    weekdaysShort: [ 'Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam' ],
+    today: 'Aujourd\'hui',
+    clear: 'Effacer',
     firstDay: 1,
     format: 'dd mmmm yyyy',
     formatSubmit: 'yyyy/mm/dd'
-});
+});

data/vendor/assets/javascripts/pickadate/translations/zh_TW.js

@@ -0,0 +1,13 @@
+// Traditional Chinese
+
+jQuery.extend( jQuery.fn.pickadate.defaults, {
+    monthsFull: [ '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月' ],
+    monthsShort: [ '一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二' ],
+    weekdaysFull: [ '星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六' ],
+    weekdaysShort: [ '日', '一', '二', '三', '四', '五', '六' ],
+    today: '今天',
+    clear: '清除',
+    firstDay: 1,
+    format: 'yyyy 年 mm 月 dd 日',
+    formatSubmit: 'yyyy/mm/dd'
+});

data/vendor/assets/stylesheets/pickadate/classic.css

@@ -2,8 +2,7 @@
    $BASE-PICKER
    ========================================================================== */
 /**
- * Note: the root picker element should __NOT__ be styled
- * more than what’s here. Style the `.picker__holder` instead.
+ * Note: the root picker element should *NOT* be styled more than what’s here.
  */
 .picker {
   font-size: 16px;
@@ -12,6 +11,10 @@
   color: #000000;
   position: absolute;
   z-index: 10000;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 /**
  * The picker input element.
@@ -39,8 +42,7 @@
  * Demo: http://amsul.github.io/pickadate.js
  */
 /**
- * Note: the root picker element should __NOT__ be styled
- * more than what’s here. Style the `.picker__holder` instead.
+ * Note: the root picker element should *NOT* be styled more than what’s here.
  */
 .picker {
   width: 100%;
@@ -52,14 +54,16 @@
   position: absolute;
   background: #ffffff;
   border: 1px solid #aaaaaa;
+  border-top-width: 0;
+  border-bottom-width: 0;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   min-width: 176px;
   max-width: 466px;
-  -webkit-border-radius: 0 0 5px 5px;
-  -moz-border-radius: 0 0 5px 5px;
-  border-radius: 0 0 5px 5px;
   max-height: 0;
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
   filter: alpha(opacity=0);
@@ -68,9 +72,19 @@
   -webkit-transform: translateY(-1em) perspective(600px) rotateX(10deg);
   -moz-transform: translateY(-1em) perspective(600px) rotateX(10deg);
   transform: translateY(-1em) perspective(600px) rotateX(10deg);
-  -webkit-transition: all 0.15s ease-out, max-height 0 0.15s;
-  -moz-transition: all 0.15s ease-out, max-height 0 0.15s;
-  transition: all 0.15s ease-out, max-height 0 0.15s;
+  -webkit-transition: all 0.15s ease-out, max-height 0 0.15s, border-width 0 0.15s;
+  -moz-transition: all 0.15s ease-out, max-height 0 0.15s, border-width 0 0.15s;
+  transition: all 0.15s ease-out, max-height 0 0.15s, border-width 0 0.15s;
+}
+/**
+ * The frame and wrap work together to ensure that
+ * clicks within the picker don’t reach the holder.
+ */
+.picker__frame {
+  padding: 1px;
+}
+.picker__wrap {
+  margin: -1px;
 }
 /**
  * When the picker opens...
@@ -81,12 +95,14 @@
   filter: alpha(opacity=100);
   -moz-opacity: 1;
   opacity: 1;
+  border-top-width: 1px;
+  border-bottom-width: 1px;
   -webkit-transform: translateY(0) perspective(600px) rotateX(0);
   -moz-transform: translateY(0) perspective(600px) rotateX(0);
   transform: translateY(0) perspective(600px) rotateX(0);
-  -webkit-transition: all 0.15s ease-out, max-height 0;
-  -moz-transition: all 0.15s ease-out, max-height 0;
-  transition: all 0.15s ease-out, max-height 0;
+  -webkit-transition: all 0.15s ease-out, max-height 0, border-width 0;
+  -moz-transition: all 0.15s ease-out, max-height 0, border-width 0;
+  transition: all 0.15s ease-out, max-height 0, border-width 0;
   -webkit-box-shadow: 0 6px 18px 1px rgba(0, 0, 0, 0.12);
   -moz-box-shadow: 0 6px 18px 1px rgba(0, 0, 0, 0.12);
   box-shadow: 0 6px 18px 1px rgba(0, 0, 0, 0.12);

data/vendor/assets/stylesheets/pickadate/classic.time.css

@@ -124,4 +124,5 @@
  */
 .picker--time .picker__box {
   padding: 0;
+  position: relative;
 }

data/vendor/assets/stylesheets/pickadate/default.css

@@ -2,8 +2,7 @@
    $BASE-PICKER
    ========================================================================== */
 /**
- * Note: the root picker element should __NOT__ be styled
- * more than what’s here. Style the `.picker__holder` instead.
+ * Note: the root picker element should *NOT* be styled more than what’s here.
  */
 .picker {
   font-size: 16px;
@@ -12,6 +11,10 @@
   color: #000000;
   position: absolute;
   z-index: 10000;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 /**
  * The picker input element.
@@ -38,6 +41,9 @@
  * Default mobile-first, responsive styling for pickadate.js
  * Demo: http://amsul.github.io/pickadate.js
  */
+/**
+ * Note: the root picker element should *NOT* be styled more than what’s here.
+ */
 /**
  * Make the holder and frame fullscreen.
  */

data/vendor/assets/stylesheets/pickadate/rtl.css

@@ -0,0 +1,29 @@
+/*!
+ * Styling for RTL (right-to-left) languages using pickadate.js
+ */
+/**
+ * Switch the direction - only really necessary if
+ * it hasn’t already been applied higher up in the DOM.
+ */
+.picker {
+  direction: rtl;
+}
+/**
+ * Flip around the “next” and “previous” buttons.
+ */
+.picker__nav--next {
+  right: auto;
+  left: -1em;
+}
+.picker__nav--prev {
+  left: auto;
+  right: -1em;
+}
+.picker__nav--next:before {
+  border-left: 0;
+  border-right: 0.75em solid #000000;
+}
+.picker__nav--prev:before {
+  border-right: 0;
+  border-left: 0.75em solid #000000;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pickadate-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jeff Fraser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -105,12 +105,14 @@ files:
 - vendor/assets/javascripts/pickadate/translations/tr_TR.js
 - vendor/assets/javascripts/pickadate/translations/uk_UA.js
 - vendor/assets/javascripts/pickadate/translations/zh_CN.js
+- vendor/assets/javascripts/pickadate/translations/zh_TW.js
 - vendor/assets/stylesheets/pickadate/classic.css
 - vendor/assets/stylesheets/pickadate/classic.date.css
 - vendor/assets/stylesheets/pickadate/classic.time.css
 - vendor/assets/stylesheets/pickadate/default.css
 - vendor/assets/stylesheets/pickadate/default.date.css
 - vendor/assets/stylesheets/pickadate/default.time.css
+- vendor/assets/stylesheets/pickadate/rtl.css
 homepage: https://github.com/veracross/pickadate-rails
 licenses:
 - MIT