Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 2dcc90e

Browse files
crisbetoThomasBurleson
authored andcommitted
fix(select): spinner size
Due to the new changes in the `progressCircular` component, the spinner was being rendered bigger than usual. This change reverts to the old size. Fixes #7505. Closes #7506
1 parent 3a41828 commit 2dcc90e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/components/select/select.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ angular.module('material.components.select', [
8787
* </hljs>
8888
*
8989
* At first one might expect that the select should be populated with "Bob" as the selected user. However,
90-
* this is not true. To determine whether something is selected,
90+
* this is not true. To determine whether something is selected,
9191
* `ngModelController` is looking at whether `$scope.selectedUser == (any user in $scope.users);`;
92-
*
92+
*
9393
* Javascript's `==` operator does not check for deep equality (ie. that all properties
9494
* on the object are the same), but instead whether the objects are *the same object in memory*.
9595
* In this case, we have two instances of identical objects, but they exist in memory as unique
@@ -98,7 +98,7 @@ angular.module('material.components.select', [
9898
* To get around this, `ngModelController` provides a `track by` option that allows us to specify a different
9999
* expression which will be used for the equality operator. As such, we can update our `html` to
100100
* make use of this by specifying the `ng-model-options="{trackBy: '$value.id'}"` on the `md-select`
101-
* element. This converts our equality expression to be
101+
* element. This converts our equality expression to be
102102
* `$scope.selectedUser.id == (any id in $scope.users.map(function(u) { return u.id; }));`
103103
* which results in Bob being selected as desired.
104104
*
@@ -144,7 +144,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
144144
.find('md-content')
145145
.prepend(angular.element(
146146
'<div>' +
147-
' <md-progress-circular md-mode="{{progressMode}}" ng-hide="$$loadingAsyncDone"></md-progress-circular>' +
147+
' <md-progress-circular md-mode="{{progressMode}}" ng-hide="$$loadingAsyncDone" md-diameter="25px"></md-progress-circular>' +
148148
'</div>'
149149
));
150150

@@ -284,7 +284,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdTheming, $mdAria, $compile, $par
284284
}
285285
});
286286

287-
// Wait until postDigest so that we attach after ngModel's
287+
// Wait until postDigest so that we attach after ngModel's
288288
// blur listener so we can set untouched.
289289
$mdUtil.nextTick(function () {
290290
element.on('blur', function() {

0 commit comments

Comments
 (0)