From caa50ad440e166044648c7f4464bf261ee8e9e85 Mon Sep 17 00:00:00 2001 From: Daniel Stolt Date: Mon, 23 Feb 2015 15:23:15 +0100 Subject: [PATCH] Updated TypeScript to version 1.4. Download from here: https://visualstudiogallery.msdn.microsoft.com/2d42d8dc-e085-45eb-a30b-3f7d50d55304 --- .../Orchard.Azure.MediaServices.csproj | 2 +- .../cloudmedia-videoplayer-injectors-dash.js | 39 +++++++------------ ...oudmedia-videoplayer-injectors-dash.js.map | 2 +- .../cloudmedia-videoplayer-injectors-dash.ts | 3 +- 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj index 5da7d5bd5..3e10f1dab 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj @@ -25,7 +25,7 @@ - 1.0 + 1.4 true diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-dash.js b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-dash.js index 4b3334b07..ad81cec06 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-dash.js +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-dash.js @@ -1,4 +1,4 @@ -/// +/// /// var __extends = this.__extends || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; @@ -8,9 +8,13 @@ var __extends = this.__extends || function (d, b) { }; var Orchard; (function (Orchard) { + var Azure; (function (Azure) { + var MediaServices; (function (MediaServices) { + var VideoPlayer; (function (VideoPlayer) { + var Injectors; (function (Injectors) { var DashInjector = (function (_super) { __extends(DashInjector, _super); @@ -19,69 +23,52 @@ var Orchard; } DashInjector.prototype.isSupported = function () { var videoElement = document.createElement("video"); - var mse = window["MediaSource"] || window["WebKitMediaSource"]; - var hasH264 = videoElement && videoElement.canPlayType && !!videoElement.canPlayType("video/mp4; codecs=\"avc1.42001E, mp4a.40.2\""); - var hasMse = mse && mse.isTypeSupported && mse.isTypeSupported("video/mp4; codecs=\"avc1.4d404f\""); + var hasMse = MediaSource && MediaSource.isTypeSupported && MediaSource.isTypeSupported("video/mp4; codecs=\"avc1.4d404f\""); var hasDynamicAssets = _(this.filteredAssets().DynamicVideoAssets).any(); - this.debug("Browser supports HTML5 video and the H264 and AAC codecs: {0}", hasH264); this.debug("Browser supports the Media Source Extensions API: {0}", hasMse); this.debug("Item has at least one dynamic video asset: {0}", hasDynamicAssets); - var result = hasH264 && hasMse && hasDynamicAssets; this.debug("isSupported() returns {0}.", result); - return result; }; - DashInjector.prototype.inject = function () { var _this = this; var firstDynamicAsset = _(this.filteredAssets().DynamicVideoAssets).first(); var firstThumbnailAsset = _(this.filteredAssets().ThumbnailAssets).first(); - this.debug("Injecting player into element '{0}'.", this.container.id); - var videoElement = $("