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

more jqm tear down

This commit is contained in:
Luke Pulverenti 2015-09-03 13:35:08 -04:00
parent 6bf7ea2ea5
commit a310b3aa39
8 changed files with 15 additions and 407 deletions

View file

@ -429,7 +429,7 @@ h1 a:hover {
margin: -10px 0 0 -10px; margin: -10px 0 0 -10px;
} }
input:not(.paper-input):not(.likePaperText):not([type='checkbox']):not([type='radio']) { input:not(.paper-input):not(.likePaperText):not([type='checkbox']):not([type='radio']):not([type='file']) {
-webkit-appearance: none; -webkit-appearance: none;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-rtl-ordering: logical; -webkit-rtl-ordering: logical;
@ -482,13 +482,17 @@ select {
font-family: inherit; font-family: inherit;
font-weight: bold; font-weight: bold;
color: inherit; color: inherit;
padding: .6em 1.9em .5em .8em; padding: .6em .8em .5em .8em;
line-height: 1.3;
text-align: center; text-align: center;
} }
.ui-page-theme-b select { .ui-page-theme-b select {
border-color: #444; border-color: #1f1f1f;
background: #373737;
}
.ui-page-theme-b select option {
color: #fff;
} }
.smoothScrollX { .smoothScrollX {

View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${HeaderMetadataManager}" data-require="jqmpopup,scripts/editorsidebar,scripts/edititemmetadata,jqmicons,scripts/edititemsubtitles,scripts/editcollectionitems,scripts/edititemimages"> <div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${HeaderMetadataManager}" data-require="jqmpopup,scripts/editorsidebar,scripts/edititemmetadata,scripts/edititemsubtitles,scripts/editcollectionitems,scripts/edititemimages">
<div> <div>
<div class="editPageSidebar" style="overflow:auto;"> <div class="editPageSidebar" style="overflow:auto;">
<div class="libraryTree"> <div class="libraryTree">

View file

@ -5,7 +5,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay,paperbuttonstyle,jqmicons" data-backbutton="true" data-menubutton="false"> <div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
<div data-role="content"> <div data-role="content">
<form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;"> <form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">

View file

@ -5,7 +5,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages,paperbuttonstyle,jqmicons" data-backbutton="true" data-menubutton="false"> <div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
<div data-role="content"> <div data-role="content">

View file

@ -2547,7 +2547,6 @@
if (showControls && options.showLimit) { if (showControls && options.showLimit) {
require(['jqmicons']);
var id = "selectPageSize"; var id = "selectPageSize";
var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections(); var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections();
@ -2564,7 +2563,7 @@
}).join(''); }).join('');
// Add styles to defeat jquery mobile // Add styles to defeat jquery mobile
html += '<div class="pageSizeContainer"><label style="font-size:inherit;" class="labelPageSize" for="' + id + '">' + Globalize.translate('LabelLimit') + '</label><select class="selectPageSize" id="' + id + '" data-inline="true" data-mini="true">' + optionsHtml + '</select></div>'; html += '<div class="pageSizeContainer"><label style="font-size:inherit;" class="labelPageSize" for="' + id + '">' + Globalize.translate('LabelLimit') + '</label><select style="width:auto;" class="selectPageSize" id="' + id + '" data-inline="true" data-mini="true">' + optionsHtml + '</select></div>';
} }
} }

View file

@ -75,25 +75,6 @@
return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false; return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false;
}; };
self.showChaptersFlyout = function () {
function onFlyoutClose() {
$('.itemVideo').css('visibility', 'visible');
}
require(['jqmicons']);
var html = getChaptersFlyoutHtml();
var elem = $('.videoChaptersPopup').html(html)
.trigger('create')
.popup("option", "positionTo", $('.videoChaptersButton'))
.off('popupafterclose', onFlyoutClose)
.on('popupafterclose', onFlyoutClose);
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
};
self.showSubtitleMenu = function () { self.showSubtitleMenu = function () {
var streams = self.currentMediaSource.MediaStreams.filter(function (currentStream) { var streams = self.currentMediaSource.MediaStreams.filter(function (currentStream) {
@ -596,16 +577,6 @@
self.changeStream(Math.floor(newPositionTicks)); self.changeStream(Math.floor(newPositionTicks));
} }
self.onChapterOptionSelected = function (elem) {
if (!$(elem).hasClass('selectedMediaPopupOption')) {
var ticks = parseInt(elem.getAttribute('data-value') || '0');
self.changeStream(ticks);
}
$('.videoChaptersPopup').popup('close');
};
self.onAudioOptionSelected = function (index) { self.onAudioOptionSelected = function (index) {
self.setAudioStreamIndex(index); self.setAudioStreamIndex(index);
@ -685,8 +656,6 @@
html += '<paper-icon-button icon="subtitles" class="mediaButton videoSubtitleButton" onclick="MediaPlayer.showSubtitleMenu();"></paper-icon-button>'; html += '<paper-icon-button icon="subtitles" class="mediaButton videoSubtitleButton" onclick="MediaPlayer.showSubtitleMenu();"></paper-icon-button>';
html += '<paper-icon-button icon="videocam" class="mediaButton videoChaptersButton" onclick="MediaPlayer.showChaptersFlyout();"></paper-icon-button>';
html += '<paper-icon-button icon="settings" class="mediaButton videoQualityButton" onclick="MediaPlayer.showQualityFlyout();"></paper-icon-button>'; html += '<paper-icon-button icon="settings" class="mediaButton videoQualityButton" onclick="MediaPlayer.showQualityFlyout();"></paper-icon-button>';
html += '<paper-icon-button icon="close" class="mediaButton" onclick="MediaPlayer.stop();"></paper-icon-button>'; html += '<paper-icon-button icon="close" class="mediaButton" onclick="MediaPlayer.stop();"></paper-icon-button>';
@ -829,86 +798,6 @@
player.removeClass("fullscreenVideo"); player.removeClass("fullscreenVideo");
} }
function getChaptersFlyoutHtml() {
var item = self.currentItem;
var currentTicks = self.getCurrentTicks();
var chapters = item.Chapters || [];
var html = '';
html += '<div class="videoPlayerPopupContent">';
html += '<ul data-role="listview" data-inset="true"><li data-role="list-divider">' + Globalize.translate('HeaderScenes') + '</li>';
html += '</ul>';
html += '<div class="videoPlayerPopupScroller">';
html += '<ul data-role="listview" data-inset="true">';
var index = 0;
html += chapters.map(function (chapter) {
var cssClass = "mediaPopupOption";
var selected = false;
// Need to embed onclick handler due to delegation not working in iOS cordova
var onclick = '';
if (currentTicks >= chapter.StartPositionTicks) {
var nextChapter = chapters[index + 1];
selected = !nextChapter || currentTicks < nextChapter.StartPositionTicks;
}
if (!selected) {
onclick = ' onclick="MediaPlayer.onChapterOptionSelected(this);"';
}
var optionHtml = '<li><a' + onclick + ' data-value="' + chapter.StartPositionTicks + '" class="' + cssClass + '" href="#" style="padding-top:0;padding-bottom:0;">';
var imgUrl = "css/images/media/chapterflyout.png";
if (chapter.ImageTag) {
optionHtml += '<img src="' + imgUrl + '" style="visibility:hidden;" />';
imgUrl = ApiClient.getScaledImageUrl(item.Id, {
width: 160,
tag: chapter.ImageTag,
type: "Chapter",
index: index
});
optionHtml += '<div class="videoChapterPopupImage" style="background-image:url(\'' + imgUrl + '\');"></div>';
} else {
optionHtml += '<img src="' + imgUrl + '" />';
}
// TODO: Add some indicator if selected = true
optionHtml += '<p style="margin:12px 0 0;">';
var textLines = [];
textLines.push(chapter.Name);
textLines.push(Dashboard.getDisplayTime(chapter.StartPositionTicks));
optionHtml += textLines.join('<br/>');
optionHtml += '</p>';
optionHtml += '</a></li>';
index++;
return optionHtml;
}).join('');
html += '</ul>';
html += '</div>';
html += '</div>';
return html;
}
function onPopState() { function onPopState() {
// Stop playback on browser back button nav // Stop playback on browser back button nav
self.stop(); self.stop();
@ -1065,12 +954,6 @@
$('.videoSubtitleButton').hide(); $('.videoSubtitleButton').hide();
} }
if (item.Chapters && item.Chapters.length && supportsContentOverVideoPlayer()) {
$('.videoChaptersButton').hide();
} else {
$('.videoChaptersButton').hide();
}
var mediaRenderer = new VideoRenderer({ var mediaRenderer = new VideoRenderer({
poster: self.getPosterUrl(item) poster: self.getPosterUrl(item)
}); });

View file

@ -922,11 +922,6 @@ fieldset.ui-controlgroup {
clip: rect(1px,1px,1px,1px); clip: rect(1px,1px,1px,1px);
} }
textarea.ui-input-text.ui-textinput-autogrow {
overflow: hidden;
}
.ui-textinput-autogrow-resize { .ui-textinput-autogrow-resize {
-webkit-transition: height 0.25s; -webkit-transition: height 0.25s;
-o-transition: height 0.25s; -o-transition: height 0.25s;
@ -1021,273 +1016,6 @@ textarea.ui-input-text.ui-textinput-autogrow {
clip: rect(1px,1px,1px,1px); clip: rect(1px,1px,1px,1px);
} }
.ui-select {
margin-top: .5em;
margin-bottom: .5em; /* no shorthand for margin because it would override margin-right for inline selects */
position: relative;
}
.ui-select > select {
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
clip: rect(1px,1px,1px,1px);
}
.ui-select .ui-btn {
margin: 0;
opacity: 1; /* Fixes #2588: When Windows Phone 7.5 (Mango) tries to calculate a numeric opacity for a select (including "inherit") without explicitly specifying an opacity on the parent to give it context, a bug appears where clicking elsewhere on the page after opening the select will open the select again. */
}
.ui-select .ui-btn select {
position: absolute;
top: 0;
left: 0;
width: 100%;
min-height: 1.5em;
min-height: 100%;
height: 3em;
max-height: 100%;
outline: 0;
-webkit-border-radius: inherit;
border-radius: inherit;
-webkit-appearance: none;
-moz-appearance: none;
cursor: pointer;
filter: Alpha(Opacity=0);
opacity: 0;
z-index: 2;
}
@-moz-document url-prefix() {
.ui-select .ui-btn select {
opacity: 0.0001;
}
}
/* Display none because of issues with IE/WP's filter alpha opacity */
.ui-select .ui-state-disabled select {
display: none;
}
/* Because we add all classes of the select and option elements to the span... */
.ui-select span.ui-state-disabled {
filter: Alpha(Opacity=100);
opacity: 1;
}
.ui-select .ui-btn.ui-select-nativeonly {
border-radius: 0;
border: 0;
}
.ui-select .ui-btn.ui-select-nativeonly select {
opacity: 1;
text-indent: 0;
display: block;
}
/* ui-li-count is styled in the listview CSS. We set padding and offset here because select supports icon position while listview doesn't. */
.ui-select .ui-li-has-count.ui-btn {
padding-right: 2.8125em;
}
.ui-select .ui-li-has-count.ui-btn-icon-right {
padding-right: 4.6875em;
}
.ui-select .ui-btn-icon-right .ui-li-count {
right: 3.2em;
}
/* We set the rules for the span as well to fix an issue on Chrome with text-overflow ellipsis for the button in combination with text-align center. */
.ui-select .ui-btn > span:not(.ui-li-count) {
display: block;
text-overflow: ellipsis;
overflow: hidden !important;
white-space: nowrap;
}
.ui-selectmenu.ui-popup {
min-width: 11em;
}
.ui-selectmenu .ui-dialog-contain {
overflow: hidden;
}
.ui-selectmenu .ui-header {
margin: 0;
padding: 0;
border-width: 0;
}
.ui-selectmenu.ui-dialog .ui-header {
z-index: 1;
position: relative;
}
.ui-selectmenu.ui-popup .ui-header {
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
border-bottom-left-radius: 0;
}
/* when no placeholder is defined in a multiple select, the header height doesn't even extend past the close button. this shim's content in there */
.ui-selectmenu.ui-popup .ui-header h1:after {
content: '.';
visibility: hidden;
}
.ui-selectmenu .ui-header .ui-title {
margin: 0 2.875em;
}
.ui-selectmenu.ui-dialog .ui-content {
overflow: visible;
z-index: 1;
}
.ui-selectmenu .ui-selectmenu-list {
margin: 0;
-webkit-border-radius: inherit;
border-radius: inherit;
}
.ui-header:not(.ui-screen-hidden) + .ui-selectmenu-list {
-webkit-border-top-right-radius: 0;
border-top-right-radius: 0;
-webkit-border-top-left-radius: 0;
border-top-left-radius: 0;
}
.ui-header.ui-screen-hidden + .ui-selectmenu-list li.ui-first-child .ui-btn {
border-top-width: 0;
}
.ui-selectmenu .ui-selectmenu-list li.ui-last-child .ui-btn {
border-bottom-width: 0;
}
.ui-selectmenu .ui-btn.ui-li-divider {
cursor: default;
}
.ui-selectmenu .ui-selectmenu-placeholder {
display: none;
}
.ui-input-text,
.ui-input-search {
margin: .5em 0;
border-width: 1px;
border-style: solid;
}
.ui-mini {
margin: .446em;
}
.ui-input-text input,
.ui-input-search input,
textarea.ui-input-text {
padding: .4em;
line-height: 1.4em;
display: block;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
outline: 0;
}
.ui-input-text input,
.ui-input-search input {
margin: 0;
min-height: 2.2em;
text-align: left; /* Opera aligns type="date" right by default */
border: 0;
background: transparent none;
-webkit-appearance: none;
-webkit-border-radius: inherit;
border-radius: inherit;
}
textarea.ui-input-text {
overflow: auto;
resize: vertical;
}
.ui-mini .ui-input-text input,
.ui-mini .ui-input-search input,
.ui-input-text.ui-mini input,
.ui-input-search.ui-mini input,
.ui-mini textarea.ui-input-text,
textarea.ui-mini {
font-size: 14px;
}
/* Same margin for mini textareas as other mini sized widgets (12.5/14 * 0.5em) */
.ui-mini textarea.ui-input-text,
textarea.ui-mini {
margin: .446em 0;
}
.ui-input-has-clear,
.ui-input-search {
position: relative;
}
/* Padding on the div instead of input because of browser spinners etc. */
.ui-input-has-clear {
padding-right: 2.375em;
}
.ui-mini.ui-input-has-clear {
padding-right: 2.923em;
}
.ui-input-has-clear input {
padding-right: 0;
/* Autofill on Chrome has bg color so we unset corners right as well. */
-webkit-border-top-right-radius: 0;
border-top-right-radius: 0;
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
}
/* Search icon */
.ui-input-search input {
padding-left: 1.75em;
}
.ui-input-search:after {
position: absolute;
left: .3125em;
top: 50%;
margin-top: -7px;
content: "";
background-position: center center;
background-repeat: no-repeat;
width: 14px;
height: 14px;
filter: Alpha(Opacity=50);
opacity: .5;
}
.ui-input-search.ui-input-has-clear .ui-btn.ui-input-clear,
.ui-input-text.ui-input-has-clear .ui-btn.ui-input-clear {
position: absolute;
right: 0;
top: 50%;
margin: -14px .3125em 0;
border: 0;
background-color: transparent;
}
.ui-input-search .ui-input-clear-hidden,
.ui-input-text .ui-input-clear-hidden {
display: none;
}
/* Resolves issue #5166: Added to support issue introduced in Firefox 15. We can likely remove this in the future. */
.ui-input-text input::-moz-placeholder,
.ui-input-search input::-moz-placeholder,
textarea.ui-input-text::-moz-placeholder {
color: #aaa;
}
/* Same for IE10 */
.ui-input-text input:-ms-input-placeholder,
.ui-input-search input:-ms-input-placeholder,
textarea.ui-input-text:-ms-input-placeholder {
color: #aaa;
}
/* Resolves issue #5131: Width of textinput depends on its type,
for Android 4.1 */
.ui-input-text input[type=number]::-webkit-outer-spin-button {
margin: 0;
}
/* Resolves issue #5756: Textinput in IE10 has a default clear button */
.ui-input-text input::-ms-clear,
.ui-input-search input::-ms-clear {
display: none;
}
.ui-input-text input:focus,
.ui-input-search input:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.ui-listview, .ui-listview,
.ui-listview > li { .ui-listview > li {

View file

@ -17,18 +17,13 @@ html {
font-size: 100%; font-size: 100%;
} }
body, body,
input,
select,
textarea,
button, button,
.ui-btn { .ui-btn {
font-size: 1em; font-size: 1em;
line-height: 1.3; line-height: 1.3;
font-family: sans-serif /*{global-font-family}*/; font-family: sans-serif /*{global-font-family}*/;
} }
legend, legend {
.ui-input-text input,
.ui-input-search input {
color: inherit; color: inherit;
text-shadow: inherit; text-shadow: inherit;
} }
@ -44,7 +39,7 @@ div.ui-controlgroup-label {
/* Field contain separator (< 28em) */ /* Field contain separator (< 28em) */
.ui-field-contain { .ui-field-contain {
border-bottom-color: #828282; border-bottom-color: #828282;
border-bottom-color: rgba(0,0,0,.15); border-bottom-color: rgba(0,0,0,.15);te
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-style: solid; border-bottom-style: solid;
} }
@ -542,8 +537,7 @@ html head + body .ui-body-b.ui-focus {
.ui-disabled, .ui-disabled,
.ui-state-disabled, .ui-state-disabled,
button[disabled], button[disabled] {
.ui-select .ui-btn.ui-state-disabled {
filter: Alpha(Opacity=30); filter: Alpha(Opacity=30);
opacity: .3; opacity: .3;
cursor: default !important; cursor: default !important;