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

move tv data

This commit is contained in:
Luke Pulverenti 2015-09-29 12:29:06 -04:00
parent 09c7da7d48
commit 68e71b78db
17 changed files with 121 additions and 79 deletions

View file

@ -1,12 +1,13 @@
{ {
"name": "iron-flex-layout", "name": "iron-flex-layout",
"version": "1.0.3", "version": "1.0.4",
"description": "Provide flexbox-based layouts", "description": "Provide flexbox-based layouts",
"keywords": [ "keywords": [
"web-components", "web-components",
"polymer", "polymer",
"layout" "layout"
], ],
"main": "iron-flex-layout.html",
"private": true, "private": true,
"license": "http://polymer.github.io/LICENSE.txt", "license": "http://polymer.github.io/LICENSE.txt",
"authors": [ "authors": [
@ -21,14 +22,15 @@
}, },
"devDependencies": { "devDependencies": {
"paper-styles": "polymerelements/paper-styles#^1.0.0", "paper-styles": "polymerelements/paper-styles#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"iron-component-page": "polymerelements/iron-component-page#^1.0.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-flex-layout", "homepage": "https://github.com/PolymerElements/iron-flex-layout",
"_release": "1.0.3", "_release": "1.0.4",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.3", "tag": "v1.0.4",
"commit": "e6c2cfec18354973ac03e70dcd8afcc3c72d09b9" "commit": "dcfc54b0d358269bf0c72180b4ab090fc4931ecd"
}, },
"_source": "git://github.com/PolymerElements/iron-flex-layout.git", "_source": "git://github.com/PolymerElements/iron-flex-layout.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,12 +1,13 @@
{ {
"name": "iron-flex-layout", "name": "iron-flex-layout",
"version": "1.0.3", "version": "1.0.4",
"description": "Provide flexbox-based layouts", "description": "Provide flexbox-based layouts",
"keywords": [ "keywords": [
"web-components", "web-components",
"polymer", "polymer",
"layout" "layout"
], ],
"main": "iron-flex-layout.html",
"private": true, "private": true,
"license": "http://polymer.github.io/LICENSE.txt", "license": "http://polymer.github.io/LICENSE.txt",
"authors": [ "authors": [
@ -21,6 +22,7 @@
}, },
"devDependencies": { "devDependencies": {
"paper-styles": "polymerelements/paper-styles#^1.0.0", "paper-styles": "polymerelements/paper-styles#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"iron-component-page": "polymerelements/iron-component-page#^1.0.0"
} }
} }

View file

@ -0,0 +1,24 @@
<!doctype html>
<!--
@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
The complete set of authors may be found at http://polymer.github.io/AUTHORS
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS
-->
<html>
<head>
<title>iron-flex-layout</title>
<script src="../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../iron-component-page/iron-component-page.html">
</head>
<body>
<iron-component-page></iron-component-page>
</body>
</html>

View file

@ -10,6 +10,20 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../polymer/polymer.html"> <link rel="import" href="../polymer/polymer.html">
<!--
The `<iron-flex-layout>` component provides simple ways to use [CSS flexible box layout](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Flexible_boxes), also known as flexbox. This component provides two different ways to use flexbox:
1. [Layout classes](https://github.com/PolymerElements/iron-flex-layout/tree/master/classes). The layout class stylesheet provides a simple set of class-based flexbox rules. Layout classes let you specify layout properties directly in markup.
2. [Custom CSS mixins](https://github.com/PolymerElements/iron-flex-layout/blob/master/iron-flex-layout.html). The mixin stylesheet includes custom CSS mixins that can be applied inside a CSS rule using the `@apply` function.
A complete [guide](https://elements.polymer-project.org/guides/flex-layout) to `<iron-flex-layout>` is available.
@group Iron Elements
@pseudoElement iron-flex-layout
@demo demo/index.html
-->
<style> <style>
/* IE 10 support for HTML5 hidden attr */ /* IE 10 support for HTML5 hidden attr */
[hidden] { [hidden] {

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-menu-behavior", "name": "iron-menu-behavior",
"version": "1.0.4", "version": "1.0.5",
"description": "Provides accessible menu behavior", "description": "Provides accessible menu behavior",
"authors": "The Polymer Authors", "authors": "The Polymer Authors",
"keywords": [ "keywords": [
@ -9,7 +9,10 @@
"behavior", "behavior",
"menu" "menu"
], ],
"main": "iron-menu-behavior.html", "main": [
"iron-menu-behavior.html",
"iron-menubar-behavior.html"
],
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",
@ -30,11 +33,11 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"_release": "1.0.4", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.4", "tag": "v1.0.5",
"commit": "4ea050f534e5c418f901d432116762d0c7cb65dd" "commit": "f06af97a224fcb2098f4a0229ec2500350d4ccf0"
}, },
"_source": "git://github.com/polymerelements/iron-menu-behavior.git", "_source": "git://github.com/polymerelements/iron-menu-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-menu-behavior", "name": "iron-menu-behavior",
"version": "1.0.4", "version": "1.0.5",
"description": "Provides accessible menu behavior", "description": "Provides accessible menu behavior",
"authors": "The Polymer Authors", "authors": "The Polymer Authors",
"keywords": [ "keywords": [
@ -9,7 +9,10 @@
"behavior", "behavior",
"menu" "menu"
], ],
"main": "iron-menu-behavior.html", "main": [
"iron-menu-behavior.html",
"iron-menubar-behavior.html"
],
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",

View file

@ -30,14 +30,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/paper-ripple", "homepage": "https://github.com/PolymerElements/paper-ripple",
"_release": "1.0.2", "_release": "1.0.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.2", "tag": "v1.0.2",
"commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc" "commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc"
}, },
"_source": "git://github.com/polymerelements/paper-ripple.git", "_source": "git://github.com/PolymerElements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-ripple" "_originalSource": "PolymerElements/paper-ripple"
} }

View file

@ -267,14 +267,12 @@
var editorContent = dlg.querySelector('.editorContent'); var editorContent = dlg.querySelector('.editorContent');
reload(editorContent, item); reload(editorContent, item);
$('.btnCloseDialog', dlg).on('click', closeDialog); $('.btnCloseDialog', dlg).on('click', function() {
PaperDialogHelper.close(dlg);
});
}); });
}); });
}
function closeDialog() {
history.back();
} }
function onDialogClosed() { function onDialogClosed() {

View file

@ -170,13 +170,11 @@
var editorContent = dlg.querySelector('.editorContent'); var editorContent = dlg.querySelector('.editorContent');
initEditor(editorContent); initEditor(editorContent);
$('.btnCloseDialog', dlg).on('click', closeDialog); $('.btnCloseDialog', dlg).on('click', function () {
PaperDialogHelper.close(dlg);
});
}); });
}
function closeDialog() {
history.back();
} }
function onDialogClosed() { function onDialogClosed() {

View file

@ -85,14 +85,12 @@
var editorContent = dlg.querySelector('.editorContent'); var editorContent = dlg.querySelector('.editorContent');
reload(editorContent, item); reload(editorContent, item);
$('.btnCloseDialog', dlg).on('click', closeDialog); $('.btnCloseDialog', dlg).on('click', function () {
PaperDialogHelper.close(dlg);
});
}); });
}); });
}
function closeDialog() {
history.back();
} }
function onDialogClosed() { function onDialogClosed() {

View file

@ -26,12 +26,14 @@
} }
dlg = null; dlg = null;
if (enableHashChange()) {
$(window).off('navigate', onHashChange); $(window).off('navigate', onHashChange);
if (window.location.hash == '#' + hash) { if (window.location.hash == '#' + hash) {
history.back(); history.back();
} }
} }
}
var self = this; var self = this;
@ -42,18 +44,39 @@
Dashboard.onPopupOpen(); Dashboard.onPopupOpen();
} }
if (enableHashChange()) {
window.location.hash = hash; window.location.hash = hash;
$(window).on('navigate', onHashChange); $(window).on('navigate', onHashChange);
} }
}
function enableHashChange() {
// It's not firing popstate in response to hashbang changes
if ($.browser.msie) {
return false;
}
return true;
}
function openWithHash(dlg, hash, lockDocumentScroll) { function openWithHash(dlg, hash, lockDocumentScroll) {
new paperDialogHashHandler(dlg, hash, lockDocumentScroll); new paperDialogHashHandler(dlg, hash, lockDocumentScroll);
} }
function close(dlg) {
if (enableHashChange()) {
history.back();
} else {
dlg.close();
}
}
globalScope.PaperDialogHelper = { globalScope.PaperDialogHelper = {
openWithHash: openWithHash openWithHash: openWithHash,
close: close
}; };
})(this); })(this);

View file

@ -377,14 +377,12 @@
fillLanguages(editorContent, languages); fillLanguages(editorContent, languages);
}); });
$('.btnCloseDialog', dlg).on('click', closeDialog); $('.btnCloseDialog', dlg).on('click', function () {
PaperDialogHelper.close(dlg);
});
}); });
}); });
}
function closeDialog() {
history.back();
} }
function onDialogClosed() { function onDialogClosed() {

View file

@ -1209,7 +1209,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
top: 0; top: 0;
background-color: rgba(0, 0, 0, .3); background-color: rgba(0, 0, 0, .3);
z-index: 999; z-index: 999;
border: 2px solid #52B54B; border: 1px solid #52B54B;
} }
.itemSelectionPanel #checkbox { .itemSelectionPanel #checkbox {

View file

@ -119,7 +119,7 @@
renderOriginalAirDate: function (elem, item) { renderOriginalAirDate: function (elem, item) {
var airDate = item.OriginalAirDate; var airDate = item.PremiereDate;
if (airDate && item.IsRepeat) { if (airDate && item.IsRepeat) {

View file

@ -1944,10 +1944,6 @@ var AppInfo = {};
} }
} }
if ($.browser.msie && $.browser.tv && ($.browser.version || 11) <= 10) {
Dashboard.importCss('thirdparty/paper-ie10.css');
}
if ($.browser.safari && $.browser.mobile) { if ($.browser.safari && $.browser.mobile) {
initFastClick(); initFastClick();
} }
@ -2017,8 +2013,14 @@ var AppInfo = {};
function init(deferred, capabilities, appName, appVersion, deviceId, deviceName) { function init(deferred, capabilities, appName, appVersion, deviceId, deviceName) {
var urlArgs = "v=" + window.dashboardVersion;
if ($.browser.msie) {
urlArgs += new Date().getTime();
}
requirejs.config({ requirejs.config({
urlArgs: "v=" + window.dashboardVersion, urlArgs: urlArgs,
paths: { paths: {
"velocity": "bower_components/velocity/velocity.min" "velocity": "bower_components/velocity/velocity.min"

View file

@ -1,25 +0,0 @@
.docspinner {
/* It often doesn't disappear so just forget it */
display: none !important;
}
paper-button iron-icon {
/* They often display huge */
display: none !important;
}
paper-icon-button, paper-icon-button iron-icon {
width: 24px !important;
height: 24px !important;
}
.viewMenuBar paper-icon-button, .viewMenuBar paper-icon-button iron-icon {
width: 24px !important;
height: 50px !important;
}
.card paper-icon-button, .card paper-icon-button iron-icon {
width: 32px !important;
height: 32px !important;
}

View file

@ -7182,6 +7182,8 @@ this.fire('dom-change');
]; ];
</script> </script>
<style> <style>
/* IE 10 support for HTML5 hidden attr */ /* IE 10 support for HTML5 hidden attr */
[hidden] { [hidden] {