. 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 767d081..07a7e45 100644
--- a/src/directives/pagination/dirPagination.spec.js
+++ b/src/directives/pagination/dirPagination.spec.js
@@ -6,15 +6,25 @@ describe('dirPagination directive', function() {
var $compile;
var $scope;
+ var $timeout;
var containingElement;
var myCollection;
+ var myObjectCollection;
beforeEach(module('angularUtils.directives.dirPagination'));
beforeEach(module('templates-main'));
- beforeEach(inject(function($rootScope, _$compile_) {
+ // 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_;
+ $timeout = _$timeout_;
$scope = $rootScope.$new();
containingElement = angular.element('');
@@ -62,14 +72,6 @@ describe('dirPagination directive', function() {
expect(compile).toThrow("pagination directive: the 'itemsPerPage' filter must be set.");
});
- it('should allow a space after itemsPerPage and before the colon', function() {
- function compile() {
- var customExpression = "item in collection | itemsPerPage : 10";
- compileElement(myCollection, 5, 1, customExpression);
- }
- expect(compile).not.toThrow();
- });
-
it('should repeat the items like ng-repeat', function() {
compileElement(myCollection);
var listItems = getListItems();
@@ -122,9 +124,9 @@ describe('dirPagination directive', function() {
it('should work inside a transcluded directive (ng-if)', function() {
$scope.collection = myCollection;
var html = '';
+ ' ' +
+ '' +
+ '';
containingElement.append($compile(html)($scope));
$scope.$apply();
@@ -168,6 +170,196 @@ describe('dirPagination directive', function() {
expect(listItems).toEqual(['item 1', 'item 2']);
});
+ // see https://github.com/michaelbromley/angularUtils/issues/233
+ function testPaginationId(paginationIdString) {
+ $scope.collection = myCollection;
+ var html = ' ' +
+ '';
+ containingElement.append($compile(html)($scope));
+ $scope.$apply();
+
+ var listItems = getListItems();
+ expect(listItems.length).toEqual(2);
+ expect(listItems).toEqual(['item 1', 'item 2']);
+ }
+
+ it('should work when the pagination-id evaluates to a string containing a period.', function() {
+ testPaginationId('some.string');
+ });
+
+ it('should work when the pagination-id evaluates to a string containing a hyphen.', function() {
+ testPaginationId('some-string');
+ });
+
+ });
+
+ describe('paginating over an object', function() {
+ beforeEach(function() {
+ myObjectCollection = {};
+ for(var i = 1; i <= 100; i++) {
+ myObjectCollection['key_' + i] = 'item ' + i;
+ }
+ });
+
+ it('should not throw an exception when the collection is an object', function() {
+ function compile() {
+ compileElement(myObjectCollection, 10, 1, "(key, item) in collection | itemsPerPage: itemsPerPage");
+ }
+ expect(compile).not.toThrow();
+ });
+
+ it('should correctly paginate with simple syntax', function() {
+ compileElement(myObjectCollection, 5, 1, "item in collection | itemsPerPage: itemsPerPage");
+ expect(getListItems()).toEqual(['item 1', 'item 2', 'item 3', 'item 4', 'item 5']);
+ });
+
+ it('should correctly paginate with (key, value) syntax', function() {
+ compileElement(myObjectCollection, 5, 1, "(key, item) in collection | itemsPerPage: itemsPerPage");
+ expect(getListItems()).toEqual(['item 1', 'item 2', 'item 3', 'item 4', 'item 5']);
+ });
+
+ it('should show the correct items for the currentPage', function() {
+ compileElement(myObjectCollection, 5, 4, "(key, item) in collection | itemsPerPage: itemsPerPage");
+ 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() {
+
+ beforeEach(function() {
+ $scope.getPageSize = function() {
+ return 10;
+ };
+ });
+
+ it('should allow a space after itemsPerPage and before the colon', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage : 10");
+ }
+ expect(compile).not.toThrow();
+ });
+
+ it('should allow parentheses around the itemsPerPage filter', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in filtered = (collection | filter: '1' | itemsPerPage: itemsPerPage)");
+ }
+
+ expect(compile).not.toThrow();
+ expect(getListItems()).toEqual(['item 1', 'item 10', 'item 11', 'item 12', 'item 13']);
+ expect($scope.filtered.length).toEqual(5);
+ });
+
+ it('should allow the itemsPerPage to be a scope method 1', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage: getPageSize()");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+ it('should allow the itemsPerPage to be a scope method 2', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage: getPageSize(myvar)");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+ it('should allow the itemsPerPage to be a scope method 3', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in filtered = (collection | itemsPerPage: getPageSize(_myvar))");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+ it('should allow alias syntax', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage: 10 as myAlias");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ expect($scope.myAlias.length).toEqual(10);
+ });
+
+ it('should allow alias syntax 2', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage: getPageSize() as myAlias");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ expect($scope.myAlias.length).toEqual(10);
+ });
+
+ it('should allow alias syntax 3', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in alias1 = (collection | itemsPerPage: getPageSize()) as alias2");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ expect($scope.alias1.length).toEqual(10);
+ expect($scope.alias2.length).toEqual(10);
+ });
+
+ it('should allow dot and bracket notation', function() {
+ function compile() {
+ $scope.foo = {
+ name: 'myCollection',
+ myCollection: myCollection,
+ perPage: 10
+ };
+ compileElement(myCollection, 5, 1, "item in foo[foo.name] | itemsPerPage:foo.perPage");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+ // see https://github.com/michaelbromley/angularUtils/issues/241
+ // the actual issue was caused by the work "sharedTasksFilters", which was
+ // being matched by the part of the regex that looks for "as" alias syntax.
+ it('should allow deeply nested, long-winded object for itemsPerPage', function() {
+ function compile() {
+ $scope.eventsCtrl = { eventsFilters: { sharedTasksFilters: { eventsPerPage: 10 } } };
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage:eventsCtrl.eventsFilters.sharedTasksFilters.eventsPerPage");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+
+ it('should allow track by syntax 1', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage: 10 track by $index");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+ it('should allow track by syntax 2', function() {
+ function compile() {
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage: 10 track by item");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+ it('should allow track by with dot in itemsPerPage', function() {
+ function compile() {
+ $scope.foo = { perPage : 10 };
+ compileElement(myCollection, 5, 1, "item in collection | itemsPerPage: foo.perPage track by item");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
});
describe('if currentPage attribute is not set', function() {
@@ -198,14 +390,21 @@ describe('dirPagination directive', function() {
describe('pagination controls', function() {
- it('should throw an exception if the dir-paginate directive has not been set up', function() {
+ beforeEach(function(){
+ spyOn(console, 'warn');
+ });
+
+ it('should throw a warning if the dir-paginate directive has not been set up', function() {
+
function compile() {
var html = '';
containingElement.append($compile(html)($scope));
$scope.$apply();
}
- expect(compile).toThrow("pagination directive: the pagination controls cannot be used without the corresponding pagination directive.");
+ compile();
+
+ expect(console.warn).toHaveBeenCalledWith('Pagination directive: the pagination controls cannot be used without the corresponding pagination directive, which was not found at link time.');
});
it('should not display pagination if all rows fit on one page', function() {
@@ -274,6 +473,20 @@ describe('dirPagination directive', function() {
expect(pageLinks).toEqual(['‹','1', '...', '94', '95', '96', '97', '98', '99', '100', '›']);
});
+ it('should show the correct pagination links after item removed from cllection', function() {
+ compileElement(myCollection, 1);
+ $scope.$apply(function() {
+ $scope.currentPage = 98;
+ });
+
+ $scope.$apply(function() {
+ $scope.collection.pop();
+ });
+ var pageLinks = getPageLinksArray();
+
+ expect(pageLinks).toEqual(['‹','1', '...', '93', '94', '95', '96', '97', '98', '99', '›']);
+ });
+
it('should calculate pages based off collection after all filters are applied', function() {
$scope.filterBy = '2';
var customExpression = "item in collection | filter: filterBy | itemsPerPage: itemsPerPage";
@@ -297,12 +510,39 @@ describe('dirPagination directive', function() {
expect(activeLink.html()).toContain(1);
});
+ /**
+ * Issue raised here https://github.com/michaelbromley/angularUtils/issues/78
+ * Where the dir-paginate directive is inside an ngSwitch block (which is initially hidden), so the linking function is not immediately executed.
+ * The dir-pagination-controls directive is *outside* the switch block, so it gets both compiled *and* linked on page load.
+ */
+ it('should allow paginate directive to be defined in a deferred-linking situation without error', function() {
+ function compile() {
+ var html;
+ $scope.collection = myCollection;
+ $scope.showList = false;
+ html = '' +
+ '';
+ containingElement.append($compile(html)($scope));
+ $scope.$apply();
+ }
+
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(0);
+
+ $scope.$apply(function() {
+ $scope.showList = true;
+ });
+ expect(getListItems().length).toEqual(10);
+ });
+
describe('optional attributes', function() {
function compileWithAttributes(attributes) {
$scope.collection = myCollection;
$scope.currentPage = 1;
- html = ' ' +
+ var html = ' ' +
'';
containingElement.append($compile(html)($scope));
$scope.$apply();
@@ -317,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" ');
@@ -363,11 +620,37 @@ describe('dirPagination directive', function() {
$scope.myCallback = function(currentPage) {
return "The current page is " + currentPage;
};
- spyOn($scope, 'myCallback').and.callThrough();
- compileWithAttributes(' on-page-change="myCallback(newPageNumber)" ');
+ spyOn($scope, 'myCallback');
});
it('should call the callback once when page link clicked', function() {
+ compileWithAttributes(' on-page-change="myCallback(newPageNumber)" ');
+ var pagination = containingElement.find('ul.pagination');
+
+ expect($scope.myCallback.calls.count()).toEqual(0);
+ pagination.children().eq(2).find('a').triggerHandler('click');
+ $scope.$apply();
+ expect($scope.myCallback).toHaveBeenCalled();
+ expect($scope.myCallback.calls.count()).toEqual(1);
+ });
+
+ it('should not call the callback on loading first page, even with controls appearing above the pagination', function() {
+ function compileWithControlsFirst(attributes) {
+ $scope.currentPage = 1;
+ var html = '' +
+ '';
+ containingElement.append($compile(html)($scope));
+ $scope.$apply();
+ }
+
+ compileWithControlsFirst(' on-page-change="myCallback(newPageNumber)" ');
+
+ $scope.$apply(function() {
+ $scope.collection = myCollection;
+ });
+
var pagination = containingElement.find('ul.pagination');
expect($scope.myCallback.calls.count()).toEqual(0);
@@ -378,12 +661,22 @@ describe('dirPagination directive', function() {
});
it('should pass the current page number to the callback', function() {
+ compileWithAttributes(' on-page-change="myCallback(newPageNumber)" ');
var pagination = containingElement.find('ul.pagination');
pagination.children().eq(2).find('a').triggerHandler('click');
$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() {
@@ -408,6 +701,56 @@ describe('dirPagination directive', function() {
expect(listItems.length).toEqual(100);
});
});
+
+ describe('auto-hide attribute', function () {
+ function compileWithAttributesAndItemsPerPage(attributes, itemsPerPage) {
+ $scope.collection = myCollection;
+ $scope.currentPage = 1;
+ var html = ' ' +
+ '';
+ containingElement.append($compile(html)($scope));
+ $scope.$apply();
+ }
+
+ it('when not set, should not generate pagination controls, with not enough items to paginate over', function () {
+ compileWithAttributesAndItemsPerPage('', 100);
+ var pagination = containingElement.find('ul.pagination');
+ expect(pagination.length).toEqual(0);
+ });
+
+ it('when not set, should generate pagination controls, with enough items to paginate over', function () {
+ compileWithAttributesAndItemsPerPage('', 99);
+ var pagination = containingElement.find('ul.pagination');
+ expect(pagination.length).toEqual(1);
+ });
+
+ it('when set to false, should generate pagination controls, with not enough items to paginate over', function () {
+ compileWithAttributesAndItemsPerPage('auto-hide="false"', 100);
+ var pagination = containingElement.find('ul.pagination');
+ expect(pagination.length).toEqual(1);
+ var pageLinks = containingElement.find('ul.pagination li.disabled');
+ expect(pageLinks.length).toEqual(3);
+ });
+
+ it('when set to false, should generate pagination controls, with enough items to paginate over', function () {
+ compileWithAttributesAndItemsPerPage('auto-hide="false"', 99);
+ var pagination = containingElement.find('ul.pagination');
+ expect(pagination.length).toEqual(1);
+ });
+
+ it('when set to true, should generate pagination controls, with enough items to paginate over', function () {
+ compileWithAttributesAndItemsPerPage('auto-hide="true"', 100);
+ var pagination = containingElement.find('ul.pagination');
+ expect(pagination.length).toEqual(0);
+ });
+
+ it('when set to true, should generate pagination controls, with not enough items to paginate over', function () {
+ compileWithAttributesAndItemsPerPage('auto-hide="true"', 99);
+ var pagination = containingElement.find('ul.pagination');
+ expect(pagination.length).toEqual(1);
+ });
+ });
});
});
@@ -423,6 +766,7 @@ describe('dirPagination directive', function() {
collection1.push('c1:' + i);
collection2.push('c2:' + i);
}
+ spyOn(console, 'warn');
});
/**
@@ -448,7 +792,7 @@ describe('dirPagination directive', function() {
$scope.collection[paginationId] = collection;
$scope.itemsPerPage[paginationId] = itemsPerPage;
$scope.currentPage[paginationId] = currentPage || 1;
- expression = customExpression || "item in collection." + paginationId + " | itemsPerPage: itemsPerPage." + paginationId + ": '" + paginationId + "'";
+ expression = customExpression || "item in collection." + paginationId + " | itemsPerPage: itemsPerPage." + paginationId;
html = ' ' +
'';
containingElement.append($compile(html)($scope));
@@ -534,7 +878,7 @@ describe('dirPagination directive', function() {
expect(getMultiListItems("c2")).toEqual(['c2:6', 'c2:7']);
});
- it('should throw an exception if a non-existant paginationId is set in the pagination-controls', function() {
+ it('should print a warning if a non-existant paginationId is set in the pagination-controls', function() {
$scope.collection = [1,2,3,4,5];
function compile() {
@@ -544,8 +888,8 @@ describe('dirPagination directive', function() {
containingElement.append($compile(html)($scope));
$scope.$apply();
}
-
- expect(compile).toThrow("pagination directive: the pagination controls (id: id2) cannot be used without the corresponding pagination directive.");
+ compile();
+ expect(console.warn).toHaveBeenCalledWith('Pagination directive: the pagination controls (id: id2) cannot be used without the corresponding pagination directive, which was not found at link time.');
});
it('should throw an exception if a non-existant paginationId is set in the itemsPerPage filter', function() {
@@ -562,6 +906,110 @@ describe('dirPagination directive', function() {
expect(compile).toThrow("pagination directive: the itemsPerPage id argument (id: id2) does not match a registered pagination-id.");
});
+ describe('valid expressions with pagination id', function() {
+
+ it('should allow track by syntax', function() {
+ function compile() {
+ compileMultipleInstance(collection1, 10, 1, "c1", "item in collection.c1 | itemsPerPage: itemsPerPage.c1 track by $index");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+
+ it('should allow track by with other filter syntax', function() {
+ function compile() {
+ compileMultipleInstance(collection1, 10, 1, "c1", "item in collection.c1 | orderBy: reverse | itemsPerPage: itemsPerPage.c1 track by $index");
+ }
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+ });
+
+ describe('dymanic pagination-id', function() {
+
+ function compileWithDynamicId(paginationId, customExpression) {
+ var html;
+ html = ' ' +
+ '';
+ containingElement.append($compile(html)($scope));
+ $scope.$apply();
+ }
+
+ it('should allow object reference', function() {
+ function compile() {
+ $scope.myId = {
+ foo: 'foo'
+ };
+ $scope.collection = myCollection;
+ compileWithDynamicId('myId.foo', 'item in collection | itemsPerPage: 10');
+ }
+
+ expect(compile).not.toThrow();
+ expect(getListItems().length).toEqual(10);
+ });
+ });
+
+ });
+
+ describe('pagination controls template API', function() {
+ function compile() {
+ var html = ' ' +
+ '';
+ $scope.collection = [1,2,3,4,5,6,7];
+ $scope.currentPage = 1;
+ containingElement.append($compile(html)($scope));
+ $scope.$apply();
+ }
+
+ it('should provide correct values for current page', function() {
+ compile();
+
+ expect(containingElement.find('#tt-pagination-current').html()).toEqual('1');
+ $scope.$apply(function() {
+ $scope.currentPage = 2;
+ });
+ expect(containingElement.find('#tt-pagination-current').html()).toEqual('2');
+ });
+
+ it('should provide correct value for last page', function() {
+ compile();
+ expect(containingElement.find('#tt-pagination-last').html()).toEqual('3');
+ });
+
+ it('should provide correct value for range.lower', function() {
+ compile();
+ expect(containingElement.find('#tt-range-lower').html()).toEqual('1');
+ $scope.$apply(function() {
+ $scope.currentPage = 2;
+ });
+ expect(containingElement.find('#tt-range-lower').html()).toEqual('4');
+ $scope.$apply(function() {
+ $scope.currentPage = 3;
+ });
+ expect(containingElement.find('#tt-range-lower').html()).toEqual('7');
+ });
+
+ it('should provide correct value for range.upper', function() {
+ compile();
+ expect(containingElement.find('#tt-range-upper').html()).toEqual('3');
+ $scope.$apply(function() {
+ $scope.currentPage = 2;
+ });
+ expect(containingElement.find('#tt-range-upper').html()).toEqual('6');
+ $scope.$apply(function() {
+ $scope.currentPage = 3;
+ });
+ expect(containingElement.find('#tt-range-upper').html()).toEqual('7');
+ });
+
+ it('should provide correct value for range.total', function() {
+ compile();
+ expect(containingElement.find('#tt-range-total').html()).toEqual('7');
+ $scope.$apply(function() {
+ $scope.currentPage = 2;
+ });
+ expect(containingElement.find('#tt-range-total').html()).toEqual('7');
+ });
});
describe('multi element functionality', function() {
@@ -572,10 +1020,10 @@ describe('dirPagination directive', function() {
$scope.itemsPerPage = itemsPerPage || 10;
$scope.currentPage = currentPage || 1;
html = '' +
- '
header
' +
- '
{{ item }}
' +
- '
footer
' +
- '
header
' +
+ '{{ item }}
' +
+ 'footer
' +
+ ' ';
containingElement.append($compile(html)($scope));
$scope.$apply();
}
@@ -619,5 +1067,133 @@ describe('dirPagination directive', function() {
expect(containingElement.find('h1').length).toEqual(3);
expect(containingElement.find('p').length).toEqual(3);
});
+
+ /**
+ * See https://github.com/michaelbromley/angularUtils/issues/92
+ */
+ it('should correctly compile an inner ng-repeat', function() {
+ function compile() {
+ var html = '' +
+ '
{{ item }}
' +
+ '
yo
- {{ option }} : {{ item }}
' +
+ '
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/pagination/dirPagination.tpl.html b/src/directives/pagination/dirPagination.tpl.html
index 558aa20..db98d4c 100644
--- a/src/directives/pagination/dirPagination.tpl.html
+++ b/src/directives/pagination/dirPagination.tpl.html
@@ -1,11 +1,11 @@
-