pickadate-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b81367f90f3d6dee7f72cf6d8a6e9a006fa352
-  data.tar.gz: 1629cb671ef09e5e28c562796bcc9b03eaef468d
+  metadata.gz: 9a4960ce8c268fa246c31d341b14ffd516322b94
+  data.tar.gz: 47857e18fda875db3afbf6b33716b3f844661d53
 SHA512:
-  metadata.gz: a107b42a2766e930a491fa7c8a195543ee59a31652b62d5c338f224abc8751d454bf4dec328c28580f7e29ad799c80e146b97a9ea532a7ac8bd952efd723aa83
-  data.tar.gz: 8f20da9035b8a2891d76ba1cae06c97ed66f675f66befb45b7f6bc62ac7332dc328869c561f6e9778deaa6fd7a199da3609b9584b4a86e2400ce7581ee87530d
+  metadata.gz: d648c29457b37d37e9eb17a26a8dac0bef6ead19029eaa3d03732cb9dc3b6b0e53d43d144b11bddc5882b1f030a161884cecf61bd231ccb6c60eb4975c0c77fd
+  data.tar.gz: 9684c1c258d2a42543e682a9a5129ef1f4c4933cd4e1eb326b2bd142995fcb299b536c92b32110d617777189d60f942379806de6070eb8b5ec777e3c50e25eb5

data/README.md

@@ -1,6 +1,6 @@
 # Pickadate-Rails
 
-## Pickadate Version: 3.0.3
+## Pickadate Version: 3.0.4
 
 Easily add [pickadate.js](https://github.com/amsul/pickadate.js) to your Rails 3.1+ application using the asset pipeline.
 
@@ -18,13 +18,15 @@ And then execute:
 
 Pickadate has a number of files associated with it. They are documented on the [pickadate repository](https://github.com/amsul/pickadate.js). Files in this gem are namespaced into a `pickadate` folder, and otherwise match the filenames from the pickadate repo.
 
-### Add the desired files to your javascript/coffeescript files (often `application.js` or `application.js.coffee`):
+### Add the desired files to your javascript/coffeescript
+Often done in `application.js`:
 
     //= require pickadate/picker # required
     //= require pickadate/picker.date # for the date picker
     //= require pickadate/picker.time # for the time picker
 
-### Add the stylesheets for the theme you want to your stylesheet file (often `application.css`)
+### Add the stylesheets for the theme you want
+Often done in `application.css`.
 
 For the default theme:
 
@@ -38,7 +40,7 @@ For the classic theme:
     *= require pickadate/classic.date
     *= require pickadate/classic.time
 
-### Localizations
+### Localization
 
 Translations are available by loading them in your javascript/coffeescript file. For example, in `application.js`
 

data/lib/pickadate-rails/version.rb

@@ -1,3 +1,3 @@
 module PickadateRails
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

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

@@ -1,6 +1,6 @@
 
 /*!
- * Date picker for pickadate.js v3.0.3
+ * Date picker for pickadate.js v3.0.4
  * http://amsul.github.io/pickadate.js/date.htm
  */
 
@@ -156,31 +156,31 @@ DatePicker.prototype.create = function( type, value, options ) {
     var isInfiniteValue,
         calendar = 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 infinity, update the value.
+    // If it’s infinity, update the value.
     if ( value == -Infinity || value == Infinity ) {
         isInfiniteValue = value
     }
 
-    // If it's an object, use the “time” value.
+    // If it’s an object, use the native date object.
     else if ( Picker._.isObject( value ) && Picker._.isInteger( value.pick ) ) {
         value = value.obj
     }
 
-    // If it's an array, convert it into a date.
+    // If it’s an array, convert it into a date.
     else if ( Array.isArray( value ) ) {
         value = new Date( value[ 0 ], value[ 1 ], value[ 2 ] )
     }
 
-    // If it's a number or date object, make a normalized date.
+    // If it’s a number or date object, make a normalized date.
     else if ( Picker._.isInteger( value ) || Picker._.isDate( value ) ) {
         value = calendar.normalize( new Date( value ), options )
     }
 
-    // If it's a literal true or any other case, set it to now.
+    // If it’s a literal true or any other case, set it to now.
     else /*if ( value === true )*/ {
         value = calendar.now( type, value, options )
     }
@@ -285,6 +285,9 @@ DatePicker.prototype.validate = function( type, dateObject, options ) {
         // Make sure we have an interval.
         interval = options && options.interval ? options.interval : 1,
 
+        // Check if the calendar enabled dates are inverted.
+        isInverted = calendar.item.enable === -1,
+
         // Check if we have any enabled dates after/before now.
         hasEnabledBeforeTarget, hasEnabledAfterTarget,
 
@@ -295,8 +298,8 @@ DatePicker.prototype.validate = function( type, dateObject, options ) {
         // Check if we’ve reached the limit during shifting.
         reachedMin, reachedMax,
 
-        // Check if the calendar is flipped and at least one weekday is enabled.
-        hasEnabledWeekdays = calendar.item.enable === -1 && calendar.item.disable.filter( function( value ) {
+        // Check if the calendar is inverted and at least one weekday is enabled.
+        hasEnabledWeekdays = isInverted && calendar.item.disable.filter( function( value ) {
 
             // If there’s a date, check where it is relative to the target.
             if ( Array.isArray( value ) ) {
@@ -311,16 +314,26 @@ DatePicker.prototype.validate = function( type, dateObject, options ) {
 
 
 
-    // No need to validate if we’re navigating months or there are no enabled days.
+    // Cases to validate for:
+    // [1] Not inverted and date disabled.
+    // [2] Inverted and some dates enabled.
+    // [3] Out of range.
+    //
+    // Cases to **not** validate for:
+    // • Not inverted and date enabled.
+    // • Inverted and all dates disabled.
+    // • Navigating months.
+    // • ..and anything else.
     if (
-        ( !( options && options.nav ) && !( !hasEnabledWeekdays && !hasEnabledBeforeTarget && !hasEnabledAfterTarget ) ) ||
-        ( dateObject.pick <= minLimitObject.pick || dateObject.pick >= maxLimitObject.pick )
+        /* 1 */ ( !isInverted && calendar.disabled( dateObject ) ) ||
+        /* 2 */ ( isInverted && calendar.disabled( dateObject ) && ( hasEnabledWeekdays || hasEnabledBeforeTarget || hasEnabledAfterTarget ) ) ||
+        /* 3 */ ( dateObject.pick <= minLimitObject.pick || dateObject.pick >= maxLimitObject.pick )
     ) {
 
 
-        // Flip the direction if there aren’t any enabled weekdays
+        // 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 ( !hasEnabledWeekdays && ( ( !hasEnabledAfterTarget && interval > 0 ) || ( !hasEnabledBeforeTarget && interval < 0 ) ) ) {
+        if ( isInverted && !hasEnabledWeekdays && ( ( !hasEnabledAfterTarget && interval > 0 ) || ( !hasEnabledBeforeTarget && interval < 0 ) ) ) {
             interval *= -1
         }
 
@@ -547,18 +560,18 @@ DatePicker.prototype.flipItem = function( type, value/*, options*/ ) {
 
     var calendar = this,
         collection = calendar.item.disable,
-        isFlipped = calendar.item.enable === -1
+        isInverted = calendar.item.enable === -1
 
     // Flip the enabled and disabled dates.
     if ( value == 'flip' ) {
-        calendar.item.enable = isFlipped ? 1 : -1
+        calendar.item.enable = isInverted ? 1 : -1
     }
 
     // Check if we have to add/remove from collection.
-    else if ( !isFlipped && type == 'enable' || isFlipped && type == 'disable' ) {
+    else if ( !isInverted && type == 'enable' || isInverted && type == 'disable' ) {
         collection = calendar.removeDisabled( collection, value )
     }
-    else if ( !isFlipped && type == 'disable' || isFlipped && type == 'enable' ) {
+    else if ( !isInverted && type == 'disable' || isInverted && type == 'enable' ) {
         collection = calendar.addDisabled( collection, value )
     }
 
@@ -669,7 +682,7 @@ DatePicker.prototype.nodes = function( isOpen ) {
         }, //createMonthNav
 
 
-        // Create the month label
+        // Create the month label.
         createMonthLabel = function( monthsCollection ) {
 
             // If there are months to select, add a dropdown menu.
@@ -707,7 +720,7 @@ DatePicker.prototype.nodes = function( isOpen ) {
         }, //createMonthLabel
 
 
-        // Create the year label
+        // Create the year label.
         createYearLabel = function() {
 
             var focusedYear = viewsetObject.year,
@@ -786,51 +799,54 @@ DatePicker.prototype.nodes = function( isOpen ) {
                 node: 'tr',
                 item: function( rowCounter ) {
 
+                    // If Monday is the first day and the month starts on Sunday, shift the date back a week.
+                    var shiftDateBy = settings.firstDay && calendar.create([ viewsetObject.year, viewsetObject.month, 1 ]).day === 0 ? -7 : 0
+
                     return [
                         Picker._.group({
-                            min: DAYS_IN_WEEK * rowCounter - viewsetObject.day + 1, // Add 1 for weekday 0index
+                            min: DAYS_IN_WEEK * rowCounter - viewsetObject.day + shiftDateBy + 1, // Add 1 for weekday 0index
                             max: function() {
                                 return this.min + DAYS_IN_WEEK - 1
                             },
                             i: 1,
                             node: 'td',
-                            item: function( timeDate ) {
+                            item: function( targetDate ) {
 
-                                // Convert the time date from a relative date to a date object
-                                timeDate = calendar.create([ viewsetObject.year, viewsetObject.month, timeDate + ( settings.firstDay ? 1 : 0 ) ])
+                                // Convert the time date from a relative date to a target date.
+                                targetDate = calendar.create([ viewsetObject.year, viewsetObject.month, targetDate + ( settings.firstDay ? 1 : 0 ) ])
 
                                 return [
                                     Picker._.node(
                                         'div',
-                                        timeDate.date,
+                                        targetDate.date,
                                         (function( klasses ) {
 
                                             // Add the `infocus` or `outfocus` classes based on month in view.
-                                            klasses.push( viewsetObject.month == timeDate.month ? settings.klass.infocus : settings.klass.outfocus )
+                                            klasses.push( viewsetObject.month == targetDate.month ? settings.klass.infocus : settings.klass.outfocus )
 
                                             // Add the `today` class if needed.
-                                            if ( nowObject.pick == timeDate.pick ) {
+                                            if ( nowObject.pick == targetDate.pick ) {
                                                 klasses.push( settings.klass.now )
                                             }
 
                                             // Add the `selected` class if something's selected and the time matches.
-                                            if ( selectedObject && selectedObject.pick == timeDate.pick ) {
+                                            if ( selectedObject && selectedObject.pick == targetDate.pick ) {
                                                 klasses.push( settings.klass.selected )
                                             }
 
                                             // Add the `highlighted` class if something's highlighted and the time matches.
-                                            if ( highlightedObject && highlightedObject.pick == timeDate.pick ) {
+                                            if ( highlightedObject && highlightedObject.pick == targetDate.pick ) {
                                                 klasses.push( settings.klass.highlighted )
                                             }
 
                                             // Add the `disabled` class if something's disabled and the object matches.
-                                            if ( disabledCollection && calendar.disabled( timeDate ) || timeDate.pick < minLimitObject.pick || timeDate.pick > maxLimitObject.pick ) {
+                                            if ( disabledCollection && calendar.disabled( targetDate ) || targetDate.pick < minLimitObject.pick || targetDate.pick > maxLimitObject.pick ) {
                                                 klasses.push( settings.klass.disabled )
                                             }
 
                                             return klasses.join( ' ' )
                                         })([ settings.klass.day ]),
-                                        'data-pick=' + timeDate.pick
+                                        'data-pick=' + targetDate.pick
                                     )
                                 ] //endreturn
                             }

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

@@ -1,6 +1,6 @@
 
 /*!
- * pickadate.js v3.0.3, 2013/05/23
+ * pickadate.js v3.0.4, 2013/05/25
  * By Amsul, http://amsul.ca
  * Hosted on http://amsul.github.io/pickadate.js
  * Licensed under MIT

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

@@ -1,6 +1,6 @@
 
 /*!
- * Time picker for pickadate.js v3.0.3
+ * Time picker for pickadate.js v3.0.4
  * http://amsul.github.io/pickadate.js/time.htm
  */
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pickadate-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeff Fraser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties