webshims-rails 1.14.1 → 1.14.3

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

@@ -294,6 +294,26 @@ webshims.register('track', function($, webshims, window, document, undefined){
 			return cueText.replace(tagSplits, replacer);
 		};
 	})();
+	var mapTtmlToVtt = function(i){
+		var content = i+'';
+		var begin = this.getAttribute('begin') || '';
+		var end = this.getAttribute('end') || '';
+		var text = $.trim($.text(this));
+		if(!/\./.test(begin)){
+			begin += '.000';
+		}
+		if(!/\./.test(end)){
+			end += '.000';
+		}
+		content += '\n';
+		content += begin +' --> '+end+'\n';
+		content += text;
+		return content;
+	};
+	var ttmlTextToVTT = function(ttml){
+		ttml = $.parseXML(ttml) || [];
+		return $(ttml).find('[begin][end]').map(mapTtmlToVtt).get().join('\n\n') || '';
+	};
 	
 	mediaelement.loadTextTrack = function(mediaelem, track, trackData, _default){
 		var loadEvents = 'play playing';
@@ -321,7 +341,11 @@ webshims.register('track', function($, webshims, window, document, undefined){
 								dataType: 'text',
 								url: src,
 								success: function(text){
-									if(ajax.getResponseHeader('content-type') != 'text/vtt'){
+									var contentType = ajax.getResponseHeader('content-type');
+
+									if(!contentType.indexOf('application/xml')){
+										text = ttmlTextToVTT(text);
+									} else if(contentType.indexOf('text/vtt')){
 										webshims.error('set the mime-type of your WebVTT files to text/vtt. see: http://dev.w3.org/html5/webvtt/#text/vtt');
 									}
 									mediaelement.parseCaptions(text, obj, function(cues){
@@ -441,25 +465,20 @@ modified for webshims
 */
 	mediaelement.parseCaptionChunk = (function(){
 		// Set up timestamp parsers
-		var WebVTTTimestampParser			= /^(\d{2})?:?(\d{2}):(\d{2})\.(\d+)\s+\-\-\>\s+(\d{2})?:?(\d{2}):(\d{2})\.(\d+)\s*(.*)/;
+		var WebVTTTimestampParser		= /^(\d{2})?:?(\d{2}):(\d{2})\.(\d+)\s+\-\-\>\s+(\d{2})?:?(\d{2}):(\d{2})\.(\d+)\s*(.*)/;
 		var WebVTTDEFAULTSCueParser		= /^(DEFAULTS|DEFAULT)\s+\-\-\>\s+(.*)/g;
 		var WebVTTSTYLECueParser		= /^(STYLE|STYLES)\s+\-\-\>\s*\n([\s\S]*)/g;
 		var WebVTTCOMMENTCueParser		= /^(COMMENT|COMMENTS)\s+\-\-\>\s+(.*)/g;
+		var SRTTimestampParser			= /^(\d{2})?:?(\d{2}):(\d{2})[\.\,](\d+)\s+\-\-\>\s+(\d{2})?:?(\d{2}):(\d{2})[\.\,](\d+)\s*(.*)/;
 
 		return function(subtitleElement,objectCount){
 
-			var subtitleParts, timeIn, timeOut, html, timeData, subtitlePartIndex, id, specialCueData;
+			var subtitleParts, timeIn, timeOut, html, timeData, subtitlePartIndex, id;
 			var timestampMatch, tmpCue;
 
 			// WebVTT Special Cue Logic
-			if (WebVTTDEFAULTSCueParser.exec(subtitleElement)) {
-//				cueDefaults = specialCueData.slice(2).join("");
-//				cueDefaults = cueDefaults.split(/\s+/g).filter(function(def) { return def && !!def.length; });
-				return null;
-			} else if ((specialCueData = WebVTTSTYLECueParser.exec(subtitleElement))) {
+			if (WebVTTDEFAULTSCueParser.exec(subtitleElement) || WebVTTCOMMENTCueParser.exec(subtitleElement) || WebVTTSTYLECueParser.exec(subtitleElement)) {
 				return null;
-			} else if ((specialCueData = WebVTTCOMMENTCueParser.exec(subtitleElement))) {
-				return null; // At this stage, we don't want to do anything with these.
 			}
 
 			subtitleParts = subtitleElement.split(/\n/g);
@@ -477,7 +496,7 @@ modified for webshims
 			for (subtitlePartIndex = 0; subtitlePartIndex < subtitleParts.length; subtitlePartIndex ++) {
 				var timestamp = subtitleParts[subtitlePartIndex];
 
-				if ((timestampMatch = WebVTTTimestampParser.exec(timestamp))) {
+				if ((timestampMatch = WebVTTTimestampParser.exec(timestamp)) || (timestampMatch = SRTTimestampParser.exec(timestamp))) {
 
 					// WebVTT
 
@@ -564,11 +583,6 @@ modified for webshims
 					if(regWevVTT.test(cue)){
 						isWEBVTT = true;
 					} else if(cue.replace(/\s*/ig,"").length){
-						if(!isWEBVTT){
-							webshims.error('please use WebVTT format. This is the standard');
-							complete(null);
-							break;
-						}
 						cue = mediaelement.parseCaptionChunk(cue, i);
 						if(cue){
 							track.addCue(cue);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webshims-rails
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.3
 platform: ruby
 authors:
 - David Reese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,6 +118,7 @@ files:
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-el.js
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-en.js
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-es.js
+- vendor/assets/javascripts/webshims/shims/i18n/formcfg-fa.js
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-fr.js
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-he.js
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-hi.js
@@ -133,7 +134,9 @@ files:
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-ru.js
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-sv.js
 - vendor/assets/javascripts/webshims/shims/i18n/formcfg-zh-CN.js
+- vendor/assets/javascripts/webshims/shims/i18n/formcfg-zh-TW.js
 - vendor/assets/javascripts/webshims/shims/jajax.js
+- vendor/assets/javascripts/webshims/shims/jme/_icons.scss
 - vendor/assets/javascripts/webshims/shims/jme/b.js
 - vendor/assets/javascripts/webshims/shims/jme/c.js
 - vendor/assets/javascripts/webshims/shims/jme/controls.css
@@ -158,19 +161,21 @@ files:
 - vendor/assets/javascripts/webshims/shims/jpicker/images/rangearrows.gif
 - vendor/assets/javascripts/webshims/shims/jpicker/jpicker.css
 - vendor/assets/javascripts/webshims/shims/mediaelement-core.js
+- vendor/assets/javascripts/webshims/shims/mediaelement-debug.js
 - 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/moxie/flash/Moxie.cdn.swf
+- vendor/assets/javascripts/webshims/shims/moxie/flash/Moxie.min.swf
 - vendor/assets/javascripts/webshims/shims/moxie/js/moxie.js
 - vendor/assets/javascripts/webshims/shims/moxie/silverlight/Moxie.cdn.xap
+- vendor/assets/javascripts/webshims/shims/moxie/silverlight/Moxie.min.xap
 - vendor/assets/javascripts/webshims/shims/picture.js
 - vendor/assets/javascripts/webshims/shims/plugins/jquery.ui.position.js
 - vendor/assets/javascripts/webshims/shims/promise.js
 - vendor/assets/javascripts/webshims/shims/range-ui.js
 - vendor/assets/javascripts/webshims/shims/sizzle.js
 - vendor/assets/javascripts/webshims/shims/styles/color-picker.png
-- vendor/assets/javascripts/webshims/shims/styles/config.rb
 - vendor/assets/javascripts/webshims/shims/styles/forms-ext.css
 - vendor/assets/javascripts/webshims/shims/styles/forms-picker.css
 - vendor/assets/javascripts/webshims/shims/styles/progress.gif
@@ -189,7 +194,6 @@ files:
 - vendor/assets/javascripts/webshims/shims/styles/widget.ttf
 - vendor/assets/javascripts/webshims/shims/styles/widget.woff
 - vendor/assets/javascripts/webshims/shims/swf/JarisFLVPlayer.swf
-- vendor/assets/javascripts/webshims/shims/swf/filereader.swf
 - vendor/assets/javascripts/webshims/shims/swfmini-embed.js
 - vendor/assets/javascripts/webshims/shims/swfmini.js
 - vendor/assets/javascripts/webshims/shims/track-ui.js

data/vendor/assets/javascripts/webshims/shims/styles/config.rb

@@ -1,12 +0,0 @@
-# compass config
-
-http_path = "/"
-css_dir = "/"
-sass_dir = "scss"
-images_dir = "/"
-javascripts_dir = "/"
-
-# output_style = :expanded or :nested or :compact or :compressed
-output_style = :expanded
-relative_assets = true
-line_comments = false