Skip to content

Commit

Permalink
fix(spinners): WP doesn't support smil. default wp spinner to spinner…
Browse files Browse the repository at this point in the history
… that uses timing func. closes #3480
  • Loading branch information
perrygovier committed Apr 21, 2015
1 parent 83a4e2d commit e5930c0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
6 changes: 5 additions & 1 deletion js/angular/controller/spinnerController.js
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,11 @@
var spinnerName, spinner;

this.init = function() {
spinnerName = $attrs.icon || ionic.Platform.platform();
var override = null;
if (ionic.Platform.platform() === 'windowsphone') {
override = 'android';
}
spinnerName = $attrs.icon || override || ionic.Platform.platform();
spinner = spinners[spinnerName];
if (!spinner) {
spinnerName = 'ios';
Expand Down
9 changes: 9 additions & 0 deletions test/html/spinners.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ <h1 class="title">Spinners</h1>

<table class="table spinner-table" ng-app="ionic">
<tbody><tr>
<th>
<code>default</code>
</th>
<td>
<ion-spinner></ion-spinner>
<ion-spinner class="spinner-positive"></ion-spinner>
</td>
</tr>
<tr>
<th>
<code>android</code>
</th>
Expand Down

0 comments on commit e5930c0

Please sign in to comment.