From 664fca62a69d604c75cf0377f512cb0b386c3304 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 2 Mar 2016 13:42:39 -0500 Subject: [PATCH] update recording data --- .../bower_components/iron-icon/.bower.json | 6 ++-- .../bower_components/polymer/.bower.json | 8 ++--- .../bower_components/polymer/bower.json | 2 +- .../polymer/polymer-micro.html | 2 +- .../bower_components/polymer/polymer.html | 35 ++++++++----------- dashboard-ui/scripts/registrationservices.js | 2 +- 6 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index 75ac273a15..1dd6bd32f0 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -31,14 +31,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-icon", + "homepage": "https://github.com/polymerelements/iron-icon", "_release": "1.0.7", "_resolution": { "type": "version", "tag": "v1.0.7", "commit": "6f4d152dc3998a6cc12a5a585a654f893dc99381" }, - "_source": "git://github.com/PolymerElements/iron-icon.git", + "_source": "git://github.com/polymerelements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-icon" + "_originalSource": "polymerelements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 4752a7165f..954f23319a 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -1,6 +1,6 @@ { "name": "polymer", - "version": "1.3.0", + "version": "1.3.1", "main": [ "polymer.html", "polymer-mini.html", @@ -27,11 +27,11 @@ }, "private": true, "homepage": "https://github.com/Polymer/polymer", - "_release": "1.3.0", + "_release": "1.3.1", "_resolution": { "type": "version", - "tag": "v1.3.0", - "commit": "77504bc2092eed3ad631eff04b186b22e3affb6e" + "tag": "v1.3.1", + "commit": "61fac558012d9ef56ea78ed5435de0c418a4afbb" }, "_source": "git://github.com/Polymer/polymer.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/polymer/bower.json b/dashboard-ui/bower_components/polymer/bower.json index 1e61865441..ccae83fa5f 100644 --- a/dashboard-ui/bower_components/polymer/bower.json +++ b/dashboard-ui/bower_components/polymer/bower.json @@ -1,6 +1,6 @@ { "name": "polymer", - "version": "1.3.0", + "version": "1.3.1", "main": [ "polymer.html", "polymer-mini.html", diff --git a/dashboard-ui/bower_components/polymer/polymer-micro.html b/dashboard-ui/bower_components/polymer/polymer-micro.html index 0eca0ae35e..912b9b680f 100644 --- a/dashboard-ui/bower_components/polymer/polymer-micro.html +++ b/dashboard-ui/bower_components/polymer/polymer-micro.html @@ -652,7 +652,7 @@ return value != null ? value : undefined; } } }); -Polymer.version = '1.3.0'; +Polymer.version = '1.3.1'; Polymer.Base._addFeature({ _registerFeatures: function () { this._prepIs(); diff --git a/dashboard-ui/bower_components/polymer/polymer.html b/dashboard-ui/bower_components/polymer/polymer.html index 75793d5933..ff0da53a9b 100644 --- a/dashboard-ui/bower_components/polymer/polymer.html +++ b/dashboard-ui/bower_components/polymer/polymer.html @@ -761,7 +761,7 @@ prevent = dy > dx; prevent = dx > dy; } if (prevent) { -ev.preventDefault(); +//ev.preventDefault(); } else { Gestures.prevent('track'); } @@ -2861,7 +2861,8 @@ this._encapsulateStyle = !nativeShadow && Boolean(this._template); if (this._template) { this._styles = this._collectStyles(); var cssText = styleTransformer.elementStyles(this); -var needsStatic = this._needsStaticStyles(this._styles); +this._prepStyleProperties(); +var needsStatic = this._styles.length && !this._needsStyleProperties(); if (needsStatic || !nativeShadow) { cssText = needsStatic ? cssText : ' '; var style = styleUtil.applyCss(cssText, this.is, nativeShadow ? this._template.content : null); @@ -3001,9 +3002,10 @@ return any; } }, collectCssText: function (rule) { -var cssText = rule.parsedCssText; -cssText = cssText.replace(this.rx.BRACKETED, '').replace(this.rx.VAR_ASSIGN, ''); -return cssText; +return this.collectConsumingCssText(rule.parsedCssText); +}, +collectConsumingCssText: function (cssText) { +return cssText.replace(this.rx.BRACKETED, '').replace(this.rx.VAR_ASSIGN, ''); }, collectPropertiesInCssText: function (cssText, props) { var m; @@ -3158,7 +3160,7 @@ self._scopeSelector(rule, hostRx, hostSelector, element._scopeCssViaAttr, scopeS _elementKeyframeTransforms: function (element, scopeSelector) { var keyframesRules = element._styles._keyframes; var keyframeTransforms = {}; -if (!nativeShadow) { +if (!nativeShadow && keyframesRules) { for (var i = 0, keyframesRule = keyframesRules[i]; i < keyframesRules.length; keyframesRule = keyframesRules[++i]) { this._scopeKeyframes(keyframesRule, scopeSelector); keyframeTransforms[keyframesRule.keyframesName] = this._keyframesRuleTransformer(keyframesRule); @@ -3347,24 +3349,12 @@ return api; 'use strict'; var serializeValueToAttribute = Polymer.Base.serializeValueToAttribute; var propertyUtils = Polymer.StyleProperties; -var styleUtil = Polymer.StyleUtil; var styleTransformer = Polymer.StyleTransformer; var styleDefaults = Polymer.StyleDefaults; var nativeShadow = Polymer.Settings.useNativeShadow; 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 () { -this._ownStylePropertyNames = this._styles ? propertyUtils.decorateStyles(this._styles) : null; +this._ownStylePropertyNames = this._styles && this._styles.length ? propertyUtils.decorateStyles(this._styles) : null; }, customStyle: null, getComputedStyleValue: function (property) { @@ -3523,7 +3513,6 @@ this._prepIs(); this._prepConstructor(); this._prepTemplate(); this._prepStyles(); -this._prepStyleProperties(); this._prepAnnotations(); this._prepEffects(); this._prepBehaviors(); @@ -4719,8 +4708,14 @@ _template: null, created: function () { var self = this; Polymer.RenderStatus.whenReady(function () { +if (document.readyState == 'loading') { +document.addEventListener('DOMContentLoaded', function () { self._markImportsReady(); }); +} else { +self._markImportsReady(); +} +}); }, _ensureReady: function () { if (!this._readied) { diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js index 4aee9b678e..3e9265e3dc 100644 --- a/dashboard-ui/scripts/registrationservices.js +++ b/dashboard-ui/scripts/registrationservices.js @@ -18,7 +18,7 @@ appStorage.setItem(supporterPlaybackKey, new Date().getTime()); resolve(); } - else if ((new Date().getTime() - lastMessage) > 345600000) { + else if ((new Date().getTime() - lastMessage) > 259200000) { showPlaybackOverlay(resolve, reject); } else {