lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source
This commit is contained in:
Sebastien Ros
2014-05-29 15:56:30 -07:00
parent ab431c6e89 a35b0effee
commit ac79d66e69
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-html5.js
View File

@@ -53,7 +53,7 @@ var Orchard;
// "Raw" asset video file URLs from dynamic assets (in decending bitrate order).
_(this.assetData.DynamicVideoAssets).forEach(function (asset) {
_(asset.EncoderMetadata.AssetFiles).filter(function (assetFile) {
_((asset.EncoderMetadata && asset.EncoderMetadata.AssetFiles) || []).filter(function (assetFile) {
return _(assetFile.VideoTracks).any();
}).sort(function (assetFile) {
return assetFile.Bitrate;

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-videoplayer-injectors-html5.ts
View File

@@ -42,7 +42,7 @@ module Orchard.Azure.MediaServices.VideoPlayer.Injectors {
// "Raw" asset video file URLs from dynamic assets (in decending bitrate order).
_(this.assetData.DynamicVideoAssets).forEach(asset => { // Read from assetData because browser will do media query filtering.
_(asset.EncoderMetadata.AssetFiles)
_((asset.EncoderMetadata && asset.EncoderMetadata.AssetFiles) || [])
.filter(assetFile => _(assetFile.VideoTracks).any())
.sort(assetFile => assetFile.Bitrate).reverse()
.forEach(assetFile => {