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

update recording data

This commit is contained in:
Luke Pulverenti 2016-03-02 13:42:39 -05:00
parent a08bf4ec89
commit 664fca62a6
6 changed files with 25 additions and 30 deletions

View file

@ -31,14 +31,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-icon", "homepage": "https://github.com/polymerelements/iron-icon",
"_release": "1.0.7", "_release": "1.0.7",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.7", "tag": "v1.0.7",
"commit": "6f4d152dc3998a6cc12a5a585a654f893dc99381" "commit": "6f4d152dc3998a6cc12a5a585a654f893dc99381"
}, },
"_source": "git://github.com/PolymerElements/iron-icon.git", "_source": "git://github.com/polymerelements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-icon" "_originalSource": "polymerelements/iron-icon"
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "polymer", "name": "polymer",
"version": "1.3.0", "version": "1.3.1",
"main": [ "main": [
"polymer.html", "polymer.html",
"polymer-mini.html", "polymer-mini.html",
@ -27,11 +27,11 @@
}, },
"private": true, "private": true,
"homepage": "https://github.com/Polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.3.0", "_release": "1.3.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.3.0", "tag": "v1.3.1",
"commit": "77504bc2092eed3ad631eff04b186b22e3affb6e" "commit": "61fac558012d9ef56ea78ed5435de0c418a4afbb"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,6 +1,6 @@
{ {
"name": "polymer", "name": "polymer",
"version": "1.3.0", "version": "1.3.1",
"main": [ "main": [
"polymer.html", "polymer.html",
"polymer-mini.html", "polymer-mini.html",

View file

@ -652,7 +652,7 @@ return value != null ? value : undefined;
} }
} }
}); });
Polymer.version = '1.3.0'; Polymer.version = '1.3.1';
Polymer.Base._addFeature({ Polymer.Base._addFeature({
_registerFeatures: function () { _registerFeatures: function () {
this._prepIs(); this._prepIs();

View file

@ -761,7 +761,7 @@ prevent = dy > dx;
prevent = dx > dy; prevent = dx > dy;
} }
if (prevent) { if (prevent) {
ev.preventDefault(); //ev.preventDefault();
} else { } else {
Gestures.prevent('track'); Gestures.prevent('track');
} }
@ -2861,7 +2861,8 @@ this._encapsulateStyle = !nativeShadow && Boolean(this._template);
if (this._template) { if (this._template) {
this._styles = this._collectStyles(); this._styles = this._collectStyles();
var cssText = styleTransformer.elementStyles(this); var cssText = styleTransformer.elementStyles(this);
var needsStatic = this._needsStaticStyles(this._styles); this._prepStyleProperties();
var needsStatic = this._styles.length && !this._needsStyleProperties();
if (needsStatic || !nativeShadow) { if (needsStatic || !nativeShadow) {
cssText = needsStatic ? cssText : ' '; cssText = needsStatic ? cssText : ' ';
var style = styleUtil.applyCss(cssText, this.is, nativeShadow ? this._template.content : null); var style = styleUtil.applyCss(cssText, this.is, nativeShadow ? this._template.content : null);
@ -3001,9 +3002,10 @@ return any;
} }
}, },
collectCssText: function (rule) { collectCssText: function (rule) {
var cssText = rule.parsedCssText; return this.collectConsumingCssText(rule.parsedCssText);
cssText = cssText.replace(this.rx.BRACKETED, '').replace(this.rx.VAR_ASSIGN, ''); },
return cssText; collectConsumingCssText: function (cssText) {
return cssText.replace(this.rx.BRACKETED, '').replace(this.rx.VAR_ASSIGN, '');
}, },
collectPropertiesInCssText: function (cssText, props) { collectPropertiesInCssText: function (cssText, props) {
var m; var m;
@ -3158,7 +3160,7 @@ self._scopeSelector(rule, hostRx, hostSelector, element._scopeCssViaAttr, scopeS
_elementKeyframeTransforms: function (element, scopeSelector) { _elementKeyframeTransforms: function (element, scopeSelector) {
var keyframesRules = element._styles._keyframes; var keyframesRules = element._styles._keyframes;
var keyframeTransforms = {}; var keyframeTransforms = {};
if (!nativeShadow) { if (!nativeShadow && keyframesRules) {
for (var i = 0, keyframesRule = keyframesRules[i]; i < keyframesRules.length; keyframesRule = keyframesRules[++i]) { for (var i = 0, keyframesRule = keyframesRules[i]; i < keyframesRules.length; keyframesRule = keyframesRules[++i]) {
this._scopeKeyframes(keyframesRule, scopeSelector); this._scopeKeyframes(keyframesRule, scopeSelector);
keyframeTransforms[keyframesRule.keyframesName] = this._keyframesRuleTransformer(keyframesRule); keyframeTransforms[keyframesRule.keyframesName] = this._keyframesRuleTransformer(keyframesRule);
@ -3347,24 +3349,12 @@ return api;
'use strict'; 'use strict';
var serializeValueToAttribute = Polymer.Base.serializeValueToAttribute; var serializeValueToAttribute = Polymer.Base.serializeValueToAttribute;
var propertyUtils = Polymer.StyleProperties; var propertyUtils = Polymer.StyleProperties;
var styleUtil = Polymer.StyleUtil;
var styleTransformer = Polymer.StyleTransformer; var styleTransformer = Polymer.StyleTransformer;
var styleDefaults = Polymer.StyleDefaults; var styleDefaults = Polymer.StyleDefaults;
var nativeShadow = Polymer.Settings.useNativeShadow; var nativeShadow = Polymer.Settings.useNativeShadow;
Polymer.Base._addFeature({ Polymer.Base._addFeature({
_needsStaticStyles: function (styles) {
var needsStatic;
for (var i = 0, l = styles.length, css; i < l; i++) {
css = styleUtil.parser._clean(styles[i].textContent);
needsStatic = needsStatic || Boolean(css);
if (css.match(propertyUtils.rx.MIXIN_MATCH) || css.match(propertyUtils.rx.VAR_MATCH)) {
return false;
}
}
return needsStatic;
},
_prepStyleProperties: function () { _prepStyleProperties: function () {
this._ownStylePropertyNames = this._styles ? propertyUtils.decorateStyles(this._styles) : null; this._ownStylePropertyNames = this._styles && this._styles.length ? propertyUtils.decorateStyles(this._styles) : null;
}, },
customStyle: null, customStyle: null,
getComputedStyleValue: function (property) { getComputedStyleValue: function (property) {
@ -3523,7 +3513,6 @@ this._prepIs();
this._prepConstructor(); this._prepConstructor();
this._prepTemplate(); this._prepTemplate();
this._prepStyles(); this._prepStyles();
this._prepStyleProperties();
this._prepAnnotations(); this._prepAnnotations();
this._prepEffects(); this._prepEffects();
this._prepBehaviors(); this._prepBehaviors();
@ -4719,8 +4708,14 @@ _template: null,
created: function () { created: function () {
var self = this; var self = this;
Polymer.RenderStatus.whenReady(function () { Polymer.RenderStatus.whenReady(function () {
if (document.readyState == 'loading') {
document.addEventListener('DOMContentLoaded', function () {
self._markImportsReady(); self._markImportsReady();
}); });
} else {
self._markImportsReady();
}
});
}, },
_ensureReady: function () { _ensureReady: function () {
if (!this._readied) { if (!this._readied) {

View file

@ -18,7 +18,7 @@
appStorage.setItem(supporterPlaybackKey, new Date().getTime()); appStorage.setItem(supporterPlaybackKey, new Date().getTime());
resolve(); resolve();
} }
else if ((new Date().getTime() - lastMessage) > 345600000) { else if ((new Date().getTime() - lastMessage) > 259200000) {
showPlaybackOverlay(resolve, reject); showPlaybackOverlay(resolve, reject);
} else { } else {