@@ -686,7 +686,7 @@ angular.module('ui.grid')
686
686
* @param {string } name column name
687
687
*/
688
688
Grid . prototype . getColumn = function getColumn ( name ) {
689
- return arrayFinder ( this . columns , function ( column ) {
689
+ return rowColumnFinder ( this . columns , function ( column ) {
690
690
return column . colDef . name === name ;
691
691
} ) ;
692
692
} ;
@@ -699,7 +699,7 @@ angular.module('ui.grid')
699
699
* @param {string } name column.field
700
700
*/
701
701
Grid . prototype . getColDef = function getColDef ( name ) {
702
- return arrayFinder ( this . options . columnDefs , function ( colDef ) {
702
+ return rowColumnFinder ( this . options . columnDefs , function ( colDef ) {
703
703
return colDef . name === name ;
704
704
} ) ;
705
705
} ;
@@ -1070,21 +1070,21 @@ angular.module('ui.grid')
1070
1070
return t ;
1071
1071
} ;
1072
1072
1073
- var arrayFinder = function ( array , func ) {
1073
+ var rowColumnFinder = function ( array , func ) {
1074
1074
if ( array && array . length ) {
1075
- var arr = [ ] ;
1076
1075
if ( angular . isFunction ( array . find ) ) {
1077
- return arr . push ( array . find ( func ) ) [ 0 ] || null ;
1076
+ return array . find ( func ) || null ;
1078
1077
}
1079
1078
1079
+ var result = null ;
1080
1080
array . every ( function ( entry ) {
1081
- if ( func ( entry ) ) {
1082
- arr . push ( entry ) ;
1081
+ if ( func ( entry ) ) {
1082
+ result = entry ;
1083
1083
return false ;
1084
1084
}
1085
1085
return true ;
1086
1086
} ) ;
1087
- return arr . length ? arr [ 0 ] : null ;
1087
+ return result ;
1088
1088
}
1089
1089
return null ;
1090
1090
}
@@ -1101,7 +1101,7 @@ angular.module('ui.grid')
1101
1101
Grid . prototype . getRow = function getRow ( rowEntity , lookInRows ) {
1102
1102
var self = this ;
1103
1103
lookInRows = lookInRows == void 0 ? this . rows : lookInRows ;
1104
- return arrayFinder ( lookInRows , function ( row ) {
1104
+ return rowColumnFinder ( lookInRows , function ( row ) {
1105
1105
return self . options . rowEquality ( row . entity , rowEntity ) ;
1106
1106
} ) ;
1107
1107
} ;
0 commit comments