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

update to jquery mobile 1.4.3

This commit is contained in:
Luke Pulverenti 2014-07-02 14:34:08 -04:00
parent db0a6eb632
commit 5bec78f61f
218 changed files with 116 additions and 89 deletions

View file

@ -24,6 +24,9 @@
background-color: #000;
width: 100%;
height: auto;
/* Without this the buttons displayed over the video surface will not be clickable in safari. */
-webkit-transform-style: preserve-3d
}
.videoControls {
@ -107,7 +110,7 @@
***************************************/
#videoPlayer,
#videoPlayer .itemVideo {
.itemVideo {
position: fixed !important;
top: 0 !important;
bottom: 0 !important;
@ -121,6 +124,10 @@
max-height: 100%;
}
/* Hack for safari because it doesn't allow clickable content over the video surface. */
.itemVideo { (;top: 60px!important;); }
.itemVideo { [;top: 60px!important;]; }
#mediaPlayer .ui-slider-track, .nowPlayingBar .ui-slider-track, .nowPlayingPage .ui-slider-track {
border-color: #2ad !important;
height: 2px!important;

View file

@ -1,4 +1,5 @@
<!DOCTYPE html>

<!DOCTYPE html>
<html>
<head>
<title>${TitleAdvanced}</title>
@ -46,11 +47,6 @@
<input type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" data-mini="true" />
<div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div>
</li>
<li style="display:none;">
<input type="checkbox" id="chkAllowUpscaling" name="chkAllowUpscaling" data-mini="true" />
<label for="chkAllowUpscaling">${OptionUpscaling}</label>
<div class="fieldDescription">${OptionUpscalingHelp}</div>
</li>
<li>
<input type="checkbox" id="chkEnableDebugEncodingLogging" name="chkEnableDebugEncodingLogging" data-mini="true" />
<label for="chkEnableDebugEncodingLogging">${OptionEnableDebugTranscodingLogging}</label>

View file

@ -10,8 +10,6 @@
}).checkboxradio('refresh');
$('#chkAllowUpscaling', page).checked(config.AllowVideoUpscaling).checkboxradio("refresh");
$('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
Dashboard.hideLoadingMsg();
@ -40,7 +38,6 @@
ApiClient.getServerConfiguration().done(function (config) {
config.AllowVideoUpscaling = $('#chkAllowUpscaling', form).checked();
config.EnableDebugEncodingLogging = $('#chkEnableDebugEncodingLogging', form).checked();
config.MediaEncodingQuality = $('.radioEncodingQuality:checked', form).val();
config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();

View file

@ -1,4 +1,4 @@
function IsStorageEnabled() {
function IsStorageEnabled(skipRetry) {
if (!window.localStorage) {
return false;
@ -6,10 +6,16 @@
try {
window.localStorage.setItem("__test", "data");
} catch (err) {
if ((err.name).toUpperCase() == 'QUOTA_EXCEEDED_ERR') {
return false;
if (!skipRetry) {
if ((err.name).toUpperCase().indexOf('EXCEEDED') != -1) {
window.localStorage.clear();
return IsStorageEnabled(true);
}
}
return false;
}
return true;
}

View file

@ -49,12 +49,20 @@
values.SortOrder = query.SortOrder;
}
try {
localStorage.setItem(key + '_' + Dashboard.getCurrentUserId(), JSON.stringify(values));
} catch (e) {
}
},
saveViewSetting: function (key, value) {
try {
localStorage.setItem(key + '_' + Dashboard.getCurrentUserId() + '_view', value);
} catch (e) {
}
},
getSavedViewSetting: function (key) {
@ -1276,7 +1284,11 @@
getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting, pageSizes, showLimit) {
if (query.Limit && updatePageSizeSetting !== false) {
try {
localStorage.setItem('pagesize_', query.Limit);
} catch (e) {
}
}
var html = '';

View file

@ -73,9 +73,9 @@
html += '<div class="adminMenuOptions">';
html += '<div class="libraryMenuDivider"></div>';
//html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder dashboardViewMenu" data-itemid="dashboard" href="dashboard.html">Dashboard</a>';
html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html">Metadata Manager</a>';
html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder reportsViewMenu" data-itemid="reports" href="reports.html">Reports</a>';
//html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder dashboardViewMenu" data-itemid="dashboard" href="dashboard.html">'+Globalize.translate('ButtonDashboard')+'</a>';
html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html">' + Globalize.translate('ButtonMetadataManager') + '</a>';
html += '<a class="viewMenuLink viewMenuTextLink lnkMediaFolder reportsViewMenu" data-itemid="reports" href="reports.html">' + Globalize.translate('ButtonReports') + '</a>';
html += '</div>';
return html;
@ -170,7 +170,7 @@
html += '<div style="margin: 0 -1em;">';
html += '<a class="lnkMediaFolder viewMenuLink viewMenuTextLink homeViewMenu" href="index.html">Home</a>';
html += '<a class="lnkMediaFolder viewMenuLink viewMenuTextLink homeViewMenu" href="index.html">' + Globalize.translate('ButtonHome') + '</a>';
html += '<div class="libraryMenuDivider"></div>';
html += getViewsHtml();

View file

@ -12,15 +12,6 @@
LogPage.startInterval();
var autoScroll = localStorage.getItem("autoScrollLogPage");
if (autoScroll == "true") {
LogPage.updateAutoScroll(true);
}
else if (autoScroll == "false") {
LogPage.updateAutoScroll(false);
}
ApiClient.getSystemInfo().done(function(systemInfo) {
$('#logPath', page).html(systemInfo.LogPath);
@ -86,8 +77,6 @@
$('#chkAutoScrollBottom', page).checked(value).checkboxradio('refresh');
$('#chkAutoScroll', page).checked(value).checkboxradio('refresh');
localStorage.setItem("autoScrollLogPage", value.toString());
}
};

View file

@ -85,40 +85,60 @@
return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false;
};
function onFlyoutClose() {
$('.itemVideo').css('visibility', 'visible');
}
function onPopupOpen(elem) {
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
if ($.browser.safari) {
$('.itemVideo').css('visibility', 'hidden');
}
}
self.showSubtitleMenu = function () {
var elem = $('.videoSubtitlePopup').html(getSubtitleTracksHtml())
.trigger('create')
.popup("option", "positionTo", $('.videoSubtitleButton'));
.popup("option", "positionTo", $('.videoSubtitleButton'))
.off('popupafterclose', onFlyoutClose)
.on('popupafterclose', onFlyoutClose);
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
onPopupOpen(elem);
};
self.showQualityFlyout = function () {
var elem = $('.videoQualityPopup').html(getQualityFlyoutHtml())
.trigger('create')
.popup("option", "positionTo", $('.videoQualityButton'));
.popup("option", "positionTo", $('.videoQualityButton'))
.off('popupafterclose', onFlyoutClose)
.on('popupafterclose', onFlyoutClose);
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
onPopupOpen(elem);
};
self.showChaptersFlyout = function () {
var elem = $('.videoChaptersPopup').html(getChaptersFlyoutHtml())
.trigger('create')
.popup("option", "positionTo", $('.videoChaptersButton'));
.popup("option", "positionTo", $('.videoChaptersButton'))
.off('popupafterclose', onFlyoutClose)
.on('popupafterclose', onFlyoutClose);
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
onPopupOpen(elem);
};
self.showAudioTracksFlyout = function () {
var elem = $('.videoAudioPopup').html(getAudioTracksHtml())
.trigger('create')
.popup("option", "positionTo", $('.videoAudioButton'));
.popup("option", "positionTo", $('.videoAudioButton'))
.off('popupafterclose', onFlyoutClose)
.on('popupafterclose', onFlyoutClose);
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
onPopupOpen(elem);
};
self.setAudioStreamIndex = function (index) {
@ -512,7 +532,7 @@
var html = '';
html += '<div class="videoPlayerPopupContent">';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">Scenes</li>';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">' + Globalize.translate('HeaderScenes') + '</li>';
html += '</ul>';
html += '<div class="videoPlayerPopupScroller">';
@ -588,7 +608,7 @@
var html = '';
html += '<div class="videoPlayerPopupContent">';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">Audio Tracks</li>';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">' + Globalize.translate('HeaderAudioTracks') + '</li>';
html += '</ul>';
html += '<div class="videoPlayerPopupScroller">';
@ -613,7 +633,7 @@
}
var textLines = [];
textLines.push(stream.Language || 'Unknown language');
textLines.push(stream.Language || Globalize.translate('LabelUnknownLanguage'));
var attributes = [];
@ -673,7 +693,7 @@
var html = '';
html += '<div class="videoPlayerPopupContent">';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">Subtitles</li>';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">' + Globalize.translate('HeaderSubtitles') + '</li>';
html += '</ul>';
html += '<div class="videoPlayerPopupScroller">';
@ -698,7 +718,7 @@
}
var textLines = [];
textLines.push(stream.Language || 'Unknown language');
textLines.push(stream.Language || Globalize.translate('LabelUnknownLanguage'));
if (stream.Codec) {
textLines.push(stream.Codec);
@ -754,8 +774,9 @@
}
var html = '';
html += '<div class="videoPlayerPopupContent">';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">Video Quality</li>';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">' + Globalize.translate('HeaderVideoQuality') + '</li>';
html += '</ul>';
html += '<div class="videoPlayerPopupScroller">';
@ -1185,14 +1206,10 @@
var errorCode = this.error ? this.error.code : '';
console.log('Html5 Video error code: ' + errorCode);
var errorMsg = 'There was an error playing the video.';
var errorMsg = Globalize.translate('MessageErrorPlayingVideo');
if (item.Type == "TvChannel") {
errorMsg += " Please ensure there is an open tuner availalble.";
}
if (errorCode) {
errorMsg += " Error code: " + errorCode;
errorMsg += "<br/><br/>" + Globalize.translate('MessageEnsureOpenTuner');
}
Dashboard.alert({

View file

@ -157,9 +157,13 @@
isStatic = finalParams.isStatic;
}
if (isStatic || !ticks) {
var isSeekableMedia = self.currentMediaSource.RunTimeTicks;
var isClientSeekable = isStatic || (isSeekableMedia && transcodingExtension == '.m3u8');
if (isClientSeekable || !ticks || !isSeekableMedia) {
currentSrc = replaceQueryString(currentSrc, 'starttimeticks', '');
} else {
}
else {
currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks);
}

View file

@ -1,5 +1,7 @@
(function () {
var notificationsConfigurationKey = "notifications";
function fillItems(elem, items, cssClass, idPrefix, currentList, isEnabledList) {
var html = '<div data-role="controlgroup">';
@ -26,18 +28,18 @@
var type = getParameterByName('type');
var promise1 = ApiClient.getUsers();
var promise2 = ApiClient.getServerConfiguration();
var promise2 = ApiClient.getNamedConfiguration(notificationsConfigurationKey);
var promise3 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
var promise4 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Services"));
$.when(promise1, promise2, promise3, promise4).done(function (response1, response2, response3, response4) {
var users = response1[0];
var config = response2[0];
var notificationOptions = response2[0];
var types = response3[0];
var services = response4[0];
var notificationConfig = config.NotificationOptions.Options.filter(function (n) {
var notificationConfig = notificationOptions.Options.filter(function (n) {
return n.Type == type;
@ -97,17 +99,15 @@
var type = getParameterByName('type');
var promise1 = ApiClient.getServerConfiguration();
var promise1 = ApiClient.getNamedConfiguration(notificationsConfigurationKey);
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
$.when(promise1, promise2).done(function (response1, response2) {
var config = response1[0];
var notificationOptions = response1[0];
var types = response2[0];
var notificationOptions = config.NotificationOptions;
var notificationConfig = config.NotificationOptions.Options.filter(function (n) {
var notificationConfig = notificationOptions.Options.filter(function (n) {
return n.Type == type;
@ -147,7 +147,7 @@
return c.getAttribute('data-itemid');
});
ApiClient.updateServerConfiguration(config).done(function (r) {
ApiClient.updateNamedConfiguration(notificationsConfigurationKey, notificationOptions).done(function (r) {
Dashboard.navigate('notificationsettings.html');
});

View file

@ -8,11 +8,11 @@
html += '<thead><tr>';
html += '<th></th>';
html += '<th>Name</th>';
html += '<th>Album</th>';
html += '<th>Artist</th>';
html += '<th>Album Artist</th>';
html += '<th>Time</th>';
html += '<th>' + Globalize.translate('HeaderName') + '</th>';
html += '<th>' + Globalize.translate('HeaderAlbum') + '</th>';
html += '<th>' + Globalize.translate('HeaderArtist') + '</th>';
html += '<th>' + Globalize.translate('HeaderAlbumArtist') + '</th>';
html += '<th>' + Globalize.translate('HeaderTime') + '</th>';
html += '</tr></thead>';
html += '<tbody>';
@ -24,7 +24,7 @@
var parentName = item.SeriesName || item.Album;
html += '<tr>';
html += '<td><button type="button" data-index="' + i + '" class="lnkPlay" data-icon="play" data-iconpos="notext">Play</button></td>';
html += '<td><button type="button" data-index="' + i + '" class="lnkPlay" data-icon="play" data-iconpos="notext">' + Globalize.translate('ButtonPlay') + '</button></td>';
html += '<td>';
html += '<a href="itemdetails.html?id=' + item.Id + '">' + name + '</a>';
html += '</td>';
@ -47,7 +47,7 @@
html += '</td>';
html += '<td>' + Dashboard.getDisplayTime(item.RunTimeTicks) + '</td>';
html += '<td><button type="button" data-index="' + i + '" class="lnkRemove" data-icon="delete" data-iconpos="notext">Remove</button></td>';
html += '<td><button type="button" data-index="' + i + '" class="lnkRemove" data-icon="delete" data-iconpos="notext">' + Globalize.translate('ButtonRemove') + '</button></td>';
html += '</tr>';
});

View file

@ -1199,12 +1199,10 @@ else if (!IsStorageEnabled()) {
alert("This browser does not support local storage or is running in private mode. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.");
}
var ApiClient = MediaBrowser.ApiClient.create("Dashboard", window.dashboardVersion);
$(ApiClient).on("websocketopen", Dashboard.onWebSocketOpened).on("websocketmessage", Dashboard.onWebSocketMessageReceived);
$(function () {
ApiClient.currentUserId(Dashboard.getCurrentUserId());

File diff suppressed because one or more lines are too long

View file

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 240 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 135 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 163 B

After

Width:  |  Height:  |  Size: 163 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 249 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 253 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 318 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 302 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 160 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 167 B

After

Width:  |  Height:  |  Size: 167 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 154 B

After

Width:  |  Height:  |  Size: 154 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 250 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 251 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 204 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 226 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 227 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 123 B

After

Width:  |  Height:  |  Size: 123 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 124 B

Before After
Before After

Some files were not shown because too many files have changed in this diff Show more