mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-04-05 21:01:35 +08:00
Updated TypeScript to version 1.4.
Download from here: https://visualstudiogallery.msdn.microsoft.com/2d42d8dc-e085-45eb-a30b-3f7d50d55304
This commit is contained in:
Daniel Stolt
parent
102fb14d9a
commit
caa50ad440
@ -25,7 +25,7 @@
|
||||
<IISExpressAnonymousAuthentication />
|
||||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<TypeScriptToolsVersion>1.0</TypeScriptToolsVersion>
|
||||
<TypeScriptToolsVersion>1.4</TypeScriptToolsVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/// <reference path="typings/jquery.d.ts" />
|
||||
/// <reference path="typings/jquery.d.ts" />
|
||||
/// <reference path="typings/underscore.d.ts" />
|
||||
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 = $("<video controls>").attr("width", this.playerWidth).attr("height", this.playerHeight);
|
||||
if (firstThumbnailAsset)
|
||||
videoElement.attr("poster", firstThumbnailAsset.MainFileUrl);
|
||||
videoElement.appendTo(this.container);
|
||||
|
||||
var url = firstDynamicAsset.MpegDashUrl;
|
||||
var context = new Dash.di.DashContext();
|
||||
var player = new MediaPlayer(context);
|
||||
player.startup();
|
||||
|
||||
player.addEventListener("error", function (e) {
|
||||
_this.debug("Error of type '{0}' detected; cleaning up container and faulting this injector.", e.error);
|
||||
|
||||
// TODO: Be a little more selective here, don't fail on any error.
|
||||
_this.fault();
|
||||
});
|
||||
|
||||
player.debug.setLogToBrowserConsole(false);
|
||||
player.attachView(videoElement[0]);
|
||||
player.attachSource(url);
|
||||
player.setAutoPlay(this.autoPlay);
|
||||
};
|
||||
|
||||
DashInjector.prototype.debug = function (message) {
|
||||
var args = [];
|
||||
for (var _i = 0; _i < (arguments.length - 1); _i++) {
|
||||
args[_i] = arguments[_i + 1];
|
||||
for (var _i = 1; _i < arguments.length; _i++) {
|
||||
args[_i - 1] = arguments[_i];
|
||||
}
|
||||
_super.prototype.debug.call(this, "DashInjector: " + message, args);
|
||||
};
|
||||
return DashInjector;
|
||||
})(Injectors.Injector);
|
||||
Injectors.DashInjector = DashInjector;
|
||||
})(VideoPlayer.Injectors || (VideoPlayer.Injectors = {}));
|
||||
var Injectors = VideoPlayer.Injectors;
|
||||
})(MediaServices.VideoPlayer || (MediaServices.VideoPlayer = {}));
|
||||
var VideoPlayer = MediaServices.VideoPlayer;
|
||||
})(Azure.MediaServices || (Azure.MediaServices = {}));
|
||||
var MediaServices = Azure.MediaServices;
|
||||
})(Orchard.Azure || (Orchard.Azure = {}));
|
||||
var Azure = Orchard.Azure;
|
||||
})(Injectors = VideoPlayer.Injectors || (VideoPlayer.Injectors = {}));
|
||||
})(VideoPlayer = MediaServices.VideoPlayer || (MediaServices.VideoPlayer = {}));
|
||||
})(MediaServices = Azure.MediaServices || (Azure.MediaServices = {}));
|
||||
})(Azure = Orchard.Azure || (Orchard.Azure = {}));
|
||||
})(Orchard || (Orchard = {}));
|
||||
//# sourceMappingURL=cloudmedia-videoplayer-injectors-dash.js.map
|
||||
//# sourceMappingURL=cloudmedia-videoplayer-injectors-dash.js.map
|
||||
@ -1 +1 @@
|
||||
{"version":3,"file":"cloudmedia-videoplayer-injectors-dash.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-dash.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.debug"],"mappings":"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"}
|
||||
{"version":3,"file":"cloudmedia-videoplayer-injectors-dash.js","sourceRoot":"","sources":["cloudmedia-videoplayer-injectors-dash.ts"],"names":["Orchard","Orchard.Azure","Orchard.Azure.MediaServices","Orchard.Azure.MediaServices.VideoPlayer","Orchard.Azure.MediaServices.VideoPlayer.Injectors","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.constructor","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.isSupported","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.inject","Orchard.Azure.MediaServices.VideoPlayer.Injectors.DashInjector.debug"],"mappings":"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"}
|
||||
@ -23,10 +23,9 @@ module Orchard.Azure.MediaServices.VideoPlayer.Injectors {
|
||||
|
||||
public isSupported(): boolean {
|
||||
var videoElement: HTMLVideoElement = document.createElement("video");
|
||||
var mse: MediaSource = 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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user