From 4b2767c2871412c4e3c7c8c48e28fa362ee3ab32 Mon Sep 17 00:00:00 2001 From: a3chic9 Date: Wed, 8 Apr 2015 11:25:31 -0400 Subject: [PATCH 1/3] Update ng-grid.d.ts angular references from ng --- ng-grid/ng-grid.d.ts | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/ng-grid/ng-grid.d.ts b/ng-grid/ng-grid.d.ts index 3bb3b2daab..e354728656 100644 --- a/ng-grid/ng-grid.d.ts +++ b/ng-grid/ng-grid.d.ts @@ -30,9 +30,9 @@ declare module ngGrid { export interface IDomAccessProvider { previousColumn:IColumn; grid:IGridInstance; - changeUserSelect(elm:ng.IAugmentedJQuery, value:string):void; + changeUserSelect(elm:angular.IAugmentedJQuery, value:string):void; focusCellElement($scope:IGridScope, index:number):void; - selectionHandlers($scope:IGridScope, elm:ng.IAugmentedJQuery):void; + selectionHandlers($scope:IGridScope, elm:angular.IAugmentedJQuery):void; } export interface IStyleProviderStatic { @@ -43,7 +43,7 @@ declare module ngGrid { } export interface ISearchProviderStatic { - new($scope:IGridScope, grid:IGridInstance, $filter:ng.IFilterService):ISearchProvider; + new($scope:IGridScope, grid:IGridInstance, $filter:angular.IFilterService):ISearchProvider; } export interface ISearchProvider { @@ -53,7 +53,7 @@ declare module ngGrid { } export interface ISelectionProviderStatic { - new(grid:IGridInstance, $scope:IGridScope, $parse:ng.IParseService):ISelectionProvider; + new(grid:IGridInstance, $scope:IGridScope, $parse:angular.IParseService):ISelectionProvider; } export interface ISelectionProvider { @@ -62,7 +62,7 @@ declare module ngGrid { selectedIndex:number; lastClickedRow:any; ignoreSelectedItemChanges:boolean; - pKeyParser:ng.ICompiledExpression; + pKeyParser:angular.ICompiledExpression; ChangeSelection(rowItem:any, event:any):void; getSelection(entity:any):number; getSelectionIndex(entity:any):number; @@ -71,7 +71,7 @@ declare module ngGrid { } export interface IEventProviderStatic { - new(grid:IGridInstance, $scope:IGridScope, domUtilityService:service.IDomUtilityService, $timeout:ng.ITimeoutService):IEventProvider; + new(grid:IGridInstance, $scope:IGridScope, domUtilityService:service.IDomUtilityService, $timeout:angular.ITimeoutService):IEventProvider; } export interface IEventProvider { @@ -203,7 +203,7 @@ declare module ngGrid { } export interface IColumnStatic { - new(config:IGridOptions, $scope:IGridScope, grid:IGridInstance, domUtilityService:service.IDomUtilityService, $templateCache:ng.ITemplateCacheService, $utils:any):IColumn; + new(config:IGridOptions, $scope:IGridScope, grid:IGridInstance, domUtilityService:service.IDomUtilityService, $templateCache:angular.ITemplateCacheService, $utils:any):IColumn; } export interface IColumn { @@ -251,7 +251,7 @@ declare module ngGrid { setVars(fromCol:IColumn):void; } - export interface IGridScope extends ng.IScope { + export interface IGridScope extends angular.IScope { elementsNeedMeasuring:boolean; columns:any[]; renderedRows:any[]; @@ -292,15 +292,15 @@ declare module ngGrid { } export interface IGridInstance { - $canvas:ng.IAugmentedJQuery; - $viewport:ng.IAugmentedJQuery; - $groupPanel:ng.IAugmentedJQuery; - $footerPanel:ng.IAugmentedJQuery; - $headerScroller:ng.IAugmentedJQuery; - $headerContainer:ng.IAugmentedJQuery; - $headers:ng.IAugmentedJQuery; - $topPanel:ng.IAugmentedJQuery; - $root:ng.IAugmentedJQuery; + $canvas:angular.IAugmentedJQuery; + $viewport:angular.IAugmentedJQuery; + $groupPanel:angular.IAugmentedJQuery; + $footerPanel:angular.IAugmentedJQuery; + $headerScroller:angular.IAugmentedJQuery; + $headerContainer:angular.IAugmentedJQuery; + $headers:angular.IAugmentedJQuery; + $topPanel:angular.IAugmentedJQuery; + $root:angular.IAugmentedJQuery; config:IGridOptions; data:any; elementDims:IElementDimension; @@ -327,9 +327,9 @@ declare module ngGrid { configureColumnWidths():void; fixColumnIndexes():void; fixGroupIndexes():void; - getTemplate(key:string):ng.IPromise; - init():ng.IPromise; - initTemplates():ng.IPromise; + getTemplate(key:string):angular.IPromise; + init():angular.IPromise; + initTemplates():angular.IPromise; minRowsToRender():void; refreshDomSizes():void; resizeOnData(col:IColumn):void; @@ -379,7 +379,7 @@ declare module ngGrid { /** Data updated callback, fires every time the data is modified from outside the grid. */ dataUpdated?: Function; - /** Enables cell editing. */ + /** Enables cell editiangular. */ enableCellEdit?: boolean; /** Enables cell selection. */ @@ -400,7 +400,7 @@ declare module ngGrid { /** Enable column pinning */ enablePinning?: boolean; - /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */ + /** Enable drag and drop row reorderiangular. Only works in HTML5 compliant browsers. */ enableRowReordering?: boolean; /** To be able to have selectable rows in grid. */ @@ -440,7 +440,7 @@ declare module ngGrid { /** Prevent unselections when in single selection mode. */ keepLastSelected?: boolean; - /** Maintains the column widths while resizing. + /** Maintains the column widths while resiziangular. Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */ maintainColumnRatios?: boolean; @@ -496,7 +496,7 @@ declare module ngGrid { /** Set the tab index of the Vieport. */ tabIndex?: number; - /** Prevents the internal sorting from executing. + /** Prevents the internal sorting from executiangular. The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/ useExternalSorting?: boolean; @@ -602,7 +602,7 @@ declare module ngGrid { eventStorage:any; numberOfGrids:number; immediate:number; - AssignGridContainers($scope:IGridScope, rootel:ng.IAugmentedJQuery, grid:IGridInstance):void; + AssignGridContainers($scope:IGridScope, rootel:angular.IAugmentedJQuery, grid:IGridInstance):void; getRealWidth(obj:IDimension):number; UpdateGridLayout($scope:IGridScope, grid:IGridInstance):void; setStyleText(grid:IGridInstance, css:string):void; From a1fe2dd7267d1a2183f48bd4c62e2533131af3d7 Mon Sep 17 00:00:00 2001 From: a3chic9 Date: Wed, 8 Apr 2015 11:32:25 -0400 Subject: [PATCH 2/3] Fixed errors in find ng. ang replace angular.. --- ng-grid/ng-grid.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ng-grid/ng-grid.d.ts b/ng-grid/ng-grid.d.ts index e354728656..0fb267faac 100644 --- a/ng-grid/ng-grid.d.ts +++ b/ng-grid/ng-grid.d.ts @@ -379,7 +379,7 @@ declare module ngGrid { /** Data updated callback, fires every time the data is modified from outside the grid. */ dataUpdated?: Function; - /** Enables cell editiangular. */ + /** Enables cell editing. */ enableCellEdit?: boolean; /** Enables cell selection. */ @@ -400,7 +400,7 @@ declare module ngGrid { /** Enable column pinning */ enablePinning?: boolean; - /** Enable drag and drop row reorderiangular. Only works in HTML5 compliant browsers. */ + /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */ enableRowReordering?: boolean; /** To be able to have selectable rows in grid. */ @@ -440,7 +440,7 @@ declare module ngGrid { /** Prevent unselections when in single selection mode. */ keepLastSelected?: boolean; - /** Maintains the column widths while resiziangular. + /** Maintains the column widths while resizing. Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */ maintainColumnRatios?: boolean; @@ -496,7 +496,7 @@ declare module ngGrid { /** Set the tab index of the Vieport. */ tabIndex?: number; - /** Prevents the internal sorting from executiangular. + /** Prevents the internal sorting from executing. The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/ useExternalSorting?: boolean; From d203b4a67c6d8be4c8ecaf7a9c84f9e8c8b6e38c Mon Sep 17 00:00:00 2001 From: a3chic9 Date: Wed, 8 Apr 2015 11:47:42 -0400 Subject: [PATCH 3/3] Update ng-grid-tests.ts angular module Changed references from depreciated `ng` module to `angular` module --- ng-grid/ng-grid-tests.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ng-grid/ng-grid-tests.ts b/ng-grid/ng-grid-tests.ts index 82105ea5b7..d8d153f289 100644 --- a/ng-grid/ng-grid-tests.ts +++ b/ng-grid/ng-grid-tests.ts @@ -63,7 +63,7 @@ selectionProvider.selectedItems = []; selectionProvider.selectedIndex = 1; selectionProvider.lastClickedRow = {}; selectionProvider.ignoreSelectedItemChanges = false; -selectionProvider.pKeyParser = {}; +selectionProvider.pKeyParser = {}; selectionProvider.ChangeSelection({}, {}); nr = selectionProvider.getSelection({}); nr = selectionProvider.getSelectionIndex({}); @@ -256,15 +256,15 @@ nr = gridScope.totalRowWidth(); a = gridScope.headerScrollerDim(); var gridInstance: ngGrid.IGridInstance = {}; -gridInstance.$canvas = {}; -gridInstance.$viewport = {}; -gridInstance.$groupPanel = {}; -gridInstance.$footerPanel = {}; -gridInstance.$headerScroller = {}; -gridInstance.$headerContainer = {}; -gridInstance.$headers = {}; -gridInstance.$topPanel = {}; -gridInstance.$root = {}; +gridInstance.$canvas = {}; +gridInstance.$viewport = {}; +gridInstance.$groupPanel = {}; +gridInstance.$footerPanel = {}; +gridInstance.$headerScroller = {}; +gridInstance.$headerContainer = {}; +gridInstance.$headers = {}; +gridInstance.$topPanel = {}; +gridInstance.$root = {}; gridInstance.config = {}; gridInstance.data = {}; gridInstance.elementDims = {}; @@ -290,7 +290,7 @@ gridInstance.clearSortingData(); gridInstance.configureColumnWidths(); gridInstance.fixColumnIndexes(); gridInstance.fixGroupIndexes(); -var p:ng.IPromise = gridInstance.getTemplate(''); +var p:angular.IPromise = gridInstance.getTemplate(''); p = gridInstance.init(); p = gridInstance.initTemplates(); gridInstance.minRowsToRender(); @@ -302,12 +302,12 @@ gridInstance.sortColumnsInit(); gridInstance.sortData({}, {}); var test_styleProvider:ngGrid.IStyleProvider = new ngStyleProvider({}, {}); -var test_searchProvider:ngGrid.ISearchProvider = new ngSearchProvider({}, {}, {}); -var test_selectionProvider:ngGrid.ISelectionProvider = new ngSelectionProvider({}, {}, {}); -var test_eventProvider:ngGrid.IEventProvider = new ngEventProvider({}, {}, {}, {}); +var test_searchProvider:ngGrid.ISearchProvider = new ngSearchProvider({}, {}, {}); +var test_selectionProvider:ngGrid.ISelectionProvider = new ngSelectionProvider({}, {}, {}); +var test_eventProvider:ngGrid.IEventProvider = new ngEventProvider({}, {}, {}, {}); var test_aggregate:ngGrid.IAggregate = new ngAggregate({}, {}, 10, true); var test_renderedRange:ngGrid.IRenderedRange = new ngRenderedRange(1, 2); var test_dimension:ngGrid.IDimension = new ngDimension({}); var test_row:ngGrid.IRow = new ngRow({}, {}, {}, 0, {}); -var test_column:ngGrid.IColumn = new ngColumn({}, {}, {}, {}, {}, {}); +var test_column:ngGrid.IColumn = new ngColumn({}, {}, {}, {}, {}, {}); var test_footer:ngGrid.IFooter = new ngFooter({}, {});