webshims-rails 1.10.11 → 1.11.1

data/vendor/assets/javascripts/webshims/shims/mediaelement-yt.js

@@ -497,21 +497,28 @@ mediaelement.createSWF = function(mediaElem, src, data){
 	if(!data){
 		data = webshims.data(mediaElem, 'mediaelement');
 	}
+	var elemId = 'yt-'+ webshims.getID(mediaElem);
 	var ytID = getYtId(src.src);
+	var hasControls = $.prop(mediaElem, 'controls');
 	if(data){
 		mediaelement.setActive(mediaElem, 'third', data);
 		resetSwfProps(data);
 		data.currentSrc = src.srcProp;
-		ytAPI.done(function(){
-			if(data._ytAPI.loadVideoById){
-				data._ytAPI.loadVideoById(ytID);
-			}
-		});
-		
+		if(hasControls != data._hasControls){
+			data.shadowElem.html('<div id="'+ elemId +'">');
+			addYtAPI(mediaElem, elemId, data, ytID);
+		} else {
+			ytAPI.done(function(){
+				if(data._ytAPI.cueVideoByUrl){
+					data._ytAPI.cueVideoByUrl(ytID);
+				}
+			});
+		}
+		data._hasControls = hasControls;
 		return;
 	}
-	var hasControls = $.prop(mediaElem, 'controls');
-	var elemId = 'yt-'+ webshims.getID(mediaElem);
+	
+	
 	var box = $('<div class="polyfill-video polyfill-mediaelement" id="wrapper-'+ elemId +'"><div id="'+ elemId +'"></div>')
 		.css({
 			position: 'relative',
@@ -531,6 +538,9 @@ mediaelement.createSWF = function(mediaElem, src, data){
 		_elem: {
 			value: mediaElem
 		},
+		_hasControls: {
+			value: hasControls
+		},
 		currentSrc: {
 			value: src.srcProp
 		},
@@ -664,6 +674,16 @@ mediaelement.createSWF = function(mediaElem, src, data){
 		
 	});
 	mediaSup = webshims.defineNodeNameProperties('video', descs, 'prop');
+	
+	webshims.onNodeNamesPropertyModify('video', 'controls', function(val, boolProp){
+		var data = getYtDataFromElem(this);
+		$(this)[boolProp ? 'addClass' : 'removeClass']('webshims-controls');
+		
+		if(data && data._ytAPI && !data.readyState){
+			$(this).mediaLoad();
+		}
+	});
+	
 })();
 
 

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

@@ -0,0 +1,29 @@
+webshims.register('mediagroup', function($, webshims, window, document, undefined){
+	"use strict";
+	var mediaelement = webshims.mediaelement;
+	
+	
+	mediaelement.mediagroup = {
+		set: function(){
+			console.log(this, arguments, 'mediagroupSet')
+		}
+	};
+	
+	
+	mediaelement.controller = {};
+	
+	['audio', 'video'].forEach(function(name){
+		
+		var controller = {
+			set: function(){
+				console.log(this, arguments, 'controllerSet')
+				return controller.sup.prop._supset && controller.sup.prop._supset.apply(this, arguments);
+			},
+			get: function(){
+				console.log(this, arguments, 'controllerGet', controller)
+				return controller.sup.prop._supget && controller.sup.prop._supget.apply(this, arguments) || null;
+			}
+		};
+		mediaelement.controller[name] = controller;
+	});
+});

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

@@ -177,7 +177,17 @@
 			this.value(this.options.value, true);
 		},
 		step: function(val){
-			this.options.step = val == 'any' ? 'any' : retDefault(val, 1);
+			var o = this.options;
+			var step = val == 'any' ? 'any' : retDefault(val, 1);
+			
+			if(o.stepping){
+				if(step != 'any' && o.stepping % step){
+					webshims.error('wrong stepping value for type range:'+ (o.stepping % step));
+				} else {
+					step = o.stepping;
+				}
+			}
+			o.step = step;
 			this.value(this.options.value);
 		},
 		

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

@@ -514,8 +514,8 @@ input[type="color"] {
 		position: absolute;
 		display: block;
 		top: 0;
-		left: 5px;
-		right: 5px;
+		left: 0;
+		right: 0;
 		bottom: 0;
 		margin: 0;
 		zoom: 1;
@@ -524,6 +524,7 @@ input[type="color"] {
 	.ws-range-min {
 		position: absolute !important;
 		display: block;
+		margin: 9px 0 0;
 		padding: 0 !important;
 		top: 0;
 		height: 1px;
@@ -1093,15 +1094,18 @@ $button-bgcolor: #f5f5f5;
 		}
 		
 		button {
+			@extend %clearfix;
 			display: block;
-			padding: 2px 0;
+			padding: 4px;
 			width: 100%;
 			text-align: left;
+			border-radius: 4px;
 			
 			&.ws-focus,
 			&:focus,
 			&:hover {
-				text-decoration: underline;
+				color: #fff;
+				background: #000;
 			}
 			
 			&[disabled],
@@ -1109,8 +1113,17 @@ $button-bgcolor: #f5f5f5;
 			&[disabled]:focus,
 			&[disabled]:hover {
 				color: #888;
+				background: #fff;
 				text-decoration: none;
 			}
+			.ws-value {
+				float: left;
+			}
+			
+			.ws-label {
+				float: right;
+				font-size: 96%;
+			}
 		}
 		
 		

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

@@ -1,7 +1,7 @@
-.input-picker .ws-picker-body, .input-picker .ws-button-row, .input-picker .picker-grid, .input-picker .picker-list {
+.input-picker .ws-picker-body, .input-picker .ws-button-row, .input-picker .picker-grid, .input-picker .picker-list, .input-picker .ws-options button {
   zoom: 1;
 }
-.input-picker .ws-picker-body:before, .input-picker .ws-button-row:before, .input-picker .picker-grid:before, .input-picker .picker-list:before, .input-picker .ws-picker-body:after, .input-picker .ws-button-row:after, .input-picker .picker-grid:after, .input-picker .picker-list:after {
+.input-picker .ws-picker-body:before, .input-picker .ws-button-row:before, .input-picker .picker-grid:before, .input-picker .picker-list:before, .input-picker .ws-options button:before, .input-picker .ws-picker-body:after, .input-picker .ws-button-row:after, .input-picker .picker-grid:after, .input-picker .picker-list:after, .input-picker .ws-options button:after {
   display: table;
   clear: both;
   content: ' ';
@@ -455,8 +455,8 @@ input[type="color"] {
   position: absolute;
   display: block;
   top: 0;
-  left: 5px;
-  right: 5px;
+  left: 0;
+  right: 0;
   bottom: 0;
   margin: 0;
   zoom: 1;
@@ -464,6 +464,7 @@ input[type="color"] {
 .ws-range .ws-range-min {
   position: absolute !important;
   display: block;
+  margin: 9px 0 0;
   padding: 0 !important;
   top: 0;
   height: 1px;
@@ -929,17 +930,27 @@ html .ws-po-arrow .ws-po-arrowbox {
 }
 .input-picker .ws-options button {
   display: block;
-  padding: 2px 0;
+  padding: 4px;
   width: 100%;
   text-align: left;
+  border-radius: 4px;
 }
 .input-picker .ws-options button.ws-focus, .input-picker .ws-options button:focus, .input-picker .ws-options button:hover {
-  text-decoration: underline;
+  color: #fff;
+  background: #000;
 }
 .input-picker .ws-options button[disabled], .input-picker .ws-options button[disabled].ws-focus, .input-picker .ws-options button[disabled]:focus, .input-picker .ws-options button[disabled]:hover {
   color: #888;
+  background: #fff;
   text-decoration: none;
 }
+.input-picker .ws-options button .ws-value {
+  float: left;
+}
+.input-picker .ws-options button .ws-label {
+  float: right;
+  font-size: 96%;
+}
 
 datalist {
   display: none;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webshims-rails
 version: !ruby/object:Gem::Version
-  version: 1.10.11
+  version: 1.11.1
 platform: ruby
 authors:
 - David Reese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,6 +139,7 @@ files:
 - vendor/assets/javascripts/webshims/shims/mediaelement-jaris.js
 - vendor/assets/javascripts/webshims/shims/mediaelement-native-fix.js
 - vendor/assets/javascripts/webshims/shims/mediaelement-yt.js
+- vendor/assets/javascripts/webshims/shims/mediagroup.js
 - vendor/assets/javascripts/webshims/shims/range-ui.js
 - vendor/assets/javascripts/webshims/shims/styles/config.rb
 - vendor/assets/javascripts/webshims/shims/styles/details-arrows.png
@@ -150,7 +151,6 @@ files:
 - vendor/assets/javascripts/webshims/shims/styles/vertical-range.png
 - vendor/assets/javascripts/webshims/shims/swf/JarisFLVPlayer.swf
 - vendor/assets/javascripts/webshims/shims/swf/filereader.swf
-- vendor/assets/javascripts/webshims/shims/swf/jwwebshims.swf
 - vendor/assets/javascripts/webshims/shims/swf/localStorage.swf
 - vendor/assets/javascripts/webshims/shims/swfmini.js
 - vendor/assets/javascripts/webshims/shims/track-ui.js