bootstrap-datepicker-rails 0.4 → 0.5

data/.rvmrc

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p125@bootstrap-datepicker-rails"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.11.2" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | grep -vE '^Using|Your bundle is complete'
+# fi

data/README.md

@@ -12,6 +12,10 @@ bootstrap-datepicker-rails project integrates Datepicker with Rails 3 assets pip
 
 http://github.com/Nerian/bootstrap-datepicker-rails
 
+It also integrates the improvements made by Andrew Rowls.
+
+https://github.com/eternicode/bootstrap-datepicker
+
 ## Rails > 3.1
 Include bootstrap-datepicker-rails in Gemfile;
 
@@ -33,7 +37,7 @@ and run bundle install.
 Add necessary stylesheet file to app/assets/stylesheets/application.css
 
 ``` css
-*=bootstrap-datepicker
+ *= require bootstrap-datepicker
 ```
 
 ## Javascripts
@@ -52,147 +56,8 @@ Just call datepicker() with any selector.
 $('.datepicker').datepicker()
 ```
 
-### Options
-
-#### format
-
-String.  Default: 'mm/dd/yyyy'
-
-The date format, combination of d, dd, m, mm, M, MM, yy, yyy.
-
-#### weekStart
-
-Integer.  Default: 0
-
-Day of the week start. 0 (Sunday) to 6 (Saturday)
-
-#### startDate
-
-String.  Default: Beginning of time
-
-The earliest date that may be selected; all earlier dates will be disabled.
-
-#### endDate
-
-String.  Default: End of time
-
-The latest date that may be selected; all later dates will be disabled.
-
-#### autoclose
-
-Boolean.  Default: false
-
-Whether or not to close the datepicker immediately when a date is selected.
-
-### Markup
-
-Format a component.
-
-```html 
-<div class="input-append date" id="datepicker" data-date="12-02-2012" data-date-format="dd-mm-yyyy">
-    <input class="span2" size="16" type="text" value="12-02-2012">
-    <span class="add-on"><i class="icon-th"></i></span>
-</div>
-```
-
-### Methods
-
-#### .datepicker(options)
-
-Initializes an datepicker.
-
-#### show
-
-Arguments: None
-
-Show the datepicker.
-
-```javascript
-$('#datepicker').datepicker('show');
-```
-
-#### hide
-
-Arguments: None
-
-Hide the datepicker.
-
-```javascript
-$('#datepicker').datepicker('hide');
-```
-
-#### update
+There are a lot of options you can pass to datepicker(). They are documented at [https://github.com/eternicode/bootstrap-datepicker](https://github.com/eternicode/bootstrap-datepicker)
 
-Arguments: None
-
-Update the datepicker with the current input value.
-
-```javascript
-$('#datepicker').datepicker('update');
-```
-
-#### setStartDate
-
-Arguments:
-
-* startDate (String)
-
-Sets a new lower date limit on the datepicker.
-
-```javascript
-$('#datepicker').datepicker('setStartDate', '2012-01-01');
-```
-Omit startDate (or provide an otherwise falsey value) to unset the limit.
-
-```javascript
-$('#datepicker').datepicker('setStartDate');
-$('#datepicker').datepicker('setStartDate', null);
-```
-
-#### setEndDate
-
-Arguments:
-
-* endDate (String)
-
-Sets a new upper date limit on the datepicker.
-
-```javascript
-$('#datepicker').datepicker('setEndDate', '2012-12-31');
-```
-
-Omit endDate (or provide an otherwise falsey value) to unset the limit.
-
-```javascript
-$('#datepicker').datepicker('setEndDate');
-$('#datepicker').datepicker('setEndDate', null);
-```
-
-### Events
-
-Datepicker class exposes a few events for manipulating the dates.
-
-#### show
-
-Fired when the date picker is displayed.
-
-#### hide
-
-Fired when the date picker is hidden.
-
-#### changeDate
-
-Fired when the date is changed.
-
-```javascript
-$('#date-end')
-    .datepicker()
-    .on('changeDate', function(ev){
-        if (ev.date.valueOf() < date-start-display.valueOf()){
-            ....
-        }
-    });
-```
 
 ## License
 Copyright (c) 2011 Gonzalo Rodríguez-Baltanás Díaz

data/lib/bootstrap-datepicker-rails/version.rb

@@ -1,5 +1,5 @@
 module BootstrapDatepickerRails
   module Rails
-    VERSION = "0.4"
+    VERSION = "0.5"
   end
 end

data/vendor/assets/javascripts/bootstrap-datepicker.js

@@ -3,6 +3,7 @@
  * http://www.eyecon.ro/bootstrap-datepicker
  * =========================================================
  * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +38,8 @@
 			this.element.on({
 				focus: $.proxy(this.show, this),
 				blur: $.proxy(this._hide, this),
-				keyup: $.proxy(this.update, this)
+				keyup: $.proxy(this.update, this),
+				keydown: $.proxy(this.keydown, this)
 			});
 		} else {
 			if (this.component){
@@ -113,7 +115,7 @@
 			}
 		},
 		
-		hide: function(){
+		hide: function(e){
 			this.picker.hide();
 			$(window).off('resize', this.place);
 			this.viewMode = 0;
@@ -121,7 +123,8 @@
 			if (!this.isInput) {
 				$(document).off('mousedown', this.hide);
 			}
-			this.setValue();
+			if (e && e.currentTarget.value)
+				this.setValue();
 			this.element.trigger({
 				type: 'hide',
 				date: this.date
@@ -398,6 +401,103 @@
 			e.stopPropagation();
 			e.preventDefault();
 		},
+
+		moveMonth: function(date, dir){
+			if (!dir) return date;
+			var new_date = new Date(date.valueOf()),
+				day = new_date.getDate(),
+				month = new_date.getMonth(),
+				mag = Math.abs(dir),
+				new_month, test;
+			dir = dir > 0 ? 1 : -1;
+			if (mag == 1){
+				test = dir == -1
+					// If going back one month, make sure month is not current month
+					// (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
+					? function(){ return new_date.getMonth() == month; }
+					// If going forward one month, make sure month is as expected
+					// (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
+					: function(){ return new_date.getMonth() != new_month; };
+				new_month = month + dir;
+				new_date.setMonth(new_month);
+				// Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
+				if (new_month < 0 || new_month > 11)
+					new_month = (new_month + 12) % 12;
+			} else {
+				// For magnitudes >1, move one month at a time...
+				for (var i=0; i<mag; i++)
+					// ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
+					new_date = this.moveMonth(new_date, dir);
+				// ...then reset the day, keeping it in the new month
+				new_month = new_date.getMonth();
+				new_date.setDate(day);
+				test = function(){ return new_month != new_date.getMonth(); };
+			}
+			// Common date-resetting loop -- if date is beyond end of month, make it
+			// end of month
+			while (test()){
+				new_date.setDate(--day);
+				new_date.setMonth(new_month);
+			}
+			return new_date;
+		},
+
+		moveYear: function(date, dir){
+			return this.moveMonth(date, dir*12);
+		},
+
+		keydown: function(e){
+			if (this.picker.is(':not(:visible)')){
+				if (e.keyCode == 27) // allow escape to hide and re-show picker
+					this.show();
+				return;
+			}
+			var dir, day, month;
+			switch(e.keyCode){
+				case 27: // escape
+					this.hide();
+					e.preventDefault();
+					break;
+				case 37: // left
+				case 39: // right
+					dir = e.keyCode == 37 ? -1 : 1;
+					if (e.ctrlKey){
+						this.date = this.moveYear(this.date, dir);
+						this.viewDate = this.moveYear(this.viewDate, dir);
+					} else if (e.shiftKey){
+						this.date = this.moveMonth(this.date, dir);
+						this.viewDate = this.moveMonth(this.viewDate, dir);
+					} else {
+						this.date.setDate(this.date.getDate() + dir);
+						this.viewDate.setDate(this.viewDate.getDate() + dir);
+					}
+					this.setValue();
+					this.update();
+					e.preventDefault();
+					break;
+				case 38: // up
+				case 40: // down
+					dir = e.keyCode == 38 ? -1 : 1;
+					if (e.ctrlKey){
+						this.date = this.moveYear(this.date, dir);
+						this.viewDate = this.moveYear(this.viewDate, dir);
+					} else if (e.shiftKey){
+						this.date = this.moveMonth(this.date, dir);
+						this.viewDate = this.moveMonth(this.viewDate, dir);
+					} else {
+						this.date.setDate(this.date.getDate() + dir * 7);
+						this.viewDate.setDate(this.viewDate.getDate() + dir * 7);
+					}
+					this.setValue();
+					this.update();
+					e.preventDefault();
+					break;
+				case 13: // enter
+					this.hide();
+					e.preventDefault();
+					break;
+			}
+		},
 		
 		showMode: function(dir) {
 			if (dir) {
@@ -466,9 +566,10 @@
 		},
 		parseDate: function(date, format) {
 			if (date instanceof Date) return date;
-			var parts = date.split(format.separator),
-				date = new Date(1970, 1, 1, 0, 0, 0),
+			var parts = date ? date.split(format.separator) : [],
+				date = new Date(),
 				val, filtered;
+			date = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
 			if (parts.length == format.parts.length) {
 				for (var i=0, cnt = format.parts.length; i < cnt; i++) {
 					val = parseInt(parts[i], 10)||1;

data/vendor/assets/stylesheets/bootstrap-datepicker.css

@@ -2,6 +2,7 @@
  * Datepicker for Bootstrap
  *
  * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-datepicker-rails
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70298307018260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298307018260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70298307021480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70298307021480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70298306700540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298306700540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A date picker for Twitter Bootstrap
 email:
 - siotopo@gmail.com
@@ -52,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - README.md
 - Rakefile
@@ -76,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 601702732678368938
+      hash: -3256137021559220675
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 601702732678368938
+      hash: -3256137021559220675
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: A date picker for Twitter Bootstrap