Merge pull request #529 from jpmorganchase/column-sort-fix

Column sort fix
finos · Apr 8, 2019 · eaa57a0 · eaa57a0
2 parents 17ee659 + 2086eb5
commit eaa57a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cpp/perspective/src/cpp/emscripten.cpp b/cpp/perspective/src/cpp/emscripten.cpp
@@ -79,7 +79,7 @@ namespace binding {
              */
             std::string op = sort_item[1].as<std::string>();
             bool is_col_sortop = op.find("col") != std::string::npos;
-            return (is_column_sort && is_col_sortop) || !is_col_sortop;
+            return (is_column_sort && is_col_sortop) || (!is_col_sortop && !is_column_sort);
         };
 
         for (auto idx = 0; idx < sortbys.size(); ++idx) {

diff --git a/packages/perspective-viewer-hypergrid/test/results/results.json b/packages/perspective-viewer-hypergrid/test/results/results.json
@@ -27,6 +27,6 @@
     "superstore.html/should not be able to expand past number of row pivots": "2db398671e7d98f2fa3c7ebabf4a3176",
     "superstore.html/shows a sort indicator": "ad6bb4a58d3c630f45a2ea3e21ee74e1",
     "superstore.html/shows multiple sort indicators": "919e5b8734d8ab684b11649c4b9d6eb4",
-    "superstore.html/shows a sort indicator on column split": "79c4434bf30a3517e4537bea8c1ad9bb",
-    "__GIT_COMMIT__": "38cf3d646a169637b086c6d2cdd850afb7faf4e0"
+    "superstore.html/shows a sort indicator on column split": "bd11ff17bd50fd575744161884b0304c",
+    "__GIT_COMMIT__": "8319755ed97ce2ccf478a00bf8b8209254a95890"
 }