Fixed a bug regarding rowCount and improved visualization

Author: rstaib

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.6-rc2
+- Fixed a bug regarding rowCount
+- Improved visualization generally
+
 ## 0.9.6-rc1
 - Prevent click event on active pagination item
 - Added refresh button

bootgrid.jquery.json

@@ -14,7 +14,7 @@
         "accessibility",
         "bootstrap"
     ],
-    "version": "0.9.6-rc1",
+    "version": "0.9.6-rc2",
     "author": {
         "name": "Rafael Staib",
         "email": "me@rafaelstaib.com",

bower.json

@@ -13,7 +13,7 @@
         "accessibility",
         "bootstrap"
     ],
-    "version": "0.9.6-rc1",
+    "version": "0.9.6-rc2",
     "authors": [
         { "name": "Rafael Staib", "email": "me@rafaelstaib.com", "url": "http://www.rafaelstaib.com" }
     ],

build/jQuery.Bootgrid.0.9.6-rc1.nupkg

@@ -1,5 +1,5 @@
 /*! 
- * jQuery Bootgrid v0.9.6-rc1 - 05/28/2014
+ * jQuery Bootgrid v0.9.6-rc2 - 05/28/2014
  * Copyright (c) 2014 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
  */
@@ -52,7 +52,7 @@
     {
         var request = {
                 current: context.current,
-                rowCount: options.rowCount,
+                rowCount: context.rowCount,
                 sort: context.sort
             },
             post = options.post;
@@ -167,9 +167,17 @@
             tpl = options.templates;
 
         instance.loading = $(options.templates.loading.resolve(getParams(context)));
-        instance.header = $(tpl.header.resolve(getParams(context, { id: element._bgId() + "-header" })));
-        instance.footer = $(tpl.footer.resolve(getParams(context, { id: element._bgId() + "-footer" })));
-        element.addClass(css.table).before(instance.header).after(instance.footer).after(instance.loading);
+        element.addClass(css.table).after(instance.loading);
+        if (options.navigation & 1)
+        {
+            instance.header = $(tpl.header.resolve(getParams(context, { id: element._bgId() + "-header" })));
+            element.before(instance.header);
+        }
+        if (options.navigation & 2)
+        {
+            instance.footer = $(tpl.footer.resolve(getParams(context, { id: element._bgId() + "-footer" })));
+            element.after(instance.footer);
+        }
 
         renderTableHeader(element, options, context);
     }
@@ -210,8 +218,8 @@
                         var $this = $(this);
                         if ($this.text() !== currentKey)
                         {
-                            // todo: sophisticated solution needed for figuring out which page is selected and if applicable to reset the current page
-                            context.current = 1;
+                            // todo: sophisticated solution needed for calculating which page is selected
+                            context.current = 1; // context.rowCount === -1 ---> All
                             context.rowCount = +$this.attr("href").substr(1);
                             loadData(element, options, context);
                         }
@@ -267,13 +275,22 @@
         if (options.navigation !== 0)
         {
             var instance = getInstance(element),
-                end = (context.current * context.rowCount),
+                selector = getSelector(options.css.infos),
+                header = instance.header.find(selector)._bgShowAria(context.rowCount !== -1),
+                footer = instance.footer.find(selector)._bgShowAria(context.rowCount !== -1);
+
+            if (context.rowCount === -1)
+            {
+                return;
+            }
+
+            var end = (context.current * context.rowCount),
                 infos = $(options.templates.infos.resolve(getParams(context, 
-                    { end: end, start: (end - context.rowCount + 1), total: context.total }))),
-                selector = getSelector(options.css.infos);
+                    { end: (end > context.total) ? context.total : end, 
+                        start: (end - context.rowCount + 1), total: context.total })));
 
-            replacePlaceHolder(options, instance.header.find(selector), infos, 1);
-            replacePlaceHolder(options, instance.footer.find(selector), infos, 2);
+            replacePlaceHolder(options, header, infos, 1);
+            replacePlaceHolder(options, footer, infos, 2);
         }
     }
 
@@ -282,7 +299,16 @@
         if (options.navigation !== 0)
         {
             var instance = getInstance(element),
-                tpl = options.templates,
+                selector = getSelector(options.css.pagination),
+                header = instance.header.find(selector)._bgShowAria(context.rowCount !== -1),
+                footer = instance.footer.find(selector)._bgShowAria(context.rowCount !== -1);
+
+            if (context.rowCount === -1)
+            {
+                return;
+            }
+
+            var tpl = options.templates,
                 current = context.current,
                 totalPages = context.totalPages,
                 pagination = $(tpl.pagination.resolve(getParams(context))),
@@ -292,8 +318,7 @@
                     Math.max(offsetLeft, 1) :
                     Math.max((offsetLeft - options.padding + offsetRight), 1)),
                 maxCount = options.padding * 2 + 1,
-                count = (totalPages >= maxCount) ? maxCount : totalPages,
-                selector = getSelector(options.css.pagination);
+                count = (totalPages >= maxCount) ? maxCount : totalPages;
 
             renderPaginationItem(element, options, context, pagination, "first", "«", "first")
                 ._bgEnableAria(current > 1);
@@ -307,13 +332,19 @@
                     ._bgEnableAria()._bgSelectAria(pos === current);
             }
 
+            if (count === 0)
+            {
+                renderPaginationItem(element, options, context, pagination, 1, 1, "page-" + 1)
+                    ._bgEnableAria(false)._bgSelectAria();
+            }
+
             renderPaginationItem(element, options, context, pagination, "next", ">", "next")
                 ._bgEnableAria(totalPages > current);
             renderPaginationItem(element, options, context, pagination, "last", "»", "last")
                 ._bgEnableAria(totalPages > current);
 
-            replacePlaceHolder(options, instance.header.find(selector), pagination, 1);
-            replacePlaceHolder(options, instance.footer.find(selector), pagination, 2);
+            replacePlaceHolder(options, header, pagination, 1);
+            replacePlaceHolder(options, footer, pagination, 2);
         }
     }
 

build/jQuery.Bootgrid.0.9.6-rc2.nupkg

@@ -1,6 +1,6 @@
 {
   "current": 1,
-  "rowCount": 5,
+  "rowCount": 10,
   "rows": [
     {
       "id": "a0e3a286-4343-4240-8d6d-e79fa2e94b4c",
@@ -28,5 +28,5 @@
       "received": "2014-04-15 11:23:06Z"
     }
   ],
-  "total": 510
+  "total": 5
 }