webshims-rails 1.15.5 → 1.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f62cf267399136bf9d595a21dd08ecab5ce05e
-  data.tar.gz: 06c7d3129c32b4f13e09e51efe9b3d0fe6bf43e6
+  metadata.gz: f2a250a396c3e4575c9554236d514bad8290e5f6
+  data.tar.gz: f90db279b3ca307408ff113748796d1e460b82b3
 SHA512:
-  metadata.gz: da45e530703f377bb8494449907a6af502a7b8982fc7336da8b7e21d5fc04eab93d9c786fc1ffe74316afabde8b919e010040b448956d05fde1392d0b43511c7
-  data.tar.gz: 11fba75988dcd55dd5e250ffba765e3db6b3f819c5decb3dc169e66bc614dfd468648c248e9062599503eeabd5d741cdaeeac789521a65ed0b9dc725db897498
+  metadata.gz: 0402b922725d3d57f5f8a44de06cb8779591a4e0f32792b031f516fc077701a48a3e69697afa3cb9a0b055fd88b0ce30035c0e6d37828e210121349e4a2a4028
+  data.tar.gz: 3aaf77b51124c8aa9d1bd092d7134290e94977c142e70146f3d027cb77670d8e7807a6b71cbc06781b15962afc2aa6602d0cf3560445b8045cc934bb913fdc1c

data/CHANGES.md

@@ -0,0 +1,3 @@
+2015-01-04
+-------------------
+* Removed modernizr-custom from documentation, since webshims has removed its custom modernizr build. If your app depends on Modernizr, you'll have to build and include your own version.

data/lib/webshims-rails/version.rb

@@ -1,6 +1,6 @@
 module Webshims
   module Rails
-    VERSION = "1.15.5"
-    WEBSHIMS_VERSION = "1.15.5"
+    VERSION = "1.15.6"
+    WEBSHIMS_VERSION = "1.15.6"
   end
 end

data/readme.textile

@@ -22,16 +22,13 @@ $.webshims.setOptions('basePath', '/webshims/shims/')
 h2. Usage
 
 1. Add webshims-rails to your Gemfile for bundler: @gem 'webshims-rails'@
-2. Require modernizr and the webshims polyfiller, eg, in your application.js:
+2. Require the webshims polyfiller, eg, in your application.js:
 
 <pre>
-//= require webshims/extras/modernizr-custom
 //= require webshims/polyfiller
 </pre>
 
-*Update note:* Previous webshims-rails included only the minified versions; this was incorrect, since the dev (unminified) versions should be required by Sprockets and then the Rails asset pipeline will minify as necessary in production. The unminified ('dev') versions have been moved up a directory to simplify the require paths.
-
-Users of previous webshims-rails versions should update their sprockets requires and webshims options as below (though I'll leave the minified assets in there to prevent errors).
+*Update note:* Previous webshims versions included a custom modernizr build; this was removed in webshims 1.14.6, so the (previously necessary) `require webshims/extras/modernizr-custom` line should be removed, and if your app requires modernizr, you'll have to build and require it yourself.
 
 3. In your javascript, after the polyfiller has been required, set the basePath for webshims as shown below, and then call $.webshims.polyfill(); see webshims docs for more options.
 (Note that this should be run directly, not in a dom-ready block.)

data/vendor/assets/javascripts/webshims/polyfiller.js

@@ -137,7 +137,7 @@
 	}
 
 	$.extend(webshims, {
-		version: '1.15.5',
+		version: '1.15.6',
 
 		cfg: {
 			enhanceAuto: window.Audio && (!window.matchMedia || matchMedia('(min-device-width: 721px)').matches),

data/vendor/assets/javascripts/webshims/shims/combos/10.js

@@ -1234,7 +1234,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	
 })();
 });
-;(function($){
+(function ($) {
 	"use strict";
 
 	var isNumber = function(string){
@@ -1854,7 +1854,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		webshims.isReady('range-ui', true);
 	}
 })(window.webshims ? webshims.$ : jQuery);
-;webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
+webshims.register('form-number-date-ui', function ($, webshims, window, document, undefined, options) {
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
@@ -2419,9 +2419,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return val;
 			},
 			month: function(val, opts, noCorrect){
-				
-				var p = (!opts.splitInput) ? val.trim().split(/[\.\s-\/\\]+/) : val;
-				
+				var regSplit = opts.monthNames == 'monthNamesShort' ? /[\s-\/\\]+/ : /[\.\s-\/\\]+/;
+				var p = (!opts.splitInput) ? val.trim().split(regSplit) : val;
+
 				if(p.length == 2 && p[0] && p[1]){
 					p[0] = !noCorrect && curCfg.date.monthkeys[p[0]] || p[0];
 					p[1] = !noCorrect && curCfg.date.monthkeys[p[1]] || p[1];
@@ -2893,34 +2893,35 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(isValue){
-					this._beforeValue(val);
-				} else {
-					this.elemHelper.prop(name, val);
-				}
+				if(!this._init || force || val || this.options[name] !== val){
+					if(isValue){
+						this._beforeValue(val);
+					} else {
+						this.elemHelper.prop(name, val);
+					}
 
-				val = formatVal[this.type](val, this.options);
-				if(this.options.splitInput){
-					$.each(this.splits, function(i, elem){
-						var setOption;
-						if(!(name in elem) && !isValue && $.nodeName(elem, 'select')){
-							$('option[value="'+ val[i] +'"]', elem).prop('defaultSelected', true);
-						} else {
-							$.prop(elem, name, val[i]);
+					val = formatVal[this.type](val, this.options);
+					if(this.options.splitInput){
+						$.each(this.splits, function(i, elem){
+							if(!(name in elem) && !isValue && $.nodeName(elem, 'select')){
+								$('option[value="'+ val[i] +'"]', elem).prop('defaultSelected', true);
+							} else {
+								$.prop(elem, name, val[i]);
+							}
+						});
+					} else {
+						val = this.toFixed(val);
+						if(isLive && this._getSelectionEnd){
+							selectionEnd = this._getSelectionEnd(val);
+						}
+						this.element.prop(name, val);
+						if(selectionEnd != null){
+							this.element.prop('selectionEnd', selectionEnd);
 						}
-					});
-				} else {
-					val = this.toFixed(val);
-					if(isLive && this._getSelectionEnd){
-						selectionEnd = this._getSelectionEnd(val);
-					}
-					this.element.prop(name, val);
-					if(selectionEnd != null){
-						this.element.prop('selectionEnd', selectionEnd);
 					}
+					this._propertyChange(name);
+					this.mirrorValidity();
 				}
-				this._propertyChange(name);
-				this.mirrorValidity();
 			};
 		});
 		
@@ -3270,7 +3271,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				} else {
 					popover.hide();
 				}
-			}
+			};
 			
 			
 			options.containerElements.push(popover.element[0]);
@@ -3376,7 +3377,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 									popover.activeElement.focus();
 								}, 4);
 							}
-							if(data.element.is(':focus')  && !$.nodeName(e.target, 'select')){
+							if(data.element.is(':focus') && !$.nodeName(e.target, 'select')){
 								popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 								show();
 							}
@@ -3693,7 +3694,11 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					$(data.shim.options.containerElements)
 						.on({
 							'focusin focus focusout blur': function(e){
-								e.stopImmediatePropagation();
+								if(e.type == 'focus'){
+									e.stopPropagation();
+								} else {
+									e.stopImmediatePropagation();
+								}
 								hasFocus = has[e.type];
 								clearTimeout(timer);
 								timer = setTimeout(function(){

data/vendor/assets/javascripts/webshims/shims/combos/11.js

@@ -618,7 +618,7 @@
 		webshims.isReady('range-ui', true);
 	}
 })(window.webshims ? webshims.$ : jQuery);
-;webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
+webshims.register('form-number-date-ui', function ($, webshims, window, document, undefined, options) {
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
@@ -1183,9 +1183,9 @@
 				return val;
 			},
 			month: function(val, opts, noCorrect){
-				
-				var p = (!opts.splitInput) ? val.trim().split(/[\.\s-\/\\]+/) : val;
-				
+				var regSplit = opts.monthNames == 'monthNamesShort' ? /[\s-\/\\]+/ : /[\.\s-\/\\]+/;
+				var p = (!opts.splitInput) ? val.trim().split(regSplit) : val;
+
 				if(p.length == 2 && p[0] && p[1]){
 					p[0] = !noCorrect && curCfg.date.monthkeys[p[0]] || p[0];
 					p[1] = !noCorrect && curCfg.date.monthkeys[p[1]] || p[1];
@@ -1657,34 +1657,35 @@
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(isValue){
-					this._beforeValue(val);
-				} else {
-					this.elemHelper.prop(name, val);
-				}
+				if(!this._init || force || val || this.options[name] !== val){
+					if(isValue){
+						this._beforeValue(val);
+					} else {
+						this.elemHelper.prop(name, val);
+					}
 
-				val = formatVal[this.type](val, this.options);
-				if(this.options.splitInput){
-					$.each(this.splits, function(i, elem){
-						var setOption;
-						if(!(name in elem) && !isValue && $.nodeName(elem, 'select')){
-							$('option[value="'+ val[i] +'"]', elem).prop('defaultSelected', true);
-						} else {
-							$.prop(elem, name, val[i]);
+					val = formatVal[this.type](val, this.options);
+					if(this.options.splitInput){
+						$.each(this.splits, function(i, elem){
+							if(!(name in elem) && !isValue && $.nodeName(elem, 'select')){
+								$('option[value="'+ val[i] +'"]', elem).prop('defaultSelected', true);
+							} else {
+								$.prop(elem, name, val[i]);
+							}
+						});
+					} else {
+						val = this.toFixed(val);
+						if(isLive && this._getSelectionEnd){
+							selectionEnd = this._getSelectionEnd(val);
+						}
+						this.element.prop(name, val);
+						if(selectionEnd != null){
+							this.element.prop('selectionEnd', selectionEnd);
 						}
-					});
-				} else {
-					val = this.toFixed(val);
-					if(isLive && this._getSelectionEnd){
-						selectionEnd = this._getSelectionEnd(val);
-					}
-					this.element.prop(name, val);
-					if(selectionEnd != null){
-						this.element.prop('selectionEnd', selectionEnd);
 					}
+					this._propertyChange(name);
+					this.mirrorValidity();
 				}
-				this._propertyChange(name);
-				this.mirrorValidity();
 			};
 		});
 		
@@ -2034,7 +2035,7 @@
 				} else {
 					popover.hide();
 				}
-			}
+			};
 			
 			
 			options.containerElements.push(popover.element[0]);
@@ -2140,7 +2141,7 @@
 									popover.activeElement.focus();
 								}, 4);
 							}
-							if(data.element.is(':focus')  && !$.nodeName(e.target, 'select')){
+							if(data.element.is(':focus') && !$.nodeName(e.target, 'select')){
 								popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 								show();
 							}
@@ -2457,7 +2458,11 @@
 					$(data.shim.options.containerElements)
 						.on({
 							'focusin focus focusout blur': function(e){
-								e.stopImmediatePropagation();
+								if(e.type == 'focus'){
+									e.stopPropagation();
+								} else {
+									e.stopImmediatePropagation();
+								}
 								hasFocus = has[e.type];
 								clearTimeout(timer);
 								timer = setTimeout(function(){

data/vendor/assets/javascripts/webshims/shims/combos/17.js

@@ -614,7 +614,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 	}
 	
 });
-;(function($){
+(function ($) {
 	"use strict";
 
 	var isNumber = function(string){
@@ -1234,7 +1234,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		webshims.isReady('range-ui', true);
 	}
 })(window.webshims ? webshims.$ : jQuery);
-;webshims.register('form-number-date-ui', function($, webshims, window, document, undefined, options){
+webshims.register('form-number-date-ui', function ($, webshims, window, document, undefined, options) {
 	"use strict";
 	var curCfg;
 	var formcfg = webshims.formcfg;
@@ -1799,9 +1799,9 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				return val;
 			},
 			month: function(val, opts, noCorrect){
-				
-				var p = (!opts.splitInput) ? val.trim().split(/[\.\s-\/\\]+/) : val;
-				
+				var regSplit = opts.monthNames == 'monthNamesShort' ? /[\s-\/\\]+/ : /[\.\s-\/\\]+/;
+				var p = (!opts.splitInput) ? val.trim().split(regSplit) : val;
+
 				if(p.length == 2 && p[0] && p[1]){
 					p[0] = !noCorrect && curCfg.date.monthkeys[p[0]] || p[0];
 					p[1] = !noCorrect && curCfg.date.monthkeys[p[1]] || p[1];
@@ -2273,34 +2273,35 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(isValue){
-					this._beforeValue(val);
-				} else {
-					this.elemHelper.prop(name, val);
-				}
+				if(!this._init || force || val || this.options[name] !== val){
+					if(isValue){
+						this._beforeValue(val);
+					} else {
+						this.elemHelper.prop(name, val);
+					}
 
-				val = formatVal[this.type](val, this.options);
-				if(this.options.splitInput){
-					$.each(this.splits, function(i, elem){
-						var setOption;
-						if(!(name in elem) && !isValue && $.nodeName(elem, 'select')){
-							$('option[value="'+ val[i] +'"]', elem).prop('defaultSelected', true);
-						} else {
-							$.prop(elem, name, val[i]);
+					val = formatVal[this.type](val, this.options);
+					if(this.options.splitInput){
+						$.each(this.splits, function(i, elem){
+							if(!(name in elem) && !isValue && $.nodeName(elem, 'select')){
+								$('option[value="'+ val[i] +'"]', elem).prop('defaultSelected', true);
+							} else {
+								$.prop(elem, name, val[i]);
+							}
+						});
+					} else {
+						val = this.toFixed(val);
+						if(isLive && this._getSelectionEnd){
+							selectionEnd = this._getSelectionEnd(val);
+						}
+						this.element.prop(name, val);
+						if(selectionEnd != null){
+							this.element.prop('selectionEnd', selectionEnd);
 						}
-					});
-				} else {
-					val = this.toFixed(val);
-					if(isLive && this._getSelectionEnd){
-						selectionEnd = this._getSelectionEnd(val);
-					}
-					this.element.prop(name, val);
-					if(selectionEnd != null){
-						this.element.prop('selectionEnd', selectionEnd);
 					}
+					this._propertyChange(name);
+					this.mirrorValidity();
 				}
-				this._propertyChange(name);
-				this.mirrorValidity();
 			};
 		});
 		
@@ -2650,7 +2651,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				} else {
 					popover.hide();
 				}
-			}
+			};
 			
 			
 			options.containerElements.push(popover.element[0]);
@@ -2756,7 +2757,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 									popover.activeElement.focus();
 								}, 4);
 							}
-							if(data.element.is(':focus')  && !$.nodeName(e.target, 'select')){
+							if(data.element.is(':focus') && !$.nodeName(e.target, 'select')){
 								popover.openedByFocus = options.buttonOnly ? false : !options.noInput;
 								show();
 							}
@@ -3073,7 +3074,11 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					$(data.shim.options.containerElements)
 						.on({
 							'focusin focus focusout blur': function(e){
-								e.stopImmediatePropagation();
+								if(e.type == 'focus'){
+									e.stopPropagation();
+								} else {
+									e.stopImmediatePropagation();
+								}
 								hasFocus = has[e.type];
 								clearTimeout(timer);
 								timer = setTimeout(function(){