1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

add recording images

This commit is contained in:
Luke Pulverenti 2016-11-30 14:50:39 -05:00
parent 1cf155be4a
commit 327d065973
7 changed files with 15 additions and 12 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.357",
"_release": "1.4.357",
"version": "1.4.359",
"_release": "1.4.359",
"_resolution": {
"type": "version",
"tag": "1.4.357",
"commit": "f86cea07e8cbfa00553794c2320b1a1dc44749ef"
"tag": "1.4.359",
"commit": "43d813ad1e9fe65c5c525261a6e4975036240c8d"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -336,8 +336,8 @@ define(['browser'], function (browser) {
}
if (browser.tizen) {
mp4VideoCodecs.push('mpeg2video')
mp4VideoCodecs.push('vc1')
mp4VideoCodecs.push('mpeg2video');
mp4VideoCodecs.push('vc1');
}
if (canPlayMkv && mp4VideoCodecs.length) {

View file

@ -58,7 +58,7 @@
this.classList.add('mdl-js-slider');
if (browser.noFlex) {
this.classList.add('slider-no-webkit-thumb')
this.classList.add('slider-no-webkit-thumb');
}
var containerElement = this.parentNode;

View file

@ -88,7 +88,7 @@ define([], function () {
LazyLoader.lazyChildren = function (elem, callback) {
unveilElements(elem.getElementsByClassName('lazy'), elem, callback);
}
};
return LazyLoader;
});

View file

@ -179,7 +179,7 @@ define(['visibleinviewport', 'browser', 'dom'], function (visibleinviewport, bro
LazyLoader.lazyChildren = function (elem, callback) {
unveilElements(elem.getElementsByClassName('lazy'), elem, callback);
}
};
return LazyLoader;
});

View file

@ -225,6 +225,8 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
var serverId = item.ServerId;
var type = item.Type;
var playableItemId = type === 'Program' ? item.ChannelId : item.Id;
if (action === 'link') {
showItem(item, {
@ -238,7 +240,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
}
else if (action === 'instantmix') {
playbackManager.instantMix(id, serverId);
playbackManager.instantMix(playableItemId, serverId);
}
else if (action === 'play') {
@ -246,7 +248,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
var startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
playbackManager.play({
ids: [id],
ids: [playableItemId],
startPositionTicks: startPositionTicks,
serverId: serverId
});

View file

@ -7,7 +7,8 @@ define([], function () {
var NamedRegExp = function (pattern, string) {
pattern = pattern.toString();
var regexp = [];
var groupRX = /\(\?\<(.*?)\>\s?(.*?)\)/i;
//var groupRX = /\(\?\<(.*?)\>\s?(.*?)\)/i;
var groupRX = /\(\?<(.*?)\>\s?(.*?)\)/i;
while (groupRX.test(pattern)) {
var match = groupRX.exec(pattern);