vuematerial
diff --git a/‎src/components/MdProgress/MdProgressSpinner/MdProgressSpinner.vue
Copy file name to clipboard
+101-46Lines changed: 101 additions & 46 deletions b/‎src/components/MdProgress/MdProgressSpinner/MdProgressSpinner.vue
Copy file name to clipboard
+101-46Lines changed: 101 additions & 46 deletions
diff --git a/‎src/components/MdProgress/MdProgressSpinner/MdProgressSpinnerAnimation.js
Copy file name to clipboard
-83Lines changed: 0 additions & 83 deletions b/‎src/components/MdProgress/MdProgressSpinner/MdProgressSpinnerAnimation.js
Copy file name to clipboard
-83Lines changed: 0 additions & 83 deletions
@@ -6,8 +6,8 @@
         preserveAspectRatio="xMidYMid meet"
         focusable="false"
         :viewBox="`0 0 ${mdDiameter} ${mdDiameter}`"
-        :style="svgStyles">
-        <circle class="md-progress-spinner-circle" cx="50%" cy="50%" :r="circleRadius" :style="circleStyles"></circle>
+        ref="md-progress-spinner-draw">
+        <circle class="md-progress-spinner-circle" cx="50%" cy="50%" :r="circleRadius" ref="md-progress-spinner-circle"></circle>
       </svg>
     </div>
   </transition>
@@ -16,7 +16,6 @@
 <script>
   import MdComponent from 'core/MdComponent'
   import MdPropValidator from 'core/utils/MdPropValidator'
-  import INDETERMINATE_ANIMATION_TEMPLATE from './MdProgressSpinnerAnimation'
 
   const MdProgressSpinner = {
     styleTag: null,
@@ -72,22 +71,6 @@
           ['md-' + this.mdMode]: true
         }
       },
-      svgStyles () {
-        const size = `${this.mdDiameter}px`
-
-        return {
-          width: size,
-          height: size
-        }
-      },
-      circleStyles () {
-        return {
-          'stroke-dashoffset': this.circleStrokeDashOffset,
-          'stroke-dasharray': this.circleStrokeDashArray,
-          'stroke-width': this.circleStrokeWidth,
-          'animation-name': 'md-progress-spinner-stroke-rotate-' + this.mdDiameter
-        }
-      },
       circleRadius () {
         return (this.mdDiameter - this.mdStroke) / 2
       },
@@ -114,40 +97,29 @@
     },
     watch: {
       mdDiameter () {
-        this.attachStyleTag()
+        this.attachSvgStyle()
+        this.attachCircleStyle()
       }
     },
     methods: {
-      getAnimationCSS () {
-        return INDETERMINATE_ANIMATION_TEMPLATE
-            .replace(/START_VALUE/g, `${0.95 * this.circleCircumference}`)
-            .replace(/END_VALUE/g, `${0.2 * this.circleCircumference}`)
-            .replace(/DIAMETER/g, `${this.mdDiameter}`);
+      attachSvgStyle () {
+        const svg = this.$refs['md-progress-spinner-draw']
+        const size = `${this.mdDiameter}px`
+        svg.style.width = size
+        svg.style.height = size
       },
-      attachStyleTag () {
-        let styleTag = MdProgressSpinner.styleTag
-
-        if (!styleTag) {
-          styleTag = document.getElementById('md-progress-spinner-styles')
-        }
-
-        if (!styleTag) {
-          styleTag = document.createElement('style')
-
-          styleTag.id = 'md-progress-spinner-styles'
-          document.head.appendChild(styleTag)
-          MdProgressSpinner.styleTag = styleTag
-        }
-
-        if (styleTag && styleTag.sheet) {
-          styleTag.sheet.insertRule(this.getAnimationCSS(), 0)
-        }
-
-        MdProgressSpinner.diameters.add(this.mdDiameter)
+      attachCircleStyle () {
+        const circle = this.$refs['md-progress-spinner-circle']
+        circle.style.strokeDashoffset = this.circleStrokeDashOffset
+        circle.style.strokeDasharray = this.circleStrokeDashArray
+        circle.style.strokeWidth = this.circleStrokeWidth;
+        circle.style.setProperty('--md-progress-spinner-start-value', 0.95 * this.circleCircumference)
+        circle.style.setProperty('--md-progress-spinner-end-value', 0.2 * this.circleCircumference)
       }
     },
     mounted () {
-      this.attachStyleTag()
+      this.attachSvgStyle()
+      this.attachCircleStyle()
     }
   })
 </script>
@@ -197,6 +169,88 @@
       transform: rotate(4680deg)
     }
   }
+  
+  @keyframes md-progress-spinner-stroke-rotate {
+    0% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotate(0);
+    }
+
+    12.5% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotate(0);
+    }
+
+    12.51% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotateX(180deg) rotate(72.5deg);
+    }
+
+    25% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotateX(180deg) rotate(72.5deg);
+    }
+
+    25.1% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotate(270deg);
+    }
+
+    37.5% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotate(270deg);
+    }
+
+    37.51% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotateX(180deg) rotate(161.5deg);
+    }
+
+    50% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotateX(180deg) rotate(161.5deg);
+    }
+
+    50.01% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotate(180deg);
+    }
+
+    62.5% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotate(180deg);
+    }
+
+    62.51% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotateX(180deg) rotate(251.5deg);
+    }
+
+    75% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotateX(180deg) rotate(251.5deg);
+    }
+
+    75.01% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotate(90deg);
+    }
+
+    87.5% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotate(90deg);
+    }
+
+    87.51% {
+      stroke-dashoffset: var(--md-progress-spinner-end-value);
+      transform: rotateX(180deg) rotate(341.5deg);
+    }
+
+    100% {
+      stroke-dashoffset: var(--md-progress-spinner-start-value);
+      transform: rotateX(180deg) rotate(341.5deg);
+    }
+  }
 
   .md-progress-spinner {
     display: inline-flex;
@@ -217,6 +271,7 @@
 
       .md-progress-spinner-circle {
         animation: 4s infinite $md-transition-stand-timing;
+        animation-name: md-progress-spinner-stroke-rotate;
       }
     }