webshims-rails 1.10.10 → 1.10.11

data/vendor/assets/javascripts/webshims/shims/styles/shim.css

@@ -41,20 +41,6 @@ article, aside, canvas, details, figcaption, figure, footer, header, hgroup, mai
   display: block;
 }
 
-dialog {
-  display: none;
-  postion: absolute;
-  left: 0;
-  right: 0;
-  border: solid;
-  background: #fff;
-  color: #000;
-  padding: 1em;
-}
-dialog[open] {
-  display: block;
-}
-
 audio {
   display: none;
   height: 0;
@@ -86,7 +72,7 @@ audio > * {
 .flashblocker-assumed {
   min-height: 20px;
   min-width: 20px;
-  z-index: 2147483647;
+  z-index: 99999;
 }
 
 .cue-display {
@@ -194,14 +180,6 @@ output {
   display: inline-block;
   zoom: 1;
 }
-.polyfill-important .placeholder-box {
-  position: relative !important;
-  display: inline-block !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  width: auto !important;
-  height: auto !important;
-}
 
 .placeholder-box-input {
   vertical-align: bottom;
@@ -225,12 +203,6 @@ output {
   line-height: 1;
   cursor: text;
 }
-.polyfill-important .placeholder-text {
-  margin: 0 !important;
-  padding-right: 0 !important;
-  padding-bottom: 0 !important;
-  display: none !important;
-}
 .placeholder-visible .placeholder-text, .placeholder-text.placeholder-visible {
   display: inline-block;
 }
@@ -246,19 +218,11 @@ output {
   color: #ccc;
 }
 
-.polyfill-important .placeholder-visible .placeholder-text, .polyfill-important .placeholder-text.placeholder-visible {
-  display: inline-block !important;
-}
-
 /* spinner control for time, number (usable for date, datetime-local) */
 .has-input-buttons {
   display: inline-block;
 }
 
-.polyfill-important .has-input-buttons {
-  display: inline-block !important;
-}
-
 .input-buttons,
 .step-controls,
 .ws-popover-opener {
@@ -303,6 +267,9 @@ output {
 .color-input-buttons .ws-popover-opener span {
   background-position: -348px 0;
 }
+.time-input-buttons .ws-popover-opener span {
+  background-position: -377px 1px;
+}
 .ws-popover-opener span.ws-color-indicator-bg {
   background: url(../jpicker/images/preview-opacity.png) no-repeat 0;
 }
@@ -314,11 +281,6 @@ input[type="color"] {
   width: 6.5em;
 }
 
-.polyfill-important .input-buttons {
-  display: inline-block !important;
-  padding: 0 !important;
-  vertical-align: middle !important;
-}
 .input-buttons.color-input-buttons {
   margin-left: 2px;
 }
@@ -348,12 +310,6 @@ input[type="color"] {
   line-height: 0;
   background: url(forms.png) no-repeat 0 0;
 }
-.polyfill-important .step-controls span {
-  display: inline-block !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  font-size: 0 !important;
-}
 .step-controls span.step-up {
   top: 0;
   background-position: -80px 0;
@@ -405,10 +361,6 @@ input[type="color"] {
   text-align: center;
   display: inline-block;
 }
-.polyfill-important .ws-input input, .polyfill-important
-.ws-input .ws-input-seperator {
-  display: inline-block !important;
-}
 
 .ws-date .mm,
 .ws-date .dd {
@@ -424,6 +376,21 @@ input[type="color"] {
 .no-boxsizing .ws-date .yy {
   width: 40%;
 }
+.ws-date.ws-month-select .dd {
+  width: 22%;
+}
+.no-boxsizing .ws-date.ws-month-select .dd {
+  width: 13%;
+}
+.ws-date.ws-month-select .mm {
+  width: 38%;
+}
+.ws-date.ws-month-select .yy {
+  width: 36%;
+}
+.no-boxsizing .ws-date.ws-month-select .yy {
+  width: 30%;
+}
 
 .ws-month .mm,
 .ws-month .yy {
@@ -450,11 +417,6 @@ input[type="color"] {
   font-size: 0;
   line-height: 0;
 }
-.polyfill-important .ws-range {
-  display: inline-block !important;
-  padding: 0 !important;
-  font-size: 0 !important;
-}
 .ws-range .ws-range-thumb {
   top: 0;
   position: absolute;
@@ -578,37 +540,13 @@ input[type="color"] {
   left: 0;
   padding: 0 6px 0;
   margin: 0 0 0 -6px;
-  z-index: 1000;
+  z-index: 1100;
   min-width: 90px;
   transition: visibility 400ms ease-in-out;
 }
 .ws-popover.no-transition {
   display: none;
 }
-.ws-popover button {
-  display: inline-block;
-  overflow: visible;
-  position: relative;
-  margin: 0;
-  border: 0;
-  padding: 0;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  -webkit-appearance: none;
-  appearance: none;
-  box-sizing: content-box;
-  font-family: arial, sans-serif;
-  background: transparent;
-  cursor: pointer;
-}
-.ws-popover button::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-.ws-popover button[disabled] {
-  cursor: default;
-  color: #888;
-}
 .ws-popover.ws-po-visible {
   visibility: visible;
   display: block;
@@ -644,6 +582,30 @@ input[type="color"] {
   padding: 5px;
   box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
 }
+.ws-po-box button {
+  display: inline-block;
+  overflow: visible;
+  position: relative;
+  margin: 0;
+  border: 0;
+  padding: 0;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  -webkit-appearance: none;
+  appearance: none;
+  box-sizing: content-box;
+  font-family: arial, sans-serif;
+  background: transparent;
+  cursor: pointer;
+}
+.ws-po-box button::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+.ws-po-box button[disabled] {
+  cursor: default;
+  color: #888;
+}
 
 .ws-po-arrow {
   position: absolute;
@@ -681,14 +643,6 @@ html .ws-po-arrow .ws-po-arrowbox {
   border-left-color: transparent;
   border-right-color: transparent;
 }
-.polyfill-important .ws-po-arrow {
-  border-left-color: transparent !important;
-  border-right-color: transparent !important;
-}
-.polyfill-important .ws-po-arrow .ws-po-arrowbox {
-  border-left-color: transparent !important;
-  border-right-color: transparent !important;
-}
 [data-vertical="middle"] .ws-po-arrow, * html .ws-po-arrow {
   display: none;
 }
@@ -712,7 +666,9 @@ html .ws-po-arrow .ws-po-arrowbox {
 }
 
 .input-picker .ws-prev,
-.input-picker .ws-next, .input-picker .ws-button-row button {
+.input-picker .ws-next,
+.input-picker .ws-super-prev,
+.input-picker .ws-super-next, .input-picker .ws-button-row button {
   border-radius: 4px;
   background: #ccc;
   padding: 5px 8px;
@@ -726,6 +682,15 @@ html .ws-po-arrow .ws-po-arrowbox {
   font-family: sans-serif;
   width: 330px;
 }
+.input-picker.time-popover, .input-picker.datetime-local-popover {
+  width: 415px;
+}
+.input-picker.time-popover .ws-prev,
+.input-picker.time-popover .ws-next,
+.input-picker.time-popover .ws-super-prev,
+.input-picker.time-popover .ws-super-next {
+  display: none;
+}
 .input-picker.ws-size-2 {
   width: 645px;
 }
@@ -756,7 +721,9 @@ html .ws-po-arrow .ws-po-arrowbox {
   box-shadow: 0 0 2px rgba(0, 0, 0, 0.3);
 }
 .input-picker .ws-prev,
-.input-picker .ws-next {
+.input-picker .ws-next,
+.input-picker .ws-super-prev,
+.input-picker .ws-super-next {
   position: absolute;
   top: 10px;
   border: 1px solid #cccccc;
@@ -768,29 +735,52 @@ html .ws-po-arrow .ws-po-arrowbox {
   z-index: 1;
 }
 .input-picker .ws-prev span,
-.input-picker .ws-next span {
+.input-picker .ws-next span,
+.input-picker .ws-super-prev span,
+.input-picker .ws-super-next span {
   display: none;
 }
+.input-picker.time-popover .ws-picker-body {
+  padding-top: 36px;
+}
 .input-picker .ws-picker-body {
   position: relative;
   padding: 46px 0 0;
   zoom: 1;
   margin: 0 -10px;
 }
-.input-picker .ws-prev {
+.input-picker .ws-prev,
+.input-picker .ws-super-prev {
   left: 20px;
   background-position: -243px 5px;
 }
-.input-picker .ws-next {
+.input-picker .ws-super-prev {
+  background-position: -243px -12px;
+}
+.input-picker.ws-year-buttons .ws-prev {
+  left: 50px;
+}
+.input-picker .ws-next,
+.input-picker .ws-super-next {
   right: 20px;
   background-position: -275px 5px;
 }
+.input-picker .ws-super-next {
+  background-position: -275px -12px;
+}
+.input-picker.ws-year-buttons .ws-next {
+  right: 50px;
+}
 .input-picker .ws-prev:hover,
-.input-picker .ws-next:hover {
+.input-picker .ws-next:hover,
+.input-picker .ws-super-prev:hover,
+.input-picker .ws-super-next:hover {
   border-color: #666;
 }
 .input-picker .ws-prev[disabled],
-.input-picker .ws-next[disabled] {
+.input-picker .ws-next[disabled],
+.input-picker .ws-super-prev[disabled],
+.input-picker .ws-super-next[disabled] {
   opacity: 0.4;
   border-color: #eee;
 }
@@ -824,6 +814,15 @@ html .ws-po-arrow .ws-po-arrowbox {
 .input-picker[data-currentview="setDayList"] .ws-picker-header select.month-select {
   max-width: 55%;
 }
+.input-picker.time-popover .ws-picker-header {
+  top: -30px;
+}
+.input-picker.time-popover .ws-picker-header button {
+  font-size: 15px;
+}
+.input-picker.ws-year-buttons .ws-picker-header {
+  margin: 0 65px;
+}
 .input-picker .ws-picker-header {
   position: absolute;
   top: -44px;
@@ -872,9 +871,12 @@ html .ws-po-arrow .ws-po-arrowbox {
 .input-picker .picker-list.day-list td {
   padding: 2px 1px;
 }
+.input-picker .picker-list.day-list td button {
+  padding: 4px 0;
+}
 .input-picker .picker-list td button {
   display: block;
-  padding: 4px 0;
+  padding: 9px 0;
   width: 100%;
   border-radius: 5px;
   color: #000;
@@ -1115,19 +1117,6 @@ summary {
 .closed-details-summary .details-open-indicator {
   background-position: 0 -20px;
 }
-.polyfill-important .details-open-indicator {
-  margin: -1px 0 0 !important;
-  padding: 0 !important;
-  border: 0 !important;
-  display: inline-block !important;
-  width: 16px !important;
-  height: 11px !important;
-  background: url(details-arrows.png) no-repeat 0 0 !important;
-  vertical-align: middle !important;
-}
-.polyfill-important .closed-details-summary .details-open-indicator {
-  background-position: 0 -20px !important;
-}
 
 summary.summary-has-focus {
   outline: 1px dotted #aaaaaa;

data/vendor/assets/javascripts/webshims/shims/swfmini.js

@@ -165,52 +165,6 @@ var swfmini = function() {
 	}
 	
 	
-	/* Functions to abstract and display alternative content
-	*/
-	function displayAltContent(obj) {
-		if (ua.ie && ua.win && obj.readyState != 4) {
-			// IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it,
-			// because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work
-			var el = createElement("div");
-			obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content
-			el.parentNode.replaceChild(abstractAltContent(obj), el);
-			obj.style.display = "none";
-			(function(){
-				if (obj.readyState == 4) {
-					obj.parentNode.removeChild(obj);
-				}
-				else {
-					setTimeout(arguments.callee, 10);
-				}
-			})();
-		}
-		else {
-			obj.parentNode.replaceChild(abstractAltContent(obj), obj);
-		}
-	} 
-
-	function abstractAltContent(obj) {
-		var ac = createElement("div");
-		if (ua.win && ua.ie) {
-			ac.innerHTML = obj.innerHTML;
-		}
-		else {
-			var nestedObj = obj.getElementsByTagName(OBJECT)[0];
-			if (nestedObj) {
-				var c = nestedObj.childNodes;
-				if (c) {
-					var cl = c.length;
-					for (var i = 0; i < cl; i++) {
-						if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) {
-							ac.appendChild(c[i].cloneNode(true));
-						}
-					}
-				}
-			}
-		}
-		return ac;
-	}
-	
 	/* Cross-browser dynamic SWF creation
 	*/
 	function createSWF(attObj, parObj, id) {

data/vendor/assets/javascripts/webshims/shims/track-ui.js

@@ -40,7 +40,7 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 	var showTracks = {subtitles: 1, captions: 1, descriptions: 1};
 	var mediaelement = webshims.mediaelement;
 	var usesNativeTrack =  function(){
-		return !options.override && Modernizr.track;
+		return !options.override && Modernizr.texttrackapi;
 	};
 	
 	var trackDisplay = {
@@ -171,7 +171,7 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 			track._lastFoundCue = {index: 0, time: 0};
 		}
 		
-		if(Modernizr.track && !options.override && !track._shimActiveCues){
+		if(Modernizr.texttrackapi && !options.override && !track._shimActiveCues){
 			track._shimActiveCues = mediaelement.createCueList();
 		}
 		
@@ -251,6 +251,11 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 				createUpdateFn('nodeName', 'addTextTrack', 'value');
 			});
 		})();
+		$.propHooks.activeCues = {
+			get: function(obj, value){
+				return obj._shimActiveCues || obj.activeCues;
+			}
+		};
 	}
 	
 	webshims.addReady(function(context, insertedElement){
@@ -260,8 +265,9 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 				return webshims.implement(this, 'trackui');
 			})
 			.each(function(){
-				var elem = $(this);
+				var baseData, trackList, updateTimer, updateTimer2;
 				
+				var elem = $(this);
 				var getDisplayCues = function(e){
 					var track;
 					var time;
@@ -293,12 +299,11 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 					clearTimeout(updateTimer);
 					if(e && e.type == 'timeupdate'){
 						getDisplayCues();
-						setTimeout(onUpdate, 90);
+						updateTimer2 = setTimeout(onUpdate, 90);
 					} else {
 						updateTimer = setTimeout(getDisplayCues, 9);
 					}
 				};
-				
 				var addTrackView = function(){
 					
 					elem
@@ -306,7 +311,6 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 						.on('play.trackview timeupdate.trackview updatetrackdisplay.trackview', onUpdate)
 					;
 				};
-				var baseData, trackList, updateTimer;
 				
 				elem.on('remove', function(e){
 					if(!e.originalEvent && baseData && baseData.trackDisplay){
@@ -323,6 +327,9 @@ webshims.register('track-ui', function($, webshims, window, document, undefined)
 						if(!usesNativeTrack() || elem.is('.nonnative-api-active')){
 							addTrackView();
 						} else {
+							clearTimeout(updateTimer);
+							clearTimeout(updateTimer2);
+							
 							trackList = elem.prop('textTracks');
 							baseData = webshims.data(elem[0], 'mediaelementBase') || webshims.data(elem[0], 'mediaelementBase', {});