Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit a88b115

Browse files
committed
refactor(rating): evaluate attributes inside init function
Closes #1590 Closes #1768
1 parent 7f4b40e commit a88b115

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

Diff for: src/rating/rating.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@ angular.module('ui.bootstrap.rating', [])
77
})
88

99
.controller('RatingController', ['$scope', '$attrs', 'ratingConfig', function($scope, $attrs, ratingConfig) {
10-
var ngModelCtrl = {$setViewValue: angular.noop};
11-
12-
this.maxRange = angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max;
13-
this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
14-
this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
10+
var ngModelCtrl = { $setViewValue: angular.noop };
1511

1612
this.init = function(ngModelCtrl_) {
1713
ngModelCtrl = ngModelCtrl_;
1814
ngModelCtrl.$render = this.render;
1915

20-
$scope.range = this.buildTemplateObjects(
21-
angular.isDefined($attrs.ratingStates) ? $scope.$parent.$eval($attrs.ratingStates) : new Array(this.maxRange)
22-
);
16+
this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
17+
this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
18+
19+
var ratingStates = angular.isDefined($attrs.ratingStates) ? $scope.$parent.$eval($attrs.ratingStates) :
20+
new Array( angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max );
21+
$scope.range = this.buildTemplateObjects(ratingStates);
2322
};
2423

2524
this.buildTemplateObjects = function(states) {

0 commit comments

Comments
 (0)