pagination dropdown fix for view all

src/addons/pagination-bundle/js/config.json

@@ -13,5 +13,5 @@
 		"build/closure/google-closure-compiler/externs/jquery-1.7.externs.js",
 		"build/closure/google-closure-compiler/externs/jplist.addons.externs.js"
 	],
-	"version": 26
+	"version": 27
 }

src/addons/pagination-bundle/js/dropdown/dropdown-view.js

@@ -144,7 +144,7 @@
 	* @param {boolean} restoredFromStorage - is status restored from storage
 	*/
 	var setStatus = function(context, status, restoredFromStorage){
-				
+
 		var $li
 			,$liList
             ,itemsPerPageNumber;
@@ -165,8 +165,7 @@
             }
         }
 
-        if(jQuery.isNumeric(itemsPerPageNumber)){
-
+        if(jQuery.isNumeric(itemsPerPageNumber) || itemsPerPageNumber === 'all'){
 
             //get li list
             $liList = context.$control.find('li');

src/addons/pagination-bundle/js/dropdown/select-view.js

@@ -155,7 +155,7 @@
             }
         }
 
-        if(jQuery.isNumeric(itemsPerPageNumber)) {
+        if(jQuery.isNumeric(itemsPerPageNumber) || itemsPerPageNumber === 'all') {
 
             $option = context.$control.find('option[data-number="' + itemsPerPageNumber + '"]');
 

test/selenium-tests/specs/4-pagination-items-per-page.js

@@ -21,6 +21,18 @@ describe('click on page #3 (top)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(5);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('5 per page');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('5 per page');
+        browser.call(done);
+    });
 });
 
 describe('click on the "next" button (top)', function() {
@@ -239,6 +251,18 @@ describe('click on page #3 (bottom)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(5);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('5 per page');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('5 per page');
+        browser.call(done);
+    });
 });
 
 describe('click on the "next" button (bottom)', function() {
@@ -458,6 +482,18 @@ describe('select 3 items per page (top)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(3);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('3 per page');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('3 per page');
+        browser.call(done);
+    });
 });
 
 describe('select 3 items per page and click on page #4 (top)', function() {
@@ -501,7 +537,7 @@ describe('select 3 items per page and click on page #4 (top)', function() {
     });
 });
 
-describe('select 3 items per page and click on tje "next" page (top)', function() {
+describe('select 3 items per page and click on the "next" page (top)', function() {
 
     beforeAll(function(done){
 
@@ -542,7 +578,7 @@ describe('select 3 items per page and click on tje "next" page (top)', function(
     });
 });
 
-describe('select 3 items per page and click on tje "last" page (top)', function() {
+describe('select 3 items per page and click on the "last" page (top)', function() {
 
     beforeAll(function(done){
 
@@ -605,6 +641,18 @@ describe('select 3 items per page (bottom)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(3);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('3 per page');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('3 per page');
+        browser.call(done);
+    });
 });
 
 
@@ -630,6 +678,18 @@ describe('select 10 items per page (top)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(10);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('10 per page');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('10 per page');
+        browser.call(done);
+    });
 });
 
 // ----------------- 10 items per page BOTTOM ------------------
@@ -654,6 +714,18 @@ describe('select 10 items per page (bottom)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(10);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('10 per page');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('10 per page');
+        browser.call(done);
+    });
 });
 
 
@@ -680,6 +752,18 @@ describe('select all items per page (top)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(33);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('view all');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('view all');
+        browser.call(done);
+    });
 });
 
 // ----------------- All items BOTTOM ------------------
@@ -704,5 +788,17 @@ describe('select all items per page (bottom)', function() {
         var boxes = browser.elements('//div[@class="list-item box"]');
         expect(boxes.value.length).toBe(33);
     });
+
+    it('top dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[1]')).toBe('view all');
+        browser.call(done);
+    });
+
+    it('bottom dropdown should have all text', function (done) {
+
+        expect(browser.getText('(//div[@class="jplist-dd-panel"])[2]')).toBe('view all');
+        browser.call(done);
+    });
 });
 

test/selenium-tests/wdio.conf.js

@@ -19,7 +19,7 @@ exports.config = {
 
         //wdio ./test/selenium-tests/wdio.conf.js --suite=temp
         temp: [
-            './test/selenium-tests/specs/5-filter-dropdown-bootstrap.js'
+            './test/selenium-tests/specs/4-pagination-items-per-page.js'
         ]
 
         //wdio ./test/selenium-tests/wdio.conf.js --suite=api