webshims-rails 1.14.6 → 1.15.2

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

@@ -92,52 +92,46 @@
 						}
 						return;
 					}
-					createAjax = function(){
-						$.ajax({
-							url: 'http://freegeoip.net/json/',
-							dataType: 'jsonp',
-							cache: true,
-							jsonp: 'callback',
-							success: function(data){
-								locationAPIs--;
-								if(!data){return;}
-								pos = pos || {
-									coords: {
-										latitude: data.latitude,
-										longitude: data.longitude,
-										altitude: null,
-										accuracy: 43000,
-										altitudeAccuracy: null,
-										heading: parseInt('NaN', 10),
-										velocity: null
-									},
-									//extension similiar to FF implementation
-									address: {
-										city: data.city,
-										country: data.country_name,
-										countryCode: data.country_code,
-										county: "",
-										postalCode: data.zipcode,
-										premises: "",
-										region: data.region_name,
-										street: "",
-										streetNumber: ""
-									}
-								};
-								endCallback();
-							},
-							error: function(){
-								locationAPIs--;
-								endCallback();
-							}
-						});
-					};
-					if($.ajax){
-						createAjax();
-					} else {
-						webshims.ready('jajax', createAjax);
-						webshims.loader.loadList(['jajax']);
-					}
+
+					$.ajax({
+						url: 'http://freegeoip.net/json/',
+						dataType: 'jsonp',
+						cache: true,
+						jsonp: 'callback',
+						success: function(data){
+							locationAPIs--;
+							if(!data){return;}
+							pos = pos || {
+								coords: {
+									latitude: data.latitude,
+									longitude: data.longitude,
+									altitude: null,
+									accuracy: 43000,
+									altitudeAccuracy: null,
+									heading: parseInt('NaN', 10),
+									velocity: null
+								},
+								//extension similiar to FF implementation
+								address: {
+									city: data.city,
+									country: data.country_name,
+									countryCode: data.country_code,
+									county: "",
+									postalCode: data.zipcode,
+									premises: "",
+									region: data.region_name,
+									street: "",
+									streetNumber: ""
+								}
+							};
+							endCallback();
+						},
+						error: function(){
+							locationAPIs--;
+							endCallback();
+						}
+					});
+
 					clearTimeout(googleTimer);
 					if (!window.google || !window.google.loader) {
 						googleTimer = setTimeout(function(){
@@ -179,9 +173,6 @@
 		};
 		return api;
 	})());
-	
-	webshims.ready('WINDOWLOAD', function(){
-		webshims.loader.loadList(['jajax']);
-	});
+
 	webshims.isReady('geolocation', true);
 })(webshims.$);

data/vendor/assets/javascripts/webshims/shims/jme/controls.css

@@ -1,5 +1,5 @@
 /* thx to http://icomoon.io */
-.mediaplayer[data-state="waiting"] > .jme-media-overlay, .mediaplayer .fullscreen, .mediaplayer .fullscreen.state-exitfullscreen, .mediaplayer .mediaconfigmenu, .mediaplayer.initial-state > .jme-media-overlay, .mediaplayer button.play-pause, .mediaplayer button.play-pause.state-playing, .mediaplayer .mute-unmute, .mediaplayer[data-volume="medium"] .mute-unmute, .mediaplayer[data-volume="low"] .mute-unmute, .mediaplayer[data-volume="no"] .mute-unmute, .mediaplayer .state-unmute.mute-unmute, .mediaplayer .captions, .mediaplayer .subtitle-menu button[aria-checked="true"], .mediaplayer .subtitle-menu button, .mediaplayer .playlist-next, .mediaplayer .playlist-prev, .mediaplayer .chapters, .mediaplayer.ended-state > .jme-media-overlay {
+.mediaplayer[data-state="waiting"] > div.jme-media-overlay, .mediaplayer .fullscreen, .mediaplayer .fullscreen.state-exitfullscreen, .mediaplayer .mediaconfigmenu, .mediaplayer.initial-state > .jme-media-overlay, .mediaplayer button.play-pause, .mediaplayer button.play-pause.state-playing, .mediaplayer .mute-unmute, .mediaplayer[data-volume="medium"] .mute-unmute, .mediaplayer[data-volume="low"] .mute-unmute, .mediaplayer[data-volume="no"] .mute-unmute, .mediaplayer .state-unmute.mute-unmute, .mediaplayer .captions, .mediaplayer .subtitle-menu button[aria-checked="true"], .mediaplayer .subtitle-menu button, .mediaplayer .playlist-next, .mediaplayer .playlist-prev, .mediaplayer .chapters, .mediaplayer.ended-state > .jme-media-overlay {
   font-family: 'jme';
   speak: none;
   font-style: normal;
@@ -13,7 +13,7 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.mediaplayer[data-state="waiting"] > .jme-media-overlay:before {
+.mediaplayer[data-state="waiting"] > div.jme-media-overlay:before {
   content: "\e612";
 }
 
@@ -300,10 +300,10 @@
 .mediaplayer[data-state="waiting"] {
   cursor: default;
 }
-.mediaplayer[data-state="waiting"] > .jme-media-overlay {
+.mediaplayer[data-state="waiting"] > div.jme-media-overlay {
   background-position: 4px 4px;
 }
-.mediaplayer[data-state="waiting"] > .jme-media-overlay:before {
+.mediaplayer[data-state="waiting"] > div.jme-media-overlay:before {
   -webkit-animation-name: jmespin;
   -webkit-animation-iteration-count: infinite;
   -webkit-animation-duration: 1100ms;

data/vendor/assets/javascripts/webshims/shims/jme/controls.scss

@@ -4,6 +4,7 @@
 	font-family: 'jme';
 	src: url('jme.eot');
 }
+
 @font-face {
 	font-family: 'jme';
 	src: url(data:application/font-woff;charset=utf-8;base64,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) format('woff'),
@@ -235,7 +236,7 @@ $browser-context: 16; // Default
 
 	&[data-state="waiting"] {
 		cursor: default;
-		> .jme-media-overlay {
+		> div.jme-media-overlay {
 			@extend %icon-spinner;
 			background-position: 4px 4px;
 

data/vendor/assets/javascripts/webshims/shims/jme/mediacontrols.js

@@ -52,7 +52,8 @@ webshims.register('mediacontrols', function($, webshims, window){
 	})();
 	var ios = /iP(hone|od|ad)/i.test(navigator.platform);
 	var ios6 = ios && parseInt(((navigator.appVersion).match(/OS (\d+)_\d+/) || ['','8'])[1], 10) < 7;
-	var hasYtBug = (!window.Modernizr || !Modernizr.videoautoplay) && (ios || /android/i.test(navigator.userAgent));
+	var modern = window.Modernizr;
+	var hasYtBug = (!modern || !modern.videoautoplay) && (ios || /android/i.test(navigator.userAgent));
 	var loadLazy = function(){
 		if(!loadLazy.loaded){
 			loadLazy.loaded = true;
@@ -173,7 +174,8 @@ webshims.register('mediacontrols', function($, webshims, window){
 							if(!e){
 								e.type = 'playing';
 							}
-							if(isInitial && (!isYt || !hasYtBug || e.type == 'playing' || data.media.prop('readyState') > 1)){
+
+							if(isInitial && (!isYt || !hasYtBug || e.type == 'playing' || data.media.prop('readyState') || data.media.prop('networkState'))){
 								isInitial = false;
 								data.player.removeClass('initial-state');
 							}

data/vendor/assets/javascripts/webshims/shims/mediacapture-picker.js

@@ -0,0 +1,42 @@
+webshim.register('mediacapture-picker', function($, webshim, window, document, undefined, featureOptions){
+	"use strict";
+
+	function PhotoShooter($dom){
+		this.$dom = $dom;
+		this._createDom();
+		this.requestMedia();
+	}
+
+	PhotoShooter.prototype = {
+		_createDom: function(){
+			this.$dom.html('<div class="ws-videocapture-view">' +
+				'<video class="ws-usermedia ws-inlineusermedia" autoplay=""></video>' +
+				'<div class="ws-video-overlay"></div>' +
+				'</div>' +
+				'<div class="button-row"><button type="button" class="ws-capture-button">take</button>' +
+				'</div>')
+			;
+		},
+		requestMedia: function(){
+			var that = this;
+
+
+			navigator.getUserMedia(
+				{video: {minWidth: 200, audio: false}},
+				function(stream){
+					that.stream = stream;
+					$('video', that.$dom).prop('src', URL.createObjectURL(stream));
+				},
+				function(){
+
+				}
+			);
+			$('video', that.$dom).removeClass('ws-usermedia');
+
+		}
+	};
+
+	webshim.mediacapture.showContent = function($fileinput, $button, popover){
+		var stream = new PhotoShooter(popover.contentElement);
+	};
+});

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

@@ -0,0 +1,159 @@
+webshim.register('mediacapture', function($, webshim, window, document, undefined, featureOptions){
+	"use strict";
+	var hasCamera = -1;
+	var checkCameras = $.noop;
+	var sel = 'input[type="file"].ws-filereader, input[type="file"].ws-capture';
+	var cameraListPromise = $.Deferred();
+
+	//
+
+	(function(){
+		var tmp;
+
+		var hasNativeUserMedia = !!(navigator.getUserMedia && !navigator.wsGetUserMedia);
+		var hasFlash = swfmini.hasFlashPlayerVersion('11.3');
+		var writeToStorage = function(){
+			try{
+				sessionStorage.setItem('wsCameras', JSON.stringify(hasCamera));
+			} catch (e){}
+		};
+		var reject = function(){
+			hasCamera = 0;
+			writeToStorage();
+			cameraListPromise.reject(hasCamera);
+		};
+		var resolve = function(){
+			writeToStorage();
+			cameraListPromise.resolve(hasCamera);
+		};
+		try {
+			tmp = JSON.parse(sessionStorage.getItem('wsCameras'));
+			if(tmp == null){
+				hasCamera = -1;
+			}
+		} catch(e){}
+
+		if(hasCamera === 0 || (hasCamera == -1 && !hasNativeUserMedia && !hasFlash)){
+			reject();
+		} else if(hasFlash){
+			checkCameras = function(){
+				var mediaOptions = webshim.cfg.mediaelement;
+				var playerSwfPath = mediaOptions.playerPath || (webshim.cfg.basePath + "swf/" + (mediaOptions.playerName || 'JarisFLVPlayer.swf'));
+				var id = 'wscameralistdetection';
+				var vars = {
+					controltype: '1',
+					jsapi: '1',
+					source: '',
+					id: id,
+					evtId: id
+				};
+				var attrs = {
+					id: id,
+					name: id
+				};
+				var params = {
+					allowscriptaccess: 'always',
+					allowNetworking: 'all'
+				};
+				var $dom = $('<div><div id="'+ id +'"></div></div>')
+					.css({position: 'absolute', left: -999, width: 5, height: 5, overflow: 'hidden'})
+					.appendTo('body')
+				;
+
+				webshim.mediaelement.jarisEvent = webshim.mediaelement.jarisEvent || {};
+				webshim.mediaelement.jarisEvent[id] = function(jaris){
+					hasCamera = jaris.cameras;
+					$dom.remove();
+					if(hasCamera){
+						resolve();
+					} else {
+						reject();
+					}
+				};
+
+
+				checkCameras = $.noop;
+				swfmini.embedSWF(playerSwfPath, id, "100%", "100%", "11.3", false, vars, params, attrs);
+			};
+
+		} else {
+			hasCamera = -1;
+			resolve();
+		}
+	})();
+	var loadPicker = function(){
+		webshim.ready('WINDOWLOAD', function(){
+			webshim.loader.loadList(['mediacapture-picker']);
+		});
+		loadPicker = $.noop;
+	};
+
+
+	var _createPhotoPicker = function(){
+		if($(this).is('[capture].ws-filereader, .ws-capture') && webshim.implement(this, 'capture')){
+			var $wrapper, $customFile;
+			var $fileinput = $(this);
+			var $button = $('<button type="button" class="ws-capture-button">photo</button>');
+			var popover = webshim.objectCreate(webshim.wsPopover, {}, $.extend({prepareFor: $button}));
+			popover.element.addClass('capture-popover input-picker');
+
+			if($fileinput.is('.ws-custom-file > *')){
+				$customFile = $fileinput.closest('.ws-custom-file');
+				$wrapper = $('<div class="ws-capture-file" />').insertAfter($customFile);
+				$wrapper.append($button).append($customFile);
+			} else {
+				$fileinput.before($button);
+			}
+			popover.element.insertAfter($button);
+
+			$button.on('click', function(){
+				webshim.mediacapture.showContent($fileinput, $button, popover);
+				popover.show();
+			});
+			loadPicker();
+		}
+	};
+	var createPhotoPicker = function (){
+		var elem = this;
+		checkCameras();
+
+		cameraListPromise.done(function(){
+			_createPhotoPicker.call(elem);
+		});
+	};
+
+	webshim.mediacapture = {
+		showContent: function($fileinput, $button, popover){
+			webshim.loader.loadList(['mediacapture-picker']);
+			webshim.ready('mediacapture-picker', function(){
+				webshim.mediacapture.showContent($fileinput, $button, popover);
+			});
+		}
+	};
+	webshim.defineNodeNamesBooleanProperty('input', 'capture');
+
+	if(hasCamera){
+
+		cameraListPromise.done(function(){
+			createPhotoPicker = _createPhotoPicker;
+			webshim.loader.addModule('mediacapture-picker', {
+				noAutoCallback: true,
+				css: 'styles/forms-picker.css',
+				options: featureOptions
+			});
+
+		});
+
+		webshim.addReady(function(context, insertedElement){
+			$(sel, context).add(insertedElement.filter(sel))
+				.filter('[accept*="image"], :not([accept]), [accept=""]')
+				.each(createPhotoPicker)
+			;
+		});
+
+		webshim.ready('WINDOWLOAD', checkCameras);
+	}
+	if(document.readyState == 'complete'){
+		webshim.isReady('WINDOWLOAD', true);
+	}
+});

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

@@ -58,9 +58,16 @@
 		})();
 	}
 
+	if(window.CanvasRenderingContext2D && CanvasRenderingContext2D.prototype){
+		CanvasRenderingContext2D.prototype.wsImageComplete = function(cb){
+			cb.call(this, this);
+		};
+	}
+
 webshims.register('mediaelement-core', function($, webshims, window, document, undefined, options){
 	var hasSwf = swfmini.hasFlashPlayerVersion('11.3');
 	var mediaelement = webshims.mediaelement;
+	var allowYtLoading = false;
 	
 	mediaelement.parseRtmp = function(data){
 		var src = data.src.split('://');
@@ -156,7 +163,9 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 		return function(){
 			if(loaded || !hasYt){return;}
 			loaded = true;
-			webshims.loader.loadScript("https://www.youtube.com/player_api");
+			if(allowYtLoading){
+				webshims.loader.loadScript("https://www.youtube.com/player_api");
+			}
 			$(function(){
 				webshims._polyfill(["mediaelement-yt"]);
 			});
@@ -342,6 +351,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				}
 			});
 			if(!requested && hasYt && !mediaelement.createSWF){
+				allowYtLoading = true;
 				loadYt();
 			}
 		};
@@ -506,6 +516,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 						.add(insertedElement.filter('video, audio'))
 						.each(function(){
 							if(!mediaelement.canNativePlaySrces(this)){
+								allowYtLoading = true;
 								loadThird();
 								handleMedia = true;
 								return false;
@@ -528,6 +539,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			mediaelement.loadDebugger();
 		});
 	}
+
 	//set native implementation ready, before swf api is retested
 	if(hasNative){
 		webshims.isReady('mediaelement-core', true);

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

@@ -124,12 +124,13 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 	};
 
 
-	mediaelement.jarisEvent = {};
+	mediaelement.jarisEvent = mediaelement.jarisEvent || {};
 	var localConnectionTimer;
 	var onEvent = {
 		onPlayPause: function(jaris, data, override){
 			var playing, type;
 			var idled = data.paused || data.ended;
+
 			if(override == null){
 				try {
 					playing = data.api.api_get("isPlaying");
@@ -143,12 +144,15 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 				type = data.paused ? 'pause' : 'play';
 				data._ppFlag = true;
 				trigger(data._elem, type);
+
+			}
+			if(!data.paused || playing == idled || playing == null){
 				if(data.readyState < 3){
 					setReadyState(3, data);
 				}
-				if(!data.paused){
-					trigger(data._elem, 'playing');
-				}
+			}
+			if(!data.paused){
+				trigger(data._elem, 'playing');
 			}
 		},
 		onSeek: function(jaris, data){
@@ -900,11 +904,11 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 		options.changeSWF(vars, elem, canPlaySrc, data, 'embed');
 		clearTimeout(data.flashBlock);
 
-		swfmini.embedSWF(playerSwfPath, elemId, "100%", "100%", "9.0.115", false, vars, params, attrs, function(swfData){
+		swfmini.embedSWF(playerSwfPath, elemId, "100%", "100%", "11.3", false, vars, params, attrs, function(swfData){
 			if(swfData.success){
 				var fBlocker = function(){
-					if((!swfData.ref.parentNode && box[0].parentNode) || swfData.ref.style.display == "none"){
-						box.addClass('flashblocker-assumed');
+					if((!swfData.ref.parentNode) || swfData.ref.style.display == "none"){
+
 						$(elem).trigger('flashblocker');
 						webshims.warn("flashblocker assumed");
 					}
@@ -1138,8 +1142,19 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			webshim.error('canvas.drawImage feature is needed. In IE8 flashvanvas pro can be used');
 		}
 
+		CanvasRenderingContext2D.prototype.wsImageComplete = function(cb){
+			if(this._wsIsLoading){
+				if(!this._wsLoadingCbs){
+					this._wsLoadingCbs = [];
+				}
+				this._wsLoadingCbs.push(cb);
+			} else {
+				cb.call(this, this);
+			}
+		};
+
 		CanvasRenderingContext2D.prototype.drawImage = function(elem){
-			var data, img, args, imgData;
+			var data, img, args, imgData, hadCachedImg;
 			var context = this;
 
 			if(isVideo[elem.nodeName] && (data = webshims.data(elem, 'mediaelement')) && data.isActive == 'third' && data.api.api_image){
@@ -1157,18 +1172,39 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 				}
 
 				args = slice.call(arguments, 1);
-				img = new Image();
+
+				if(options.canvasSync && data.canvasImg){
+					args.unshift(data.canvasImg);
+					_drawImage.apply(context, args);
+					args = slice.call(arguments, 1);
+					hadCachedImg = true;
+				}
+
+				img = document.createElement('img');
 
 				//todo find a performant sync way
 				img.onload = function(){
 					args.unshift(this);
-					_drawImage.apply(context, args);
 					img.onload = null;
+
+					if(options.canvasSync){
+						data.canvasImg = img;
+						if(hadCachedImg && options.noDoubbleDraw){
+							return;
+						}
+					}
+					_drawImage.apply(context, args);
+					context._wsIsLoading = false;
+					if(context._wsLoadingCbs && context._wsLoadingCbs.length){
+						while(context._wsLoadingCbs.length){
+							context._wsLoadingCbs.shift().call(context, context);
+						}
+					}
 				};
 
 				img.src = 'data:image/jpeg;base64,'+imgData;
-
-				if(img.complete){
+				this._wsIsLoading = true;
+				if(img.complete && img.onload){
 					img.onload();
 				}
 				return;