feat(spinner): Allow ionSpinner default to be set by ionicConfigProvi…

…der Closes #3877
ionic-team · Jun 12, 2015 · cf338cf · cf338cf
1 parent 42ed212
commit cf338cf
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 15 deletions.
diff --git a/js/angular/controller/spinnerController.js b/js/angular/controller/spinnerController.js
@@ -390,20 +390,12 @@
   .controller('$ionicSpinner', [
     '$element',
     '$attrs',
-  function($element, $attrs) {
-    var spinnerName, spinner;
+    '$ionicConfig',
+  function($element, $attrs, $ionicConfig) {
+    var spinnerName;
 
     this.init = function() {
-      var override = null;
-      if (ionic.Platform.platform() === 'windowsphone') {
-        override = 'android';
-      }
-      spinnerName = $attrs.icon || override || ionic.Platform.platform();
-      spinner = spinners[spinnerName];
-      if (!spinner) {
-        spinnerName = 'ios';
-        spinner = spinners.ios;
-      }
+      spinnerName = $attrs.icon || $ionicConfig.spinner.icon();
 
       var container = document.createElement('div');
       createSvgElement('svg', {

diff --git a/js/angular/service/ionicConfig.js b/js/angular/service/ionicConfig.js
@@ -138,6 +138,14 @@
  * @returns {string}
  */
 
+/**
+ * @ngdoc method
+ * @name $ionicConfigProvider#spinner.icon
+ * @description Spinner icon.
+ * @param {string} value
+ * @returns {string}
+ */
+
 /**
  * @ngdoc method
  * @name $ionicConfigProvider#tabs.style
@@ -253,6 +261,9 @@ IonicModule
     scrolling: {
       jsScrolling: PLATFORM
     },
+    spinner: {
+      icon: PLATFORM
+    },
     tabs: {
       style: PLATFORM,
       position: PLATFORM
@@ -300,6 +311,10 @@ IonicModule
       jsScrolling: true
     },
 
+    spinner: {
+      icon: 'ios'
+    },
+
     tabs: {
       style: 'standard',
       position: 'bottom'
@@ -345,6 +360,10 @@ IonicModule
       toggle: 'small'
     },
 
+    spinner: {
+      icon: 'android'
+    },
+
     tabs: {
       style: 'striped',
       position: 'top'
@@ -358,6 +377,9 @@ IonicModule
     //scrolling: {
     //  jsScrolling: false
     //}
+    spinner: {
+      icon: 'android'
+    }
   });
 
 

diff --git a/test/html/spinners.html b/test/html/spinners.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
-<html ng-app="ionic">
+<html ng-app="ionic.example">
   <head>
     <meta charset="utf-8">
     <title>Spinners</title>
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="stylesheet" href="../../../../dist/css/ionic.css">
     <script src="../../../../dist/js/ionic.bundle.js"></script>
   </head>
-  <body>
+  <body ng-controller="SpinnerCtrl">>
 
     <header class="bar bar-header bar-royal">
       <h1 class="title">Spinners</h1>
@@ -124,6 +124,11 @@ <h1 class="title">Spinners</h1>
       </tbody></table>
 
     </ion-content>
-
+    <script>
+      angular.module('ionic.example', ['ionic'])
+      .controller('SpinnerCtrl', function($scope, $ionicConfig) {
+        //$ionicConfig.spinner.icon('lines');
+      });
+    </script>
   </body>
 </html>
diff --git a/test/unit/angular/directive/spinner.js b/test/unit/angular/directive/spinner.js
@@ -0,0 +1,23 @@
+describe('Ionic Spinner', function() {
+  var el, scope, compile;
+
+  beforeEach(module('ionic'));
+
+  beforeEach(inject(function($compile, $rootScope) {
+    compile = $compile;
+    scope = $rootScope;
+  }));
+
+  it('should compile and output an svg', function() {
+    el = compile('<ion-spinner>')(scope);
+    var spinner = el.find('svg');
+    expect(spinner.length).toEqual(1);
+  });
+
+  it('should add config setting class', inject(function($ionicConfig){
+    $ionicConfig.spinner.icon('android');
+    el = compile('<ion-spinner>')(scope);
+    expect(el.is('.spinner-android')).toEqual(true);
+  }));
+
+});