Merge pull request #49 from tjhiggins/th_sort

Change sorting to peak at row values.
immense · Apr 10, 2017 · 6ce5bd2 · 6ce5bd2
2 parents f7108c8 + 38bfb02
commit 6ce5bd2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/knockout-datatable.coffee b/knockout-datatable.coffee
@@ -88,8 +88,8 @@ class window.DataTable
 
       if @sortField()? and @sortField() isnt ''
         rows.sort (a,b) =>
-          aVal = ko.utils.unwrapObservable a[@sortField()]
-          bVal = ko.utils.unwrapObservable b[@sortField()]
+          aVal = ko.utils.peekObservable a[@sortField()]
+          bVal = ko.utils.peekObservable b[@sortField()]
           if typeof aVal is 'string' then aVal = aVal.toLowerCase()
           if typeof bVal is 'string' then bVal = bVal.toLowerCase()
           if @sortDir() is 'asc'

diff --git a/knockout-datatable.js b/knockout-datatable.js
@@ -108,8 +108,8 @@
           if ((_this.sortField() != null) && _this.sortField() !== '') {
             rows.sort(function(a, b) {
               var aVal, bVal;
-              aVal = ko.utils.unwrapObservable(a[_this.sortField()]);
-              bVal = ko.utils.unwrapObservable(b[_this.sortField()]);
+              aVal = ko.utils.peekObservable(a[_this.sortField()]);
+              bVal = ko.utils.peekObservable(b[_this.sortField()]);
               if (typeof aVal === 'string') {
                 aVal = aVal.toLowerCase();
               }

diff --git a/knockout-datatable.min.js b/knockout-datatable.min.js