24.js in webshims-rails-1.11.3

- old
+ new

@@ -1320,10 +1320,11 @@
 		});
 	})();
 }
 
 (function(){
+	if(options.noPlaceholderPolyfill){return;}
 	var bustedPlaceholder;
 	Modernizr.textareaPlaceholder = !!('placeholder' in $('<textarea />')[0]);
 	if(Modernizr.input.placeholder && options.overridePlaceholder){
 		bustedPlaceholder = true;
 	}
@@ -1502,11 +1503,10 @@
 			
 			return {
 				create: function(elem){
 					var data = $.data(elem, 'placeHolder');
 					var form;
-					var responsiveElem;
 					if(data){return data;}
 					data = $.data(elem, 'placeHolder', {});
 					
 					$(elem).on('focus.placeholder blur.placeholder', function(e){
 						changePlaceholderVisibility(this, false, false, data, e.type );
@@ -1522,11 +1522,10 @@
 					}
 					
 					if(elem.type == 'password' || isOver){
 						data.text = createPlaceholder(elem);
 						if(isResponsive || $(elem).is('.responsive-width') || (elem.currentStyle || {width: ''}).width.indexOf('%') != -1){
-							responsiveElem = true;
 							data.box = data.text;
 						} else {
 							data.box = $(elem)
 								.wrap('<span class="placeholder-box placeholder-box-'+ (elem.nodeName || '').toLowerCase() +' placeholder-box-'+$.css(elem, 'float')+'" />')
 								.parent()
@@ -1762,11 +1761,10 @@
 					reset: 1,
 					file: 1
 					
 					//pro forma
 					,color: 1
-					//,range: 1
 				},
 				observe = function(input){
 					var timer,
 						lastVal = input.prop('value'),
 						trigger = function(e){
@@ -1784,11 +1782,11 @@
 						extraTest = function(){
 							clearTimeout(extraTimer);
 							extraTimer = setTimeout(trigger, 9);
 						},
 						unbind = function(){
-							input.unbind('focusout', unbind).unbind('keyup keypress keydown paste cut', extraTest).unbind('input change updateInput', trigger);
+							input.unbind('focusout', unbind).unbind('keyup keypress keydown paste cut', extraTest).unbind('input change updateInput triggerinput', trigger);
 							clearInterval(timer);
 							setTimeout(function(){
 								trigger();
 								input = null;
 							}, 1);
@@ -1800,10 +1798,10 @@
 					timer = setInterval(trigger, 200);
 					extraTest();
 					input.on({
 						'keyup keypress keydown paste cut': extraTest,
 						focusout: unbind,
-						'input updateInput change': trigger
+						'input updateInput change triggerinput': trigger
 					});
 				}
 			;
 						
 			$(doc)
\ No newline at end of file