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

fix(ngPluralize): cap value - offset to 0 #10839

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions src/ng/directive/ngPluralize.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,15 @@
person2.sendKeys('Vojta');
expect(withOffset.getText()).toEqual('Di, Vojta and 2 other people are viewing.');
});
it('should reset count to 0 if count - offset is negative', function() {
var withOffset = element.all(by.css('ng-pluralize')).get(1);
var personCount = element(by.model('personCount'));
personCount.clear();
personCount.sendKeys('4');
expect(withOffset.getText()).toEqual('Igor, Misko and 2 other people are viewing.');
personCount.clear();
expect(withOffset.getText()).toEqual('Nobody is viewing.');
});
</file>
</example>
*/
Expand All @@ -189,10 +198,19 @@ var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale,
whensExpFns = {},
startSymbol = $interpolate.startSymbol(),
endSymbol = $interpolate.endSymbol(),
braceReplacement = startSymbol + numberExp + '-' + offset + endSymbol,
watchRemover = angular.noop,
lastCount;

var oneTimeCount = /^\s*::/.test(numberExp) || '';
if (oneTimeCount) {
numberExp = numberExp.replace(/^\s*::/, '');
oneTimeCount = '::';
}
var braceReplacement = [
startSymbol, oneTimeCount, '((', numberExp, '-', offset,
') < 0 ?', 0, ':', numberExp, '-', offset, ')', endSymbol
].join('');

forEach(attr, function(expression, attributeName) {
var tmpMatch = IS_WHEN.exec(attributeName);
if (tmpMatch) {
Expand All @@ -205,14 +223,14 @@ var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale,

});

scope.$watch(numberExp, function ngPluralizeWatchAction(newVal) {
scope.$watch(oneTimeCount + numberExp, function ngPluralizeWatchAction(newVal) {
var count = parseFloat(newVal);
var countIsNaN = isNaN(count);

if (!countIsNaN && !(count in whens)) {
// If an explicit number rule such as 1, 2, 3... is defined, just use it.
// Otherwise, check it against pluralization rules in $locale service.
count = $locale.pluralCat(count - offset);
count = $locale.pluralCat(count - offset < 0 ? 0 : count - offset);
}

// If both `count` and `lastCount` are NaN, we don't need to re-register a watch.
Expand Down
16 changes: 8 additions & 8 deletions test/ng/directive/ngPluralizeSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ describe('ngPluralize', function() {

$rootScope.email = -0.1;
$rootScope.$digest();
expect(element.text()).toBe('You have -0.1 new emails');
expect(elementAlt.text()).toBe('You have -0.1 new emails');
expect(element.text()).toBe('You have 0 new emails');
expect(elementAlt.text()).toBe('You have 0 new emails');

$rootScope.email = '-0.01';
$rootScope.$digest();
expect(element.text()).toBe('You have -0.01 new emails');
expect(elementAlt.text()).toBe('You have -0.01 new emails');
expect(element.text()).toBe('You have 0 new emails');
expect(elementAlt.text()).toBe('You have 0 new emails');

$rootScope.email = -2;
$rootScope.$digest();
expect(element.text()).toBe('You have -2 new emails');
expect(elementAlt.text()).toBe('You have -2 new emails');
expect(element.text()).toBe('You have 0 new emails');
expect(elementAlt.text()).toBe('You have 0 new emails');

$rootScope.email = -1;
$rootScope.$digest();
Expand Down Expand Up @@ -111,8 +111,8 @@ describe('ngPluralize', function() {

$rootScope.email = '-011';
$rootScope.$digest();
expect(element.text()).toBe('You have -11 new emails');
expect(elementAlt.text()).toBe('You have -11 new emails');
expect(element.text()).toBe('You have 0 new emails');
expect(elementAlt.text()).toBe('You have 0 new emails');

$rootScope.email = '1fff';
$rootScope.$digest();
Expand Down