Skip to content

Commit

Permalink
Fixed bug with search. Fixed broken merge from sortinfo.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonricaurte
jonricaurte committed Jul 2, 2013
1 parent c3f2b48 commit e52e21f
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 35 deletions.
20 changes: 15 additions & 5 deletions build/ng-grid.debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: 07/01/2013 07:58
* Compiled At: 07/01/2013 19:56
***********************************************/
(function(window, $) {
'use strict';
Expand Down Expand Up @@ -1780,9 +1780,18 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
$utils.seti18n($scope, newLang);
});
self.maxCanvasHt = self.calcMaxCanvasHeight();

if (self.config.sortInfo.fields && self.config.sortInfo.fields.length > 0) {
self.getColsFromFields();
self.sortActual();
$scope.$watch(function() {
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
}
});

Expand Down Expand Up @@ -1864,7 +1873,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
var i = self.config.sortInfo.fields.indexOf(c.field);
if (i !== -1) {
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns.push(c);
self.config.sortInfo.columns[i] = c;
}
return false;
});
Expand Down Expand Up @@ -2125,6 +2134,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
return newDim;
};
};

var ngRange = function (top, bottom) {
this.topRow = top;
this.bottomRow = bottom;
Expand Down Expand Up @@ -2473,7 +2483,7 @@ var ngSearchProvider = function ($scope, grid, $filter) {
if (!condition.column) {
for (var prop in item) {
if (item.hasOwnProperty(prop)) {
var c = self.fieldMap[prop];
var c = self.fieldMap[prop.toLowerCase()];
if (!c) {
continue;
}
Expand Down
20 changes: 15 additions & 5 deletions build/ng-grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: 07/01/2013 07:58
* Compiled At: 07/01/2013 19:56
***********************************************/
(function(window, $) {
'use strict';
Expand Down Expand Up @@ -1522,9 +1522,18 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
$utils.seti18n($scope, newLang);
});
self.maxCanvasHt = self.calcMaxCanvasHeight();

if (self.config.sortInfo.fields && self.config.sortInfo.fields.length > 0) {
self.getColsFromFields();
self.sortActual();
$scope.$watch(function() {
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
}
});
};
Expand Down Expand Up @@ -1600,7 +1609,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
var i = self.config.sortInfo.fields.indexOf(c.field);
if (i !== -1) {
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns.push(c);
self.config.sortInfo.columns[i] = c;
}
return false;
});
Expand Down Expand Up @@ -1849,6 +1858,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
return newDim;
};
};

var ngRange = function (top, bottom) {
this.topRow = top;
this.bottomRow = bottom;
Expand Down Expand Up @@ -2170,7 +2180,7 @@ var ngSearchProvider = function ($scope, grid, $filter) {
if (!condition.column) {
for (var prop in item) {
if (item.hasOwnProperty(prop)) {
var c = self.fieldMap[prop];
var c = self.fieldMap[prop.toLowerCase()];
if (!c) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions build/ng-grid.min.js
View file

Large diffs are not rendered by default.

20 changes: 15 additions & 5 deletions ng-grid-2.0.7.debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: 07/01/2013 07:58
* Compiled At: 07/01/2013 19:56
***********************************************/
(function(window, $) {
'use strict';
Expand Down Expand Up @@ -1780,9 +1780,18 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
$utils.seti18n($scope, newLang);
});
self.maxCanvasHt = self.calcMaxCanvasHeight();

if (self.config.sortInfo.fields && self.config.sortInfo.fields.length > 0) {
self.getColsFromFields();
self.sortActual();
$scope.$watch(function() {
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
}
});

Expand Down Expand Up @@ -1864,7 +1873,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
var i = self.config.sortInfo.fields.indexOf(c.field);
if (i !== -1) {
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns.push(c);
self.config.sortInfo.columns[i] = c;
}
return false;
});
Expand Down Expand Up @@ -2125,6 +2134,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
return newDim;
};
};

var ngRange = function (top, bottom) {
this.topRow = top;
this.bottomRow = bottom;
Expand Down Expand Up @@ -2473,7 +2483,7 @@ var ngSearchProvider = function ($scope, grid, $filter) {
if (!condition.column) {
for (var prop in item) {
if (item.hasOwnProperty(prop)) {
var c = self.fieldMap[prop];
var c = self.fieldMap[prop.toLowerCase()];
if (!c) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions ng-grid-2.0.7.min.js
View file

Large diffs are not rendered by default.

23 changes: 11 additions & 12 deletions src/classes/grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,25 +562,24 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
$utils.seti18n($scope, newLang);
});
self.maxCanvasHt = self.calcMaxCanvasHeight();

if (self.config.sortInfo.fields && self.config.sortInfo.fields.length > 0) {
self.getColsFromFields();
self.sortActual();
$scope.$watch(function() {
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
}
});

// var p = $q.defer();
// p.resolve();
// return p.promise;
$scope.$watch(function() {
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
}
//$scope.$emit('ngGridEventSorted', grid.config.sortInfo);
},true);
};

self.resizeOnData = function(col) {
Expand Down
2 changes: 1 addition & 1 deletion src/classes/searchProvider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
if (!condition.column) {
for (var prop in item) {
if (item.hasOwnProperty(prop)) {
var c = self.fieldMap[prop];
var c = self.fieldMap[prop.toLowerCase()];
if (!c) {
continue;
}
Expand Down
6 changes: 3 additions & 3 deletions workbench/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function userController($scope) {
$scope.myData = [];
$scope.filterOptions = {
filterText: "",
useExternalFilter: false,
useExternalFilter: false
};
$scope.pagingOptions = {
pageSizes: [250, 500, 1000], //page Sizes
Expand Down Expand Up @@ -87,7 +87,7 @@ function userController($scope) {
});
},
scope: undefined,
grid: undefined,
grid: undefined
};

$scope.myDefs2 = [{ field: 'Sku', displayName: 'My Sku', enableCellEdit: true },
Expand Down Expand Up @@ -122,7 +122,7 @@ function userController($scope) {
maintainColumnRatios: true,
columnDefs: 'myDefs',
primaryKey: 'id',
sortInfo: {fields:['name'], directions:['asc'] },
sortInfo: {fields:['name'], directions:['asc'] }
};
$scope.doStuff = function (evt) {
var elm = angular.element(evt.currentTarget.parentNode);
Expand Down

0 comments on commit e52e21f

Please sign in to comment.