Skip to content

Commit

Permalink
Fixes for angular-ui#528 angular-ui#473 angular-ui#377
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonricaurte
jonricaurte committed Jul 3, 2013
1 parent 88f850f commit bf04518
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 55 deletions.
21 changes: 9 additions & 12 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 21:49
* Compiled At: 07/02/2013 22:38
***********************************************/
(function(window, $) {
'use strict';
Expand Down Expand Up @@ -1785,9 +1785,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
self.sortColumnsInit();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
Expand Down Expand Up @@ -1862,7 +1860,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
};
self.getColsFromFields = function() {
self.sortColumnsInit = function() {
if (self.config.sortInfo.columns) {
self.config.sortInfo.columns.length = 0;
} else {
Expand All @@ -1874,7 +1872,9 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns[i] = c;
}
return false;
});
angular.forEach(self.config.sortInfo.columns, function(c){
self.sortData(c);
});
};
self.sortActual = function() {
Expand Down Expand Up @@ -2451,8 +2451,7 @@ var ngRowFactory = function (grid, $scope, domUtilityService, $templateCache, $u
}
}

domUtilityService.BuildStyles($scope, grid, true);
grid.fixColumnIndexes();
grid.fixColumnIndexes();
$scope.adjustScrollLeft(0);
self.parsedData.length = 0;
self.parseGroupData(self.groupedData);
Expand Down Expand Up @@ -2885,7 +2884,7 @@ ngGridDirectives.directive('ngCellHasFocus', ['$domUtilityService',
if (isFocused && evt.keyCode !== 37 && evt.keyCode !== 38 && evt.keyCode !== 39 && evt.keyCode !== 40 && evt.keyCode !== 9 && !evt.shiftKey && evt.keyCode !== 13) {
focusOnInputElement($scope,elm);
}
if (evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
if (isFocused && evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
focusOnInputElement($scope, elm);
}
if (evt.keyCode === 27) {
Expand Down Expand Up @@ -3091,9 +3090,7 @@ ngGridDirectives.directive('ngGrid', ['$compile', '$filter', '$templateCache', '
grid.configureColumnWidths();
grid.refreshDomSizes();
if (grid.config.sortInfo.fields.length > 0) {
grid.getColsFromFields();
grid.sortActual();
grid.searchProvider.evalFilter();
grid.sortColumnsInit();
$scope.$emit('ngGridEventSorted', grid.config.sortInfo);
}
$scope.$emit("ngGridEventData", grid.gridId);
Expand Down
21 changes: 9 additions & 12 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 21:49
* Compiled At: 07/02/2013 22:38
***********************************************/
(function(window, $) {
'use strict';
Expand Down Expand Up @@ -1527,9 +1527,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
self.sortColumnsInit();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
Expand Down Expand Up @@ -1598,7 +1596,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
};
self.getColsFromFields = function() {
self.sortColumnsInit = function() {
if (self.config.sortInfo.columns) {
self.config.sortInfo.columns.length = 0;
} else {
Expand All @@ -1610,7 +1608,9 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns[i] = c;
}
return false;
});
angular.forEach(self.config.sortInfo.columns, function(c){
self.sortData(c);
});
};
self.sortActual = function() {
Expand Down Expand Up @@ -2149,8 +2149,7 @@ var ngRowFactory = function (grid, $scope, domUtilityService, $templateCache, $u
}
}

domUtilityService.BuildStyles($scope, grid, true);
grid.fixColumnIndexes();
grid.fixColumnIndexes();
$scope.adjustScrollLeft(0);
self.parsedData.length = 0;
self.parseGroupData(self.groupedData);
Expand Down Expand Up @@ -2566,7 +2565,7 @@ ngGridDirectives.directive('ngCellHasFocus', ['$domUtilityService',
if (isFocused && evt.keyCode !== 37 && evt.keyCode !== 38 && evt.keyCode !== 39 && evt.keyCode !== 40 && evt.keyCode !== 9 && !evt.shiftKey && evt.keyCode !== 13) {
focusOnInputElement($scope,elm);
}
if (evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
if (isFocused && evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
focusOnInputElement($scope, elm);
}
if (evt.keyCode === 27) {
Expand Down Expand Up @@ -2755,9 +2754,7 @@ ngGridDirectives.directive('ngGrid', ['$compile', '$filter', '$templateCache', '
grid.configureColumnWidths();
grid.refreshDomSizes();
if (grid.config.sortInfo.fields.length > 0) {
grid.getColsFromFields();
grid.sortActual();
grid.searchProvider.evalFilter();
grid.sortColumnsInit();
$scope.$emit('ngGridEventSorted', grid.config.sortInfo);
}
$scope.$emit("ngGridEventData", grid.gridId);
Expand Down
4 changes: 2 additions & 2 deletions build/ng-grid.min.js
View file

Large diffs are not rendered by default.

21 changes: 9 additions & 12 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 21:49
* Compiled At: 07/02/2013 22:38
***********************************************/
(function(window, $) {
'use strict';
Expand Down Expand Up @@ -1785,9 +1785,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
self.sortColumnsInit();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
Expand Down Expand Up @@ -1862,7 +1860,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
};
self.getColsFromFields = function() {
self.sortColumnsInit = function() {
if (self.config.sortInfo.columns) {
self.config.sortInfo.columns.length = 0;
} else {
Expand All @@ -1874,7 +1872,9 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns[i] = c;
}
return false;
});
angular.forEach(self.config.sortInfo.columns, function(c){
self.sortData(c);
});
};
self.sortActual = function() {
Expand Down Expand Up @@ -2451,8 +2451,7 @@ var ngRowFactory = function (grid, $scope, domUtilityService, $templateCache, $u
}
}

domUtilityService.BuildStyles($scope, grid, true);
grid.fixColumnIndexes();
grid.fixColumnIndexes();
$scope.adjustScrollLeft(0);
self.parsedData.length = 0;
self.parseGroupData(self.groupedData);
Expand Down Expand Up @@ -2885,7 +2884,7 @@ ngGridDirectives.directive('ngCellHasFocus', ['$domUtilityService',
if (isFocused && evt.keyCode !== 37 && evt.keyCode !== 38 && evt.keyCode !== 39 && evt.keyCode !== 40 && evt.keyCode !== 9 && !evt.shiftKey && evt.keyCode !== 13) {
focusOnInputElement($scope,elm);
}
if (evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
if (isFocused && evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
focusOnInputElement($scope, elm);
}
if (evt.keyCode === 27) {
Expand Down Expand Up @@ -3091,9 +3090,7 @@ ngGridDirectives.directive('ngGrid', ['$compile', '$filter', '$templateCache', '
grid.configureColumnWidths();
grid.refreshDomSizes();
if (grid.config.sortInfo.fields.length > 0) {
grid.getColsFromFields();
grid.sortActual();
grid.searchProvider.evalFilter();
grid.sortColumnsInit();
$scope.$emit('ngGridEventSorted', grid.config.sortInfo);
}
$scope.$emit("ngGridEventData", grid.gridId);
Expand Down
4 changes: 2 additions & 2 deletions ng-grid-2.0.7.min.js
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/classes/grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
return self.config.sortInfo;
}, function(sortInfo){
if (!sortService.isSorting) {
self.getColsFromFields();
self.sortActual();
self.searchProvider.evalFilter();
self.sortColumnsInit();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
}
},true);
Expand Down Expand Up @@ -645,7 +643,7 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
self.searchProvider.evalFilter();
$scope.$emit('ngGridEventSorted', self.config.sortInfo);
};
self.getColsFromFields = function() {
self.sortColumnsInit = function() {
if (self.config.sortInfo.columns) {
self.config.sortInfo.columns.length = 0;
} else {
Expand All @@ -657,7 +655,9 @@ var ngGrid = function ($scope, options, sortService, domUtilityService, $filter,
c.sortDirection = self.config.sortInfo.directions[i] || 'asc';
self.config.sortInfo.columns[i] = c;
}
return false;
});
angular.forEach(self.config.sortInfo.columns, function(c){
self.sortData(c);
});
};
self.sortActual = function() {
Expand Down
3 changes: 1 addition & 2 deletions src/classes/rowFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,7 @@
}
}

domUtilityService.BuildStyles($scope, grid, true);
grid.fixColumnIndexes();
grid.fixColumnIndexes();
$scope.adjustScrollLeft(0);
self.parsedData.length = 0;
self.parseGroupData(self.groupedData);
Expand Down
2 changes: 1 addition & 1 deletion src/directives/ng-cell-has-focus.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ngGridDirectives.directive('ngCellHasFocus', ['$domUtilityService',
if (isFocused && evt.keyCode !== 37 && evt.keyCode !== 38 && evt.keyCode !== 39 && evt.keyCode !== 40 && evt.keyCode !== 9 && !evt.shiftKey && evt.keyCode !== 13) {
focusOnInputElement($scope,elm);
}
if (evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
if (isFocused && evt.shiftKey && (evt.keyCode >= 65 && evt.keyCode <= 90)) {
focusOnInputElement($scope, elm);
}
if (evt.keyCode === 27) {
Expand Down
4 changes: 1 addition & 3 deletions src/directives/ng-grid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@
grid.configureColumnWidths();
grid.refreshDomSizes();
if (grid.config.sortInfo.fields.length > 0) {
grid.getColsFromFields();
grid.sortActual();
grid.searchProvider.evalFilter();
grid.sortColumnsInit();
$scope.$emit('ngGridEventSorted', grid.config.sortInfo);
}
$scope.$emit("ngGridEventData", grid.gridId);
Expand Down
2 changes: 0 additions & 2 deletions workbench/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ function userController($scope) {
showFilter: true,
enableCellEdit: true,
enableCellSelection: true,
showSelectionCheckbox: true,
selectWithCheckboxOnly: true,
showColumnMenu: true,
maintainColumnRatios: true,
columnDefs: 'myDefs',
Expand Down
7 changes: 5 additions & 2 deletions workbench/main3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ function userController($scope) {
enableRowSelection: true,
multiSelect: true,
enableRowReordering: false,
showGroupPanel: true,
columnDefs: 'myDefs',
columnDefs: [{ cellTemplate: '<p>{{row.getProperty(\'Vendor\')}}</p>' },
{ field: 'Vendor', displayName: 'Supplier' },
{ field: 'SeasonCode', displayName: 'My SeasonCode' },
{ field: 'Mfg_Id', displayName: 'Manufacturer ID' },
{ field: 'UPC', displayName: 'Bar Code' }],
groups: ['SeasonCode', 'Vendor']
};

Expand Down

0 comments on commit bf04518

Please sign in to comment.