. If both a path *and* a string have been set,
+ * the string takes precedence.
+ * @param {String} str
+ */
+ this.setString = function(str) {
+ templateString = str;
+ };
+
this.$get = function() {
return {
getPath: function() {
return templatePath;
+ },
+ getString: function() {
+ return templateString;
}
};
};
diff --git a/src/directives/pagination/dirPagination.spec.js b/src/directives/pagination/dirPagination.spec.js
index 414e0c0..07a7e45 100644
--- a/src/directives/pagination/dirPagination.spec.js
+++ b/src/directives/pagination/dirPagination.spec.js
@@ -14,6 +14,13 @@ describe('dirPagination directive', function() {
beforeEach(module('angularUtils.directives.dirPagination'));
beforeEach(module('templates-main'));
+ // used to test the paginationTemplateProvider (see end of file)
+ var templateProvider;
+ angular.module('customTemplateTestApp', []);
+ beforeEach(module('customTemplateTestApp', function(paginationTemplateProvider) {
+ templateProvider = paginationTemplateProvider;
+ }));
+
beforeEach(inject(function($rootScope, _$compile_, _$timeout_) {
$compile = _$compile_;
@@ -216,6 +223,13 @@ describe('dirPagination directive', function() {
expect(getListItems()).toEqual(['item 16', 'item 17', 'item 18', 'item 19', 'item 20']);
});
+ it('should display the correct pagination links', function() {
+ compileElement(myObjectCollection, 20, 1, "item in collection | itemsPerPage: itemsPerPage");
+ var paginationLinks = getPageLinksArray();
+
+ expect(paginationLinks).toEqual(['‹','1', '2', '3', '4', '5', '›']);
+ });
+
});
describe('valid expressions', function() {
@@ -543,6 +557,23 @@ describe('dirPagination directive', function() {
expect(pageLinks).toEqual(['‹','1', '2', '3', '...', '10', '›']);
});
+ it('should alter links array when value of max-size changes', function() {
+ $scope.maxSize = 5;
+ compileWithAttributes(' max-size="maxSize" ');
+
+ var pageLinks = getPageLinksArray();
+
+ expect(pageLinks).toEqual(['‹','1', '2', '3', '...', '10', '›']);
+
+ $scope.$apply(function() {
+ $scope.maxSize = 9;
+ });
+
+ pageLinks = getPageLinksArray();
+
+ expect(pageLinks).toEqual(['‹','1', '2', '3', '4', '5', '6', '7', '...', '10', '›']);
+ });
+
it('should impose a minimum max-size of 5', function() {
compileWithAttributes(' max-size="2" ');
@@ -637,6 +668,15 @@ describe('dirPagination directive', function() {
$scope.$apply();
expect($scope.myCallback).toHaveBeenCalledWith(2);
});
+
+ it('should pass the previous page number to the callback', function() {
+ compileWithAttributes(' on-page-change="myCallback(oldPageNumber)" ');
+ var pagination = containingElement.find('ul.pagination');
+
+ pagination.children().eq(3).find('a').triggerHandler('click');
+ $scope.$apply();
+ expect($scope.myCallback).toHaveBeenCalledWith(1);
+ });
});
describe('total-items attribute', function() {
@@ -1093,7 +1133,7 @@ describe('dirPagination directive', function() {
compile();
var $list1 = containingElement.find('ul.list').eq(0);
- var $list2 = containingElement.find('ul.list').eq(1);
+ var $list2 = containingElement.find('ul.list').eq(1);
expect(getListItems($list1)).toEqual([ '1', '2', '3' ]);
expect(getListItems($list2)).toEqual([ 'a', 'b', 'c' ]);
@@ -1108,6 +1148,52 @@ describe('dirPagination directive', function() {
expect(getListItems($list2)).toEqual([ 'a', 'b', 'c' ]);
});
+ });
+
+ describe('paginationTemplateProvider', function() {
+
+ beforeEach(inject(function($templateCache) {
+ $templateCache.put('setPath_template', 'Test Template{{ pages.length }}
');
+ $templateCache.put('templateUrl_template', 'Test TemplateUrl Template{{ pages.length }}
');
+ }));
+
+ it('should use the custom template specified by setPath()', function() {
+ templateProvider.setPath('setPath_template');
+ compileElement(myCollection, 10);
+
+ expect(containingElement.find('.set-path-template').html()).toContain('Test Template');
+ });
+
+ it('should use the custom template specified by setString()', function() {
+ templateProvider.setString('Test Template String{{ pages.length }}
');
+ compileElement(myCollection, 10);
+
+ expect(containingElement.find('.set-string-template').html()).toContain('Test Template String');
+ });
+
+ it('should prioritize setString() if both path and string have been set', function() {
+ templateProvider.setString('Test Template String{{ pages.length }}
');
+ templateProvider.setPath('setPath_template');
+ compileElement(myCollection, 10);
+
+ expect(containingElement.find('.set-path-template').html()).toBeUndefined();
+ expect(containingElement.find('.set-string-template').html()).toContain('Test Template String');
+ });
+
+ it('should prioritize setString() over path and template-url attribute.', function() {
+ templateProvider.setString('Test Template String{{ pages.length }}
');
+ templateProvider.setPath('setPath_template');
+
+ var html = ' ' +
+ '';
+ containingElement.append($compile(html)($scope));
+ $scope.$apply();
+
+ expect(containingElement.find('.set-path-template').html()).toBeUndefined();
+ expect(containingElement.find('.template-url-template').html()).toBeUndefined();
+ expect(containingElement.find('.set-string-template').html()).toContain('Test Template String');
+ });
});
+
});
diff --git a/src/directives/uiBreadcrumbs/README.md b/src/directives/uiBreadcrumbs/README.md
index 67d30d9..f91d7b9 100644
--- a/src/directives/uiBreadcrumbs/README.md
+++ b/src/directives/uiBreadcrumbs/README.md
@@ -2,6 +2,8 @@
This is a directive that auto-generates breadcrumbs based on angular-ui-router routes.
+**No longer maintained** (July 2016) I am no longer using this in any of my projects. As such, I have no time to maintain it. Pull requests for fixes and features are welcome. If someone would like to maintain a fork, let me know and I will link to it here.
+
## Demo
You can see a working demo demonstrating most of the features here: [http://plnkr.co/edit/bBgdxgB91Z6323HLWCzF?p=preview](http://plnkr.co/edit/bBgdxgB91Z6323HLWCzF?p=preview)
@@ -18,9 +20,10 @@ nested views, you should use a named view and refer to it when configuring your
## Installation
### 1. Download
-You can install with Bower:
+You can install with Bower or npm:
`bower install angular-utils-ui-breadcrumbs`
+`npm install angular-utils-ui-breadcrumbs`
Alternatively just download the files `uiBreadcrumbs.js` and `uiBreadcrumbs.tpl.html`. Using bower has the advantage of making version management easier.
diff --git a/src/filters/ordinalDate/ordinalDate.js b/src/filters/ordinalDate/ordinalDate.js
index 553edae..6afa684 100644
--- a/src/filters/ordinalDate/ordinalDate.js
+++ b/src/filters/ordinalDate/ordinalDate.js
@@ -5,59 +5,18 @@ angular.module( 'angularUtils.filters.ordinalDate', [] )
var getOrdinalSuffix = function(number) {
var suffixes = ["'th'", "'st'", "'nd'", "'rd'"];
var relevantDigits = (number < 30) ? number % 20 : number % 30;
- return (relevantDigits <= 3) ? suffixes[relevantDigits] : suffixes[0];
- };
-
- /**
- * Look through the format string for any possible match for 'd'.
- * It needs to ignore 'dd' and also occurrences of the letter d inside
- * string such as "d 'day of' MM'.
- * @param format
- */
- var getIndecesOfDayCharacter = function(format) {
- var dayRegex = /(?:'(?:[^']|'')*')|(?:d+)/g;
- var matchingIndices = [];
- var finishedLooking = false;
-
- while(!finishedLooking) {
- var matches = dayRegex.exec(format);
- if (matches) {
- dayRegex.lastIndex = matches.index + matches[0].length;
- if (matches[0] === 'd') {
- matchingIndices.push(matches.index + 1);
- }
- } else {
- finishedLooking = true;
- }
- }
-
- return matchingIndices;
- };
-
- /**
- * Insert a string at a given index of another string
- * @param inputString
- * @param index
- * @param stringToInsert
- * @returns {string}
- */
- var insertAtIndex = function(inputString, index, stringToInsert) {
- var partBeforeIndex = inputString.substring(0, index);
- var partAfterIndex = inputString.substring(index, inputString.length);
- return partBeforeIndex + stringToInsert + partAfterIndex;
+ return "d" + ((relevantDigits <= 3) ? suffixes[relevantDigits] : suffixes[0]);
};
return function(timestamp, format) {
+ var regex = /d+((?!\w*(?=')))|d$/g;
var date = new Date(timestamp);
var dayOfMonth = date.getDate();
var suffix = getOrdinalSuffix(dayOfMonth);
- var matchingIndices = getIndecesOfDayCharacter(format);
-
- // now we to insert the suffix at the index(-ces) that we found
- for (var i = matchingIndices.length; i > 0; i --) {
- format = insertAtIndex(format, matchingIndices[i-1], suffix);
- }
+ format = format.replace(regex, function (match) {
+ return match === "d" ? suffix : match;
+ });
return $filter('date')(date, format);
};
}]);
\ No newline at end of file