FIX termtable sort vs filter problem + sort toggle is 2 ways (asc/desc)...

FIX termtable sort vs filter problem + sort toggle is 2 ways (asc/desc) instead of 3 (asc/desc/neutral)

static/lib/jquery/dynatable/jquery.dynatable.js

@@ -954,7 +954,6 @@
 
       settings.dataset.sorts = {};
       settings.dataset.sortsKeys.length = 0;
-      settings.dataset.queries = {};
       obj.$element.trigger('dynatable:sorts:cleared');
     };
 
@@ -1102,12 +1101,21 @@
           }
           this.appendArrowDown($link);
         // If descending, remove sort
-        } else {
-          for (var i = 0, len = column.sorts.length; i < len; i++) {
-            obj.sorts.remove(column.sorts[i]);
-          }
-          this.removeArrow($link);
         }
+        else {
+        // [2016-05-11 rl: never remove sort...]
+        //   for (var i = 0, len = column.sorts.length; i < len; i++) {
+        //     obj.sorts.remove(column.sorts[i]);
+        //   }
+        //   this.removeArrow($link);
+        // [2016-05-11 rl: ...but instead set to ascending] ----8<----
+        for (var i = 0, len = column.sorts.length; i < len; i++) {
+          obj.sorts.add(column.sorts[i], 1);
+        }
+        this.appendArrowUp($link);
+        }
+        // -----------------------------------------------------8<----
+
       // Otherwise, if not already set, set to ascending
       } else {
         for (var i = 0, len = column.sorts.length; i < len; i++) {