milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dashboard-ui/bower_components/paper-spinner/paper-spinner.html vendored
View file

@ -9,10 +9,13 @@ 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="../paper-styles/color.html">
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="paper-spinner-styles.html">
<!--
Material design: [Progress & activity](https://www.google.com/design/spec/components/progress-activity.html)
Element providing material design circular spinner.
<paper-spinner active></paper-spinner>
@ -48,10 +51,8 @@ Custom property | Description | Default
-->
<dom-module id="paper-spinner">
<link rel="import" type="css" href="paper-spinner.css">
<template>
<style include="paper-spinner-styles"></style>
<div id="spinnerContainer" class-name="[[_spinnerContainerClassName]]">
<div class="spinner-layer layer-1">
@ -94,13 +95,10 @@ Custom property | Description | Default
</div>
</div>
</div>
</template>
<script>
Polymer({
is: 'paper-spinner',
listeners: {
@ -109,7 +107,6 @@ Custom property | Description | Default
},
properties: {
/**
* Displays the spinner.
*
@ -152,7 +149,6 @@ Custom property | Description | Default
type: String,
computed: '_computeSpinnerContainerClassName(active, _coolingDown)'
}
},
_computeSpinnerContainerClassName: function(active, coolingDown) {
@ -164,9 +160,7 @@ Custom property | Description | Default
_activeChanged: function(active, old) {
this._setAriaHidden(!active);
if (!active && old) {
this._coolingDown = true;
}
this._coolingDown = !active && old;
},
_altChanged: function(alt) {
@ -192,9 +186,6 @@ Custom property | Description | Default
this.active = false;
this._coolingDown = false;
}
});
</script>
</dom-module>