mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
3.0.5675.1
This commit is contained in:
parent
844f27d953
commit
c886b12570
7 changed files with 36 additions and 34 deletions
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"name": "iron-form-element-behavior",
|
"name": "iron-form-element-behavior",
|
||||||
"version": "1.0.2",
|
"version": "1.0.3",
|
||||||
"license": "http://polymer.github.io/LICENSE.txt",
|
"license": "http://polymer.github.io/LICENSE.txt",
|
||||||
"private": true,
|
"private": true,
|
||||||
"main": "iron-form-element-behavior",
|
"main": "iron-form-element-behavior.html",
|
||||||
"authors": "The Polymer Authors",
|
"authors": "The Polymer Authors",
|
||||||
"description": "Enables a custom element to be included in an iron-form",
|
"description": "Enables a custom element to be included in an iron-form",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
|
@ -26,11 +26,11 @@
|
||||||
"paper-styles": "PolymerElements/paper-styles#^1.0.0"
|
"paper-styles": "PolymerElements/paper-styles#^1.0.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/PolymerElements/iron-form-element-behavior",
|
"homepage": "https://github.com/PolymerElements/iron-form-element-behavior",
|
||||||
"_release": "1.0.2",
|
"_release": "1.0.3",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.2",
|
"tag": "v1.0.3",
|
||||||
"commit": "3d46178a7cd9e4025004476a8fd0eef7a5416cd3"
|
"commit": "a55bc86f6f4fcba1d1c08d6bfaa26ba145ce3112"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/iron-form-element-behavior.git",
|
"_source": "git://github.com/PolymerElements/iron-form-element-behavior.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"name": "iron-form-element-behavior",
|
"name": "iron-form-element-behavior",
|
||||||
"version": "1.0.2",
|
"version": "1.0.3",
|
||||||
"license": "http://polymer.github.io/LICENSE.txt",
|
"license": "http://polymer.github.io/LICENSE.txt",
|
||||||
"private": true,
|
"private": true,
|
||||||
"main": "iron-form-element-behavior",
|
"main": "iron-form-element-behavior.html",
|
||||||
"authors": "The Polymer Authors",
|
"authors": "The Polymer Authors",
|
||||||
"description": "Enables a custom element to be included in an iron-form",
|
"description": "Enables a custom element to be included in an iron-form",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
|
|
|
@ -35,6 +35,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
||||||
|
|
||||||
_elementRegistered: function(e) {
|
_elementRegistered: function(e) {
|
||||||
this.formElements.push(e.target);
|
this.formElements.push(e.target);
|
||||||
|
e.target._parentForm = this;
|
||||||
},
|
},
|
||||||
|
|
||||||
_elementUnregistered: function(e) {
|
_elementUnregistered: function(e) {
|
||||||
|
|
|
@ -52,8 +52,7 @@ Enables a custom element to be included in an `iron-form`.
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Need to keep a reference to the form this element is registered
|
* The form that the element is registered to.
|
||||||
* to, so that it can unregister if detached.
|
|
||||||
*/
|
*/
|
||||||
_parentForm: {
|
_parentForm: {
|
||||||
type: Object
|
type: Object
|
||||||
|
@ -61,7 +60,8 @@ Enables a custom element to be included in an `iron-form`.
|
||||||
},
|
},
|
||||||
|
|
||||||
attached: function() {
|
attached: function() {
|
||||||
this._parentForm = Polymer.dom(this).parentNode;
|
// Note: the iron-form that this element belongs to will set this
|
||||||
|
// element's _parentForm property when handling this event.
|
||||||
this.fire('iron-form-element-register');
|
this.fire('iron-form-element-register');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -336,7 +336,13 @@
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
|
if (isViblastStarted) {
|
||||||
|
viblast(elem).stop();
|
||||||
|
isViblastStarted = false;
|
||||||
|
}
|
||||||
|
|
||||||
if (startTime) {
|
if (startTime) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
elem.currentTime = startTime;
|
elem.currentTime = startTime;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
|
@ -281,22 +281,16 @@
|
||||||
|
|
||||||
profile.ContainerProfiles = [];
|
profile.ContainerProfiles = [];
|
||||||
|
|
||||||
var audioConditions = [];
|
var maxAudioChannels = isVlc ? '6' : '2';
|
||||||
|
|
||||||
var maxAudioChannels = $.browser.msie || $.browser.safari ?
|
|
||||||
'2' :
|
|
||||||
'6';
|
|
||||||
|
|
||||||
audioConditions.push({
|
|
||||||
Condition: 'LessThanEqual',
|
|
||||||
Property: 'AudioChannels',
|
|
||||||
Value: maxAudioChannels
|
|
||||||
});
|
|
||||||
|
|
||||||
profile.CodecProfiles = [];
|
profile.CodecProfiles = [];
|
||||||
profile.CodecProfiles.push({
|
profile.CodecProfiles.push({
|
||||||
Type: 'Audio',
|
Type: 'Audio',
|
||||||
Conditions: audioConditions
|
Conditions: [{
|
||||||
|
Condition: 'LessThanEqual',
|
||||||
|
Property: 'AudioChannels',
|
||||||
|
Value: '2'
|
||||||
|
}]
|
||||||
});
|
});
|
||||||
|
|
||||||
profile.CodecProfiles.push({
|
profile.CodecProfiles.push({
|
||||||
|
@ -576,13 +570,6 @@
|
||||||
var playSessionId = getParameterByName('PlaySessionId', currentSrc);
|
var playSessionId = getParameterByName('PlaySessionId', currentSrc);
|
||||||
var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
|
var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
|
||||||
|
|
||||||
if (params.AudioStreamIndex == null && params.SubtitleStreamIndex == null && params.Bitrate == null) {
|
|
||||||
|
|
||||||
currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks || 0);
|
|
||||||
changeStreamToUrl(mediaRenderer, playSessionId, currentSrc, ticks);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var deviceProfile = self.getDeviceProfile();
|
var deviceProfile = self.getDeviceProfile();
|
||||||
|
|
||||||
var audioStreamIndex = params.AudioStreamIndex == null ? (getParameterByName('AudioStreamIndex', currentSrc) || null) : params.AudioStreamIndex;
|
var audioStreamIndex = params.AudioStreamIndex == null ? (getParameterByName('AudioStreamIndex', currentSrc) || null) : params.AudioStreamIndex;
|
||||||
|
@ -600,10 +587,12 @@
|
||||||
if (validatePlaybackInfoResult(result)) {
|
if (validatePlaybackInfoResult(result)) {
|
||||||
|
|
||||||
self.currentMediaSource = result.MediaSources[0];
|
self.currentMediaSource = result.MediaSources[0];
|
||||||
|
var streamInfo = self.createStreamInfo(self.currentItem.MediaType, self.currentItem, self.currentMediaSource, ticks);
|
||||||
|
|
||||||
self.currentSubtitleStreamIndex = subtitleStreamIndex;
|
self.currentSubtitleStreamIndex = subtitleStreamIndex;
|
||||||
|
|
||||||
currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
|
currentSrc = streamInfo.url;
|
||||||
changeStreamToUrl(mediaRenderer, playSessionId, currentSrc, ticks);
|
changeStreamToUrl(mediaRenderer, playSessionId, currentSrc, streamInfo.startTimeTicksOffset || 0);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -631,14 +620,15 @@
|
||||||
if (self.currentItem.MediaType == "Video") {
|
if (self.currentItem.MediaType == "Video") {
|
||||||
ApiClient.stopActiveEncodings(playSessionId).done(function () {
|
ApiClient.stopActiveEncodings(playSessionId).done(function () {
|
||||||
|
|
||||||
self.startTimeTicksOffset = newPositionTicks;
|
//self.startTimeTicksOffset = newPositionTicks;
|
||||||
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
|
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
self.startTimeTicksOffset = newPositionTicks || 0;
|
||||||
self.updateTextStreamUrls(newPositionTicks || 0);
|
self.updateTextStreamUrls(newPositionTicks || 0);
|
||||||
} else {
|
} else {
|
||||||
self.startTimeTicksOffset = newPositionTicks;
|
self.startTimeTicksOffset = newPositionTicks || 0;
|
||||||
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
|
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2030,7 +2030,12 @@ var AppInfo = {};
|
||||||
var drawer = document.querySelector('.mainDrawerPanel');
|
var drawer = document.querySelector('.mainDrawerPanel');
|
||||||
drawer.classList.remove('mainDrawerPanelPreInit');
|
drawer.classList.remove('mainDrawerPanelPreInit');
|
||||||
drawer.forceNarrow = true;
|
drawer.forceNarrow = true;
|
||||||
drawer.drawerWidth = screen.availWidth >= 350 ? "310px" : screen.availWidth >= 310 ? "290px" : "270px";
|
var drawerWidth = screen.availWidth - 50;
|
||||||
|
// At least 240
|
||||||
|
drawerWidth = Math.max(drawerWidth, 240);
|
||||||
|
// But not exceeding 310
|
||||||
|
drawerWidth = Math.min(drawerWidth, 310);
|
||||||
|
drawer.drawerWidth = drawerWidth + "px";
|
||||||
|
|
||||||
if ($.browser.safari && !AppInfo.isNativeApp) {
|
if ($.browser.safari && !AppInfo.isNativeApp) {
|
||||||
drawer.disableEdgeSwipe = true;
|
drawer.disableEdgeSwipe = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue