gh-pages v3.0.0-rc.20-823e3d5

Author: grud

index.html

@@ -61,11 +61,11 @@ <h1 class="text-center">Angular UI Grid</h1>
               Code on Github
           </a>
 
-          <a class="btn btn-danger btn-large" href="https://github.com/angular-ui/ui-grid.info/tree/gh-pages/release" title="Download 3.0.0-rc.20-cb3d301">
+          <a class="btn btn-danger btn-large" href="https://github.com/angular-ui/ui-grid.info/tree/gh-pages/release" title="Download 3.0.0-rc.20-823e3d5">
             <i class="fa fa-download fa-fw"></i>
-            <!-- Download <small>( 2.0.14 / 3.0.0-rc.20-cb3d301 )</small> --> <!-- TODO(c0bra): note: not showing stable version till 3.0.0 is released -->
+            <!-- Download <small>( 2.0.14 / 3.0.0-rc.20-823e3d5 )</small> --> <!-- TODO(c0bra): note: not showing stable version till 3.0.0 is released -->
 
-            Download <small>( 3.0.0-rc.20-cb3d301 )</small>
+            Download <small>( 3.0.0-rc.20-823e3d5 )</small>
           </a>
 
           <a class="btn btn-success btn-large" href="http://ui-grid.info/docs/#/tutorial" title="Tutorial">

less/ui-grid.less

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v3.0.0-rc.20-cb3d301 - 2015-03-17
+ * ui-grid - v3.0.0-rc.20-823e3d5 - 2015-03-18
  * Copyright (c) 2015 ; License: MIT 
  */
 

release/ui-grid-unstable.css

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v3.0.0-rc.20-cb3d301 - 2015-03-17
+ * ui-grid - v3.0.0-rc.20-823e3d5 - 2015-03-18
  * Copyright (c) 2015 ; License: MIT 
  */
 .ui-grid {
@@ -1261,3 +1261,96 @@ div.ui-grid-cell input.ng-valid {
 .ui-grid-selection-row-header-buttons.ui-grid-all-selected {
   opacity: 1;
 }
+
+.ui-grid-icon-plus-squared:before {
+  content: '\c350';
+}
+/* '썐' */
+.ui-grid-icon-minus-squared:before {
+  content: '\c351';
+}
+/* '썑' */
+.ui-grid-icon-search:before {
+  content: '\c352';
+}
+/* '썒' */
+.ui-grid-icon-cancel:before {
+  content: '\c353';
+}
+/* '썓' */
+.ui-grid-icon-info-circled:before {
+  content: '\c354';
+}
+/* '썔' */
+.ui-grid-icon-lock:before {
+  content: '\c355';
+}
+/* '썕' */
+.ui-grid-icon-lock-open:before {
+  content: '\c356';
+}
+/* '썖' */
+.ui-grid-icon-pencil:before {
+  content: '\c357';
+}
+/* '썗' */
+.ui-grid-icon-down-dir:before {
+  content: '\c358';
+}
+/* '썘' */
+.ui-grid-icon-up-dir:before {
+  content: '\c359';
+}
+/* '썙' */
+.ui-grid-icon-left-dir:before {
+  content: '\c35a';
+}
+/* '썚' */
+.ui-grid-icon-right-dir:before {
+  content: '\c35b';
+}
+/* '썛' */
+.ui-grid-icon-left-open:before {
+  content: '\c35c';
+}
+/* '썜' */
+.ui-grid-icon-right-open:before {
+  content: '\c35d';
+}
+/* '썝' */
+.ui-grid-icon-angle-down:before {
+  content: '\c35e';
+}
+/* '썞' */
+.ui-grid-icon-filter:before {
+  content: '\c35f';
+}
+/* '썟' */
+.ui-grid-icon-sort-alt-up:before {
+  content: '\c360';
+}
+/* '썠' */
+.ui-grid-icon-sort-alt-down:before {
+  content: '\c361';
+}
+/* '썡' */
+.ui-grid-icon-ok:before {
+  content: '\c362';
+}
+/* '썢' */
+.ui-grid-icon-menu:before {
+  content: '\c363';
+}
+/* '썣' */
+.ui-grid-icon-indent-left:before {
+  content: '\e800';
+}
+/* '' */
+.ui-grid-icon-indent-right:before {
+  content: '\e801';
+}
+/* '' */
+.ui-grid-icon-spin5:before {
+  content: '\ea61';
+}
+/* '' */

release/ui-grid-unstable.js

@@ -1,5 +1,5 @@
 /*!
- * ui-grid - v3.0.0-rc.20-cb3d301 - 2015-03-17
+ * ui-grid - v3.0.0-rc.20-823e3d5 - 2015-03-18
  * Copyright (c) 2015 ; License: MIT 
  */
 
@@ -4722,8 +4722,10 @@ angular.module('ui.grid')
     if (!add) {
       self.resetColumnSorting(column);
       column.sort.priority = 0;
+      // Get the actual priority since there may be columns which have suppressRemoveSort set
+      column.sort.priority = self.getNextColumnSortPriority();
     }
-    else {
+    else if (!column.sort.priority){
       column.sort.priority = self.getNextColumnSortPriority();
     }
 
@@ -4736,7 +4738,7 @@ angular.module('ui.grid')
         if ( column.colDef && column.suppressRemoveSort ){
           column.sort.direction = uiGridConstants.ASC;
         } else {
-          column.sort.direction = null;
+          column.sort = {};
         }
       }
       else {