From 91452ed183d1fcdefd435dc849fb53e34725e245 Mon Sep 17 00:00:00 2001
From: Leonardo Zizzamia <leonardo.zizzamia@gmail.com>
Date: Sat, 26 Dec 2015 21:35:21 -0800
Subject: [PATCH] Released version 0.6.0

---
 CHANGELOG.md                                  |  9 +++++++-
 bower.json                                    |  2 +-
 package.json                                  |  2 +-
 website/static/js/pages/table.js              | 21 +++++++++++++----
 .../template/table-server-side/docs-head.html |  3 ++-
 website/template/table/docs-header.html       |  3 ++-
 website/template/table/sorting.html           | 23 +++++++++++++++----
 7 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9664d70d..c77c8020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 ## Changelog
 
-### v0.5.9 (master, released on Dec 14th 2015)
+### v0.6.0 (master, released on Dec 26th 2015)
+#### Features
+- Sortable can be defined where the columns are defined [#193](https://github.com/Zizzamia/ng-tasty/issues/193)
+
+#### Bug Fixes
+- Fixed bind-reload pagination issue [#186](https://github.com/Zizzamia/ng-tasty/issues/186)
+
+### v0.5.9 (released on Dec 14th 2015)
 #### Features
 - Reload table on specific page [#160](https://github.com/Zizzamia/ng-tasty/issues/160)
 
diff --git a/bower.json b/bower.json
index 17b264f1..ba9d547e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-tasty",
-  "version": "0.5.9",
+  "version": "0.6.0",
   "homepage": "https://github.com/Zizzamia/ng-tasty",
   "authors": [
     {
diff --git a/package.json b/package.json
index 76385d4f..03363135 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-tasty",
-  "version": "0.5.9",
+  "version": "0.6.0",
   "description": "A lightweight, flexible, and tasty collection of reusable UI components for AngularJS.",
   "main": "dist/ng-tasty-tpls.min.js",
   "devDependencies": {
diff --git a/website/static/js/pages/table.js b/website/static/js/pages/table.js
index 72cfae7f..c3107ba2 100644
--- a/website/static/js/pages/table.js
+++ b/website/static/js/pages/table.js
@@ -109,10 +109,23 @@ angular.module('myApp.pages.table', [])
   $rootScope.page = 'table';
   $rootScope.innerPage = 'sorting';
   $scope.resource = {
-    'header': [
-      { 'key': 'name', 'name': 'Name', 'style': {'width': '50%'} },
-      { 'key': 'sf-Location', 'name': 'SF Location', 'style': {'width': '35%'} },
-      { 'key': 'star', 'name': 'Star', 'style': {'width': '15%'}, 'class': ['text-right'] }
+    'header': [{ 
+        'key': 'name', 
+        'name': 'Name', 
+        'style': {'width': '50%'}
+      },
+      { 
+        'key': 'sf-Location', 
+        'name': 'SF Location', 
+        'style': {'width': '35%'},
+        'sortable': false
+      },
+      { 
+        'key': 'star', 
+        'name': 'Star', 
+        'style': {'width': '15%'}, 
+        'class': ['text-right'] 
+      }
     ],
     'rows': tableResource.rows,
     'sortBy': 'star',
diff --git a/website/template/table-server-side/docs-head.html b/website/template/table-server-side/docs-head.html
index e02bde21..90e91859 100644
--- a/website/template/table-server-side/docs-head.html
+++ b/website/template/table-server-side/docs-head.html
@@ -34,7 +34,8 @@
     <ul>
       <li>
         <p><code><span style="color:orange">bind-</span>not-sort-by</code> (Defaults: [ ])
-        : list key columns not want sort, if is empty will not sort any column.
+        : list key columns not want sort, if is empty will not sort any column. You can also disable
+        the sorting by adding <code>sortable: false</code> inside the column header values.
         </p>
       </li>
       <li>
diff --git a/website/template/table/docs-header.html b/website/template/table/docs-header.html
index 9c10917a..d8865eb4 100644
--- a/website/template/table/docs-header.html
+++ b/website/template/table/docs-header.html
@@ -38,7 +38,8 @@
     <ul>
       <li>
         <p><code><span style="color:orange">bind-</span>not-sort-by</code> (Defaults: [ ])
-        : list key columns not want sort, if is empty will not sort any column.
+        : list key columns not want sort, if is empty will not sort any column. You can also disable
+        the sorting by adding <code>sortable: false</code> inside the column header values.
         </p>
       </li>
       <li>
diff --git a/website/template/table/sorting.html b/website/template/table/sorting.html
index 4938d69e..46d33d43 100644
--- a/website/template/table/sorting.html
+++ b/website/template/table/sorting.html
@@ -7,7 +7,7 @@
     <div class="example">
       <div tasty-table bind-resource="resource"> 
         <table class="table table-striped table-condensed">
-          <thead tasty-thead bind-not-sort-by="notSortBy"></thead>
+          <thead tasty-thead></thead>
           <tbody>
             <tr ng-repeat="row in rows">
               <td>{{ row.name }}</td>
@@ -44,10 +44,23 @@
         <pre><code data-language="javascript">$scope.notSortBy = ['sf-location'];
 
 $scope.resource = {
-  "header": [
-    { "key": "name", "name": "Name", "style": {"width": "50%"} },
-    { "key": "star", "name": "Star", "style": {"width": "15%"} },
-    { "key": "sf-location", "name": "SF Location", "style": {"width": "35%"} }
+  "header": [{ 
+      key: "name", 
+      name: "Name", 
+      style: { width: "50%" } 
+    },
+    { 
+      key: "sf-location", 
+      name: "SF Location", 
+      style: { width: "35%" },
+      sortable: false
+    },
+    { 
+      key: "star", 
+      name: "Star", 
+      style: { width: "15%"},
+      class: ['text-right']
+    }
   ],
   "rows": [
     { "name": "Ritual Coffee Roasters", "star": "★★★★★", "sf-location": "Hayes Valley"},