Rearranging if statement.

angular-ui · Jul 1, 2013 · 4338ef6 · 4338ef6
1 parent 5863c9d
commit 4338ef6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/build/ng-grid.debug.js b/build/ng-grid.debug.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/angular-ui/ng-grid/blob/master/README.md 
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 06/30/2013 20:57
+* Compiled At: 06/30/2013 21:00
 ***********************************************/
 (function(window, $) {
 'use strict';
@@ -3229,7 +3229,7 @@ ngGridDirectives.directive('ngInput', [function() {
                         }
                         break;
                     case 13: // Enter (Leave Field)
-                        if(scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  && scope.enableCellEditOnFocus || scope.enableCellEdit) {
+                        if(scope.enableCellEditOnFocus && scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  || scope.enableCellEdit) {
                             elm.blur();
                         }
                         break;

diff --git a/build/ng-grid.js b/build/ng-grid.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/angular-ui/ng-grid/blob/master/README.md 
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 06/30/2013 20:57
+* Compiled At: 06/30/2013 21:00
 ***********************************************/
 (function(window, $) {
 'use strict';
@@ -2875,7 +2875,7 @@ ngGridDirectives.directive('ngInput', [function() {
                         }
                         break;
                     case 13: 
-                        if(scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  && scope.enableCellEditOnFocus || scope.enableCellEdit) {
+                        if(scope.enableCellEditOnFocus && scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  || scope.enableCellEdit) {
                             elm.blur();
                         }
                         break;

diff --git a/build/ng-grid.min.js b/build/ng-grid.min.js
diff --git a/ng-grid-2.0.7.debug.js b/ng-grid-2.0.7.debug.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/angular-ui/ng-grid/blob/master/README.md 
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 06/30/2013 20:57
+* Compiled At: 06/30/2013 21:00
 ***********************************************/
 (function(window, $) {
 'use strict';
@@ -3229,7 +3229,7 @@ ngGridDirectives.directive('ngInput', [function() {
                         }
                         break;
                     case 13: // Enter (Leave Field)
-                        if(scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  && scope.enableCellEditOnFocus || scope.enableCellEdit) {
+                        if(scope.enableCellEditOnFocus && scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  || scope.enableCellEdit) {
                             elm.blur();
                         }
                         break;

diff --git a/ng-grid-2.0.7.min.js b/ng-grid-2.0.7.min.js
diff --git a/src/directives/ng-input.js b/src/directives/ng-input.js
@@ -26,7 +26,7 @@ ngGridDirectives.directive('ngInput', [function() {
                         }
                         break;
                     case 13: // Enter (Leave Field)
-                        if(scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  && scope.enableCellEditOnFocus || scope.enableCellEdit) {
+                        if(scope.enableCellEditOnFocus && scope.totalFilteredItemsLength() - 1 > scope.row.rowIndex && scope.row.rowIndex > 0  || scope.enableCellEdit) {
                             elm.blur();
                         }
                         break;