Merge pull request #4093 from Sionarch/ionspinner-android-fix

Stopped ion-spinner Android animation script from running indefinitely.

Author: mlynch

Diff for: js/angular/controller/spinnerController.js

@@ -330,13 +330,19 @@
   var animations = {
 
     android: function(ele) {
+      var self = this;
+
+      this.stop = false;
+
       var rIndex = 0;
       var rotateCircle = 0;
       var startTime;
       var svgEle = ele.querySelector('g');
       var circleEle = ele.querySelector('circle');
 
       function run() {
+        if (self.stop) return;
+
         var v = easeInOutCubic(Date.now() - startTime, 650);
         var scaleX = 1;
         var translateX = 0;
@@ -372,6 +378,7 @@
       return function() {
         startTime = Date.now();
         run();
+        return self;
       };
 
     }
@@ -392,7 +399,7 @@
     '$attrs',
     '$ionicConfig',
   function($element, $attrs, $ionicConfig) {
-    var spinnerName;
+    var spinnerName, anim;
 
     this.init = function() {
       spinnerName = $attrs.icon || $ionicConfig.spinner.icon();
@@ -415,7 +422,11 @@
     };
 
     this.start = function() {
-      animations[spinnerName] && animations[spinnerName]($element[0])();
+      animations[spinnerName] && (anim = animations[spinnerName]($element[0])());
+    };
+
+    this.stop = function() {
+      animations[spinnerName] && (anim.stop = true);
     };
 
   }]);

Diff for: js/angular/directive/spinner.js

@@ -188,6 +188,11 @@ IonicModule
     link: function($scope, $element, $attrs, ctrl) {
       var spinnerName = ctrl.init();
       $element.addClass('spinner spinner-' + spinnerName);
+
+      $element.on('$destroy', function onDestroy()
+      {
+        ctrl.stop();
+      });
     }
   };
 });

Diff for: js/angular/service/loading.js

@@ -185,6 +185,8 @@ function($ionicLoadingConfig, $ionicBody, $ionicTemplateLoader, $ionicBackdrop,
           }
           $timeout.cancel(self.durationTimeout);
           self.isShown = false;
+          var loading = self.element.children();
+          loading.html("");
         };
 
         return self;