webshims-rails 1.11.1 → 1.11.2

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

@@ -16,9 +16,9 @@
 			var i;
 			
 			
-			this.element.addClass('ws-range').attr({role: 'slider'}).append('<span class="ws-range-min" /><span class="ws-range-rail"><span class="ws-range-thumb" /></span>');
-			this.trail = $('.ws-range-rail', this.element);
-			this.range = $('.ws-range-min', this.element);
+			this.element.addClass('ws-range').attr({role: 'slider'}).append('<span class="ws-range-min ws-range-progress" /><span class="ws-range-rail ws-range-track"><span class="ws-range-thumb" /></span>');
+			this.trail = $('.ws-range-track', this.element);
+			this.range = $('.ws-range-progress ', this.element);
 			this.thumb = $('.ws-range-thumb', this.trail);
 			
 			this.updateMetrics();
@@ -28,6 +28,7 @@
 			for(i = 0; i < createOpts.length; i++){
 				this[createOpts[i]](this.options[createOpts[i]]);
 			}
+			
 			this.value = this._value;
 			this.value(this.options.value);
 			this.initDataList();
@@ -266,7 +267,7 @@
 			}
 		},
 		addBindings: function(){
-			var leftOffset, widgetUnits, hasFocus;
+			var leftOffset, widgetUnits, hasFocus, isActive;
 			var that = this;
 			var o = this.options;
 			
@@ -296,8 +297,28 @@
 					}
 				};
 			})();
-			
+			var normalizeTouch = (function(){
+				var types = {
+					touchstart: 1,
+					touchend: 1,
+					touchmove: 1
+				};
+				var normalize = ['pageX', 'pageY'];
+				return function(e){
+					if(types[e.type] && e.originalEvent && e.originalEvent.touches && e.originalEvent.touches.length){
+						for(var i = 0; i < normalize.length; i++){
+							e[normalize[i]] = e.originalEvent.touches[0][normalize[i]];
+						}
+						
+					}
+					return e;
+				};
+			})();
 			var setValueFromPos = function(e, animate){
+				if(e.type == 'touchmove'){
+					e.preventDefault();
+					normalizeTouch(e);
+				}
 				
 				var val = that.getStepedValueFromPos((e[that.dirs.mouse] - leftOffset) * widgetUnits);
 				if(val != o.value){
@@ -314,18 +335,25 @@
 					eventTimer.call('change', o.value);
 				}
 				that.addRemoveClass('ws-active');
-				$(document).off('mousemove', setValueFromPos).off('mouseup', remove);
+				$(document).off('mousemove touchmove', setValueFromPos).off('mouseup touchend', remove);
 				$(window).off('blur', removeWin);
+				isActive = false;
 			};
 			var removeWin = function(e){
 				if(e.target == window){remove();}
 			};
 			var add = function(e){
 				var outerWidth;
+				
+				if(isActive || (e.type == 'touchstart' && (!e.originalEvent || !e.originalEvent.touches || e.originalEvent.touches.length != 1))){
+					return;
+				}
 				e.preventDefault();
-				$(document).off('mousemove', setValueFromPos).off('mouseup', remove);
+				
+				$(document).off('mousemove touchmove', setValueFromPos).off('mouseup touchend', remove);
 				$(window).off('blur', removeWin);
 				if(!o.readonly && !o.disabled){
+					normalizeTouch(e);
 					that.element.focus();
 					that.addRemoveClass('ws-active', true);
 					leftOffset = that.element.focus().offset();
@@ -335,20 +363,27 @@
 					leftOffset = leftOffset[that.dirs.pos];
 					widgetUnits = 100 / widgetUnits;
 					setValueFromPos(e, o.animate);
+					isActive = true;
 					$(document)
-						.on({
-							mouseup: remove,
-							mousemove: setValueFromPos
-						})
+						.on(e.type == 'touchstart' ?
+							{
+								touchend: remove,
+								touchmove: setValueFromPos
+							} :
+							{
+								mouseup: remove,
+								mousemove: setValueFromPos
+							}
+						)
 					;
 					$(window).on('blur', removeWin);
 					e.stopPropagation();
 				}
 			};
 			var elementEvts = {
-				mousedown: add,
+				'touchstart mousedown': add,
 				focus: function(e){
-					if(!o.disabled){
+					if(!o.disabled && !hasFocus){
 						eventTimer.init('input', o.value);
 						eventTimer.init('change', o.value);
 						that.addRemoveClass('ws-focus', true);
@@ -411,6 +446,20 @@
 			this.thumb.on({
 				mousedown: add
 			});
+			
+			if(this.orig){
+				$(this.orig).jProp('form').on('reset', function(){
+					var val = $.prop(that.orig, 'value');
+					that.value(val);
+					setTimeout(function(){
+						var val2 = $.prop(that.orig, 'value');
+						if(val != val2){
+							that.value(val2);
+						}
+					}, 4);
+				});
+			}
+			
 			if (window.webshims) {
 				webshims.ready('WINDOWLOAD', function(){
 					webshims.ready('dom-support', function(){
@@ -516,8 +565,8 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		var str;
 		return function(){
 			if(!str){
-				str = ('<option></option>')+$.map(monthDigits, function(val){
-					return '<option>'+val+'</option>';
+				str = ('<option value=""></option>')+$.map(monthDigits, function(val){
+					return '<option value="'+val+'"]>'+val+'</option>';
 				}).join('');
 			}
 			return str;
@@ -539,7 +588,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					splits: [$('<input type="text" class="yy" size="4" inputmode="numeric" />')[0]] 
 				};
 				if(opts.monthSelect){
-					obj.splits.push($('<select class="mm">'+getMonthOptions()+'</select>')[0]);
+					obj.splits.push($('<select class="mm">'+getMonthOptions(opts)+'</select>')[0]);
 				} else {
 					obj.splits.push($('<input type="text" class="mm" inputmode="numeric" maxlength="2" size="2" />')[0]);
 				}
@@ -574,7 +623,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					splits: [$('<input type="text" class="yy" inputmode="numeric" size="4" />')[0]] 
 				};
 				if(opts.monthSelect){
-					obj.splits.push($('<select class="mm ws-spin">'+getMonthOptions()+'</select>')[0]);
+					obj.splits.push($('<select class="mm ws-spin">'+getMonthOptions(opts)+'</select>')[0]);
 				} else {
 					obj.splits.push($('<input type="text" class="mm ws-spin" />')[0]);
 					if(opts.onlyMonthDigits){
@@ -666,6 +715,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			month:  {
 				currentText: 'Aktueller Monat'
 			},
+			time:  {
+				currentText: 'Jetzt'
+			},
 			date: {
 				close: 'schließen',
 				clear: 'Löschen',
@@ -703,6 +755,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			month:  {
 				currentText: 'This month'
 			},
+			time: {
+				"currentText": "Now"
+			},
 			date: {
 				"closeText": "Done",
 				clear: 'Clear',
@@ -765,6 +820,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			if(!langCfg['datetime-localSigns']){
 				langCfg['datetime-localSigns'] = langCfg.dateSigns+langCfg.timeSigns;
 			}
+			if(!langCfg['datetime-local']){
+				langCfg['datetime-local'] = {};
+			}
+			if(!langCfg['datetime-local'].currentText && langCfg.time.currentText){
+				langCfg['datetime-local'].currentText = langCfg.time.currentText;
+			}
 		};
 		var triggerLocaleChange = function(){
 			processLangCFG(curCfg);
@@ -832,6 +893,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					} else {
 						fVal = 0;
 					}
+					if(val[0] === '00'){ 
+						val[0] = '12';
+					}
 					val = $.trim(val.join(':')) + ' '+ curCfg.meridian[fVal];
 				}
 				return val;
@@ -916,6 +980,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			time: function(val){
 				var fVal;
 				if(val && curCfg.meridian){
+					if(val.substr(0,2) === "12"){ 
+						val = "00" + val.substr(2);
+					}
 					if(val.indexOf(curCfg.meridian[1]) != -1){
 						val = val.split(':');
 						fVal = (val[0] * 1);
@@ -1001,7 +1068,10 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(hintValue.length == 2){
 					hintValue = opts.splitInput ? 
 						hintValue : 
-						curCfg.patterns.d.replace('yy', hintValue[0]).replace('mm', hintValue[1]);
+						curCfg.date.showMonthAfterYear ?
+							hintValue[0] +' '+hintValue[1] :
+							
+							hintValue[1] +' '+ hintValue[0];
 				} else {
 					hintValue = opts.splitInput ?
 						[val, val] :
@@ -1376,10 +1446,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 								}
 								try {
 									that.elemHelper[name](factor);
+									
 									ret = that.elemHelper.prop('value');
+									
+								} catch (er) {
+									if(!o.value && that.maxAsNumber >= that.minAsNumber){
+										ret = o.defValue;
+									}
+								}
+								if(ret !== false && o.value != ret){
 									that.value(ret);
 									eventTimer.call('input', ret);
-								} catch (er) {}
+								}
 								return ret;
 							}
 						};
@@ -1445,15 +1523,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				
 				initChangeEvents();
 			},
-			value: function(val, force){
-				if(!this._init || force || val !== this.options.value){
-					this.element.val(this.formatValue(val));
-					this.options.value = val;
-					this._propertyChange('value');
-					this.mirrorValidity();
-				}
-				
-			},
 			required: function(val, boolVal){
 				this.inputElements.attr({'aria-required': ''+boolVal});
 				this.mirrorValidity();
@@ -1470,7 +1539,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			formatValue: function(val, noSplit){
 				return formatVal[this.type](val, noSplit === false ? false : this.options);
 			},
-			createOpts: ['readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'value', 'required'],
+			createOpts: ['readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'defaultValue', 'value', 'required'],
 			placeholder: function(val){
 				var options = this.options;
 				options.placeholder = val;
@@ -1540,6 +1609,16 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			}
 		};
 		
+		['defaultValue', 'value'].forEach(function(name){
+			wsWidgetProto[name] = function(val, force){
+				if(!this._init || force || val !== this.options[name]){
+					this.element.prop(name, this.formatValue(val));
+					this.options[name] = val;
+					this._propertyChange(name);
+					this.mirrorValidity();
+				}
+			};
+		});
 		
 		['readonly', 'disabled'].forEach(function(name){
 			var isDisabled = name == 'disabled';
@@ -1593,7 +1672,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				this._init = true;
 			},
-			createOpts: ['step', 'min', 'max', 'readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'value', 'required'],
+			createOpts: ['step', 'min', 'max', 'readonly', 'title', 'disabled', 'tabindex', 'placeholder', 'defaultValue', 'value', 'required'],
 			_addSplitInputs: function(){
 				if(!this.inputElements){
 					var create = splitInputs[this.type]._create(this.options);
@@ -1663,9 +1742,47 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				this.options.step = val;
 				this.elemHelper.prop('step', retDefault(val, defStep.step));
 				this.mirrorValidity();
+			},
+			_beforeValue: function(val){
+				this.valueAsNumber = this.asNumber(val);
+				this.options.value = val;
+				
+				if(isNaN(this.valueAsNumber) || (!isNaN(this.minAsNumber) && this.valueAsNumber < this.minAsNumber) || (!isNaN(this.maxAsNumber) && this.valueAsNumber > this.maxAsNumber)){
+					this._setStartInRange();
+				} else {
+					this.elemHelper.prop('value', val);
+					this.options.defValue = "";
+				}
 			}
 		});
 		
+		['defaultValue', 'value'].forEach(function(name){
+			var isValue = name == 'value';
+			spinBtnProto[name] = function(val, force){
+				if(!this._init || force || this.options[name] !== val){
+					if(isValue){
+						this._beforeValue(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]);
+							}
+						});
+					} else {
+						this.element.prop(name, val);
+					}
+					this._propertyChange(name);
+					this.mirrorValidity();
+				}
+			};
+		});
+		
 		$.each({min: 1, max: -1}, function(name, factor){
 			var numName = name +'AsNumber';
 			spinBtnProto[name] = function(val){
@@ -2069,10 +2186,12 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		var inputTypes = {
 			
 		};
+		var boolAttrs = {disabled: 1, required: 1, readonly: 1};
 		var copyProps = [
 			'disabled',
 			'readonly',
 			'value',
+			'defaultValue',
 			'min',
 			'max',
 			'step',
@@ -2090,14 +2209,18 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				if(!stopCircular){
 					var shadowData = webshims.data(this, 'shadowData');
 					if(shadowData && shadowData.data && shadowData.nativeElement === this && shadowData.data[fnName]){
-						shadowData.data[fnName](val, boolVal);
+						if(boolAttrs[fnName]){
+							shadowData.data[fnName](val, boolVal);
+						} else {
+							shadowData.data[fnName](val);
+						}
 					}
 				}
 			});
 		});
 		
 		if(options.replaceUI && 'valueAsNumber' in document.createElement('input')){
-			var reflectFn = function(val){
+			var reflectFn = function(){
 				if(webshims.data(this, 'hasShadow')){
 					$.prop(this, 'value', $.prop(this, 'value'));
 				}
@@ -2105,6 +2228,20 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			
 			webshims.onNodeNamesPropertyModify('input', 'valueAsNumber', reflectFn);
 			webshims.onNodeNamesPropertyModify('input', 'valueAsDate', reflectFn);
+			$.each({stepUp: 1, stepDown: -1}, function(name, stepFactor){
+				var stepDescriptor = webshims.defineNodeNameProperty('input', name, {
+					prop: {
+						value: function(){
+							var ret;
+							if(stepDescriptor.prop && stepDescriptor.prop._supvalue){
+								ret = stepDescriptor.prop._supvalue.apply(this, arguments);
+								reflectFn.apply(this, arguments);
+							}
+							return ret;
+						}
+					}
+				});
+			});
 		}
 		
 		var extendType = (function(){
@@ -2124,7 +2261,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				$(data.orig).removeClass('ws-important-hide');
 				$.style( data.orig, 'display', '' );
 				var hasButtons, marginR, marginL;
-				var correctWidth = 0.6;
+				var correctWidth = 0.8;
 				if(!init || data.orig.offsetWidth){
 					hasButtons = data.buttonWrapper && data.buttonWrapper.filter(isVisible).length;
 					marginR = $.css( data.orig, 'marginRight');
@@ -2148,7 +2285,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 							;
 						} else {
 							data.buttonWrapper.css('marginRight', marginR);
-							correctWidth = data.buttonWrapper.outerWidth(true) + 0.6;
+							correctWidth = data.buttonWrapper.outerWidth(true) + correctWidth;
 						}
 					}
 					
@@ -2306,7 +2443,29 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			});
 		}
 		
-		if(!modernizrInputTypes.range || options.replaceUI){
+		var replace = {};
+		
+		
+		if(options.replaceUI){
+			if( $.isPlainObject(options.replaceUI) ){
+				$.extend(replace, options.replaceUI);
+			} else {
+				$.extend(replace, {
+					'range': 1,
+					'number': 1,
+					'time': 1, 
+					'month': 1, 
+					'date': 1, 
+					'color': 1, 
+					'datetime-local': 1
+				});
+			}
+		}
+		if(modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && ((/MSIE 1[0|1]\.\d/.test(navigator.userAgent)) || (/Trident\/7\.0/.test(navigator.userAgent)))){
+			replace.number = 1;
+		}
+		
+		if(!modernizrInputTypes.range || replace.range){
 			extendType('range', {
 				_create: function(opts, set){
 					var data = $('<span />').insertAfter(opts.orig).rangeUI(opts).data('rangeUi');
@@ -2315,9 +2474,9 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			});
 		}
 		
-		var isStupid = modernizrInputTypes.number && navigator.userAgent.indexOf('Touch') == -1 && ((/MSIE 1[0|1]\.\d/.test(navigator.userAgent)) || (/Trident\/7\.0/.test(navigator.userAgent)));
+		
 		['number', 'time', 'month', 'date', 'color', 'datetime-local'].forEach(function(name){
-			if(!modernizrInputTypes[name] || options.replaceUI || (name == 'number' && isStupid)){
+			if(!modernizrInputTypes[name] || replace[name]){
 				extendType(name, {
 					_create: function(opts, set){
 						if(opts.monthSelect){