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

don't save metadata when video content type is unset

Browse source
This commit is contained in:
Luke Pulverenti 2015-01-04 00:55:34 -05:00
parent 58672e6b65
commit aa576157fc
8 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/autoorganizelog.html
View file

@ -4,7 +4,7 @@
<title>${TitleAutoOrganize}</title> <title>${TitleAutoOrganize}</title>
</head> </head>
<body> <body>
<div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage"> <div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -30,8 +30,7 @@
<th data-priority="3">${HeaderDestination}</th> <th data-priority="3">${HeaderDestination}</th>
</tr> </tr>
</thead> </thead>
<tbody class="resultBody"> <tbody class="resultBody"></tbody>
</tbody>
</table> </table>
<br /> <br />
<div style="text-align: right;" class="legend"> <div style="text-align: right;" class="legend">

2
dashboard-ui/autoorganizetv.html
View file

@ -4,7 +4,7 @@
<title>${TitleAutoOrganize}</title> <title>${TitleAutoOrganize}</title>
</head> </head>
<body> <body>
<div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage"> <div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

2
dashboard-ui/dashboardgeneral.html
View file

@ -4,7 +4,7 @@
<title>${TitleServer}</title> <title>${TitleServer}</title>
</head> </head>
<body> <body>
<div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage"> <div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Server%20Settings">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

2
dashboard-ui/library.html
View file

@ -38,7 +38,7 @@
</div> </div>
<div data-role="content"> <div data-role="content">
<form id="textEntryForm" style="min-width:200px;"> <form id="textEntryForm" style="width:280px;">
<div id="fldCollectionType" style="margin:.5em 0 1.5em;"> <div id="fldCollectionType" style="margin:.5em 0 1.5em;">
<label for="selectCollectionType">${LabelContentType}</label> <label for="selectCollectionType">${LabelContentType}</label>
<select id="selectCollectionType" name="selectCollectionType" data-mini="true"></select> <select id="selectCollectionType" name="selectCollectionType" data-mini="true"></select>

3
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1062,7 +1062,7 @@
level: '3', level: '3',
// None of the browsers seem to like this // None of the browsers seem to like this
EnableAutoStreamCopy: false //EnableAutoStreamCopy: false
})); }));
if (isStatic && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) { if (isStatic && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) {
@ -1119,7 +1119,6 @@
html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />'; html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />';
} }
// Live streams seem to function better with mp4
var mp4BeforeWebm = self.getVideoTranscodingExtension() != '.webm'; var mp4BeforeWebm = self.getVideoTranscodingExtension() != '.webm';
if (mp4BeforeWebm) { if (mp4BeforeWebm) {

4
dashboard-ui/scripts/mediaplayer.js
View file

@ -104,7 +104,9 @@
} }
// Chrome, Firefox or IE with plugin installed // Chrome, Firefox or IE with plugin installed
if (self.canPlayWebm()) { // For some reason in chrome pausing mp4 is causing the video to fail.
// So for now it will have to prioritize webm
if (self.canPlayWebm() && ($.browser.chrome || $.browser.msie)) {
return '.webm'; return '.webm';
} }

1
dashboard-ui/useredit.html
View file

@ -79,6 +79,7 @@
<div id="fldIsHidden" style="margin: 2em 0 1em;"> <div id="fldIsHidden" style="margin: 2em 0 1em;">
<input type="checkbox" id="chkIsHidden" name="chkIsHidden" data-mini="true" /> <input type="checkbox" id="chkIsHidden" name="chkIsHidden" data-mini="true" />
<label for="chkIsHidden">${OptionHideUser}</label> <label for="chkIsHidden">${OptionHideUser}</label>
<div class="fieldDescription">${OptionHideUserFromLoginHelp}</div>
</div> </div>
</div> </div>
<br /> <br />

16
dashboard-ui/wizardlibrary.html
View file

@ -9,9 +9,14 @@
<div data-role="content"> <div data-role="content">
<div class="ui-corner-all ui-shadow wizardContent"> <div class="ui-corner-all ui-shadow wizardContent">
<h2>
<img src="css/images/mblogoicon.png" />${HeaderSetupLibrary}</h2> <div>
<h2 style="display:inline-block;">
<img src="css/images/mblogoicon.png" />${HeaderSetupLibrary}
</h2>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" target="_blank" class="accentButton accentButton-g" style="margin-top:-8px;margin-left:1em;"><i class="fa fa-info-circle"></i>${ButtonHelp}</a>
</div>
<br /> <br />
<div id="divMediaLibrary"> <div id="divMediaLibrary">
<p> <p>
@ -19,7 +24,6 @@
</p> </p>
<div id="divVirtualFolders"></div> <div id="divVirtualFolders"></div>
</div> </div>
<p><a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" target="_blank">${ReferToMediaLibraryWiki}</a></p>
<div data-role="popup" id="popupEnterText" class="popup"> <div data-role="popup" id="popupEnterText" class="popup">
@ -28,7 +32,7 @@
</div> </div>
<div data-role="content"> <div data-role="content">
<form id="textEntryForm" style="min-width:200px;"> <form id="textEntryForm" style="width:280px;">
<div id="fldCollectionType" style="margin:.5em 0 1.5em;"> <div id="fldCollectionType" style="margin:.5em 0 1.5em;">
<label for="selectCollectionType">${LabelContentType}</label> <label for="selectCollectionType">${LabelContentType}</label>
<select id="selectCollectionType" name="selectCollectionType" data-mini="true"></select> <select id="selectCollectionType" name="selectCollectionType" data-mini="true"></select>
@ -52,7 +56,7 @@
</div> </div>
</div> </div>
<br/>
<div class="wizardNavigation"> <div class="wizardNavigation">
<button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">${LabelPrevious}</button> <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">${LabelPrevious}</button>
<button type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true" onclick="WizardLibraryPage.next();">${LabelNext}</button> <button type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true" onclick="WizardLibraryPage.next();">${LabelNext}</button>