renamed branch

Author: rstaib

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.2.0
+
+### Enhancements & Features
+- Fixed table headers
+- Fixed table column
+- Sorted header column CSS class
+- Improved destroy method
+- Improved ajax request settings [#27](http://github.com/rstaib/jquery-bootgrid/issues/27)
+
+### Bug Fixes
+- ...
+
 ## 1.1.1
 
 ### Bug Fixes

bootgrid.jquery.json

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

bower.json

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

build/jQuery.Bootgrid.1.1.1.nupkg

@@ -94,8 +94,9 @@
   top: 2px;
 }
 .bootgrid-table th:hover,
-.bootgrid-table th:active {
-  background: #fafafa;
+.bootgrid-table th:active,
+.bootgrid-table th.active {
+  background: #fafafa !important;
 }
 .bootgrid-table td {
   overflow: hidden;

build/jQuery.Bootgrid.1.2.0.nupkg

@@ -1,5 +1,5 @@
 /*! 
- * jQuery Bootgrid v1.1.1 - 09/24/2014
+ * jQuery Bootgrid v1.2.0 - 09/24/2014
  * Copyright (c) 2014 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
  */
@@ -133,7 +133,7 @@
             }
 
             // ensures that only the first order will be applied in case of multi sorting is disabled
-            if (!that.options.multiSort && column.order !== null)
+            if (!that.options.multiSort && column.order != null)
             {
                 sorted = true;
             }
@@ -751,7 +751,8 @@
                         (sorting && sortOrder && sortOrder === "desc") ? css.iconDown : ""),
                     icon = tpl.icon.resolve(getParams.call(that, { iconCss: iconCss })),
                     align = column.headerAlign,
-                    cssClass = (column.headerCssClass.length > 0) ? " " + column.headerCssClass : "";
+                    cssClass = ((column.headerCssClass.length > 0) ? " " + column.headerCssClass : "") + 
+                        ((that.options.highlightColumns && column.order != null) ? " " + that.options.css.active : "");
                 html += tpl.headerCell.resolve(getParams.call(that, {
                     column: column, icon: icon, sortable: sorting && column.sortable && css.sortable || "",
                     css: ((align === "right") ? css.right : (align === "center") ? 
@@ -764,27 +765,29 @@
         // todo: create a own function for that piece of code
         if (sorting)
         {
-            var sortingSelector = getCssSelector(css.sortable),
+            var activeSelector = getCssSelector(css.active),
+                sortingSelector = getCssSelector(css.sortable),
                 iconSelector = getCssSelector(css.icon);
             headerRow.off("click" + namespace, sortingSelector)
                 .on("click" + namespace, sortingSelector, function (e)
                 {
                     e.preventDefault();
                     var $this = $(this),
                         columnId = $this.data("column-id") || $this.parents("th").first().data("column-id"),
-                        sortOrder = that.sort[columnId],
-                        icon = $this.find(iconSelector);
+                        sortOrder = that.sort[columnId];
 
                     if (!that.options.multiSort)
                     {
-                        $this.parents("tr").first().find(iconSelector).removeClass(css.iconDown + " " + css.iconUp);
+                        $this.parents("tr:first").find(iconSelector).removeClass(css.iconDown + " " + css.iconUp)
+                            .end().find(activeSelector).removeClass(css.active);
                         that.sort = {};
                     }
 
                     if (sortOrder && sortOrder === "asc")
                     {
                         that.sort[columnId] = "desc";
-                        icon.removeClass(css.iconUp).addClass(css.iconDown);
+                        $this.parent().addClass(css.active).find(iconSelector)
+                            .removeClass(css.iconUp).addClass(css.iconDown);
                     }
                     else if (sortOrder && sortOrder === "desc")
                     {
@@ -799,18 +802,21 @@
                                 }
                             }
                             that.sort = newSort;
-                            icon.removeClass(css.iconDown);
+                            $this.parent().removeClass(css.active).find(iconSelector)
+                                .removeClass(css.iconDown);
                         }
                         else
                         {
                             that.sort[columnId] = "asc";
-                            icon.removeClass(css.iconDown).addClass(css.iconUp);
+                            $this.parent().addClass(css.active).find(iconSelector)
+                                .removeClass(css.iconDown).addClass(css.iconUp);
                         }
                     }
                     else
                     {
                         that.sort[columnId] = "asc";
-                        icon.addClass(css.iconUp);
+                        $this.parent().addClass(css.active).find(iconSelector)
+                            .addClass(css.iconUp);
                     }
 
                     sortRows.call(that);
@@ -951,6 +957,7 @@
         this.header = null;
         this.footer = null;
         this.xqr = null;
+        this.original = this.element.clone();
 
         // todo: implement cache
     };
@@ -1021,6 +1028,17 @@
          **/
         keepSelection: false,
 
+        /**
+         * Defines whether the columns which are filtered or sorted should be highlighted or not.
+         *
+         * @property highlightColumns
+         * @type Boolean
+         * @default false
+         * @for defaults
+         * @since 1.2.0
+         **/
+        highlightColumns: false,
+
         highlightRows: false, // highlights new rows (find the page of the first new row)
         sorting: true,
         multiSort: false,
@@ -1113,6 +1131,18 @@
          **/
         css: {
             actions: "actions btn-group", // must be a unique class name or constellation of class names within the header and footer
+
+            /**
+             * CSS class to highlight active parts like sorted or filtered columns.
+             *
+             * @property active
+             * @type String
+             * @default "active"
+             * @for css
+             * @since 1.2.0
+             **/
+            active: "active",
+
             center: "text-center",
             columnHeaderAnchor: "column-header-anchor", // must be a unique class name or constellation of class names within the column header cell
             columnHeaderText: "text",
@@ -1234,7 +1264,7 @@
     {
         if (this.options.ajax)
         {
-            // todo: implement ajax DELETE
+            // todo: implement ajax POST
         }
         else
         {
@@ -1298,7 +1328,7 @@
         {
             this.footer.remove();
         }
-        this.element.remove("tbody").off(namespace).removeData(namespace);
+        this.element.before(this.original).remove();
 
         return this;
     };