@@ -272,6 +272,8 @@ angular.module('ui.grid')
272272 * @methodOf ui.grid.core.api:PublicApi
273273 * @description adds a row header column to the grid
274274 * @param {object } column def
275+ * @param {number } order Determines order of header column on grid. Lower order means header
276+ * is positioned to the left of higher order headers
275277 *
276278 */
277279 self . api . registerMethod ( 'core' , 'addRowHeaderColumn' , this . addRowHeaderColumn ) ;
@@ -379,7 +381,7 @@ angular.module('ui.grid')
379381 * that have sorting on them, sorted in priority order.
380382 *
381383 * @param {$scope } scope The scope of the controller. This is used to deregister this event when the scope is destroyed.
382- * @param {Function } callBack Will be called when the event is emited. The function passes back the grid and an array of
384+ * @param {Function } callBack Will be called when the event is emited. The function passes back the grid and an array of
383385 * columns with sorts on them, in priority order.
384386 *
385387 * @example
@@ -754,8 +756,14 @@ angular.module('ui.grid')
754756 * @description adds a row header column to the grid
755757 * @param {object } column def
756758 */
757- Grid . prototype . addRowHeaderColumn = function addRowHeaderColumn ( colDef ) {
759+ Grid . prototype . addRowHeaderColumn = function addRowHeaderColumn ( colDef , order ) {
758760 var self = this ;
761+
762+ //default order
763+ if ( order === undefined ) {
764+ order = 0 ;
765+ }
766+
759767 var rowHeaderCol = new GridColumn ( colDef , gridUtil . nextUid ( ) , self ) ;
760768 rowHeaderCol . isRowHeader = true ;
761769 if ( self . isRTL ( ) ) {
@@ -774,7 +782,12 @@ angular.module('ui.grid')
774782 rowHeaderCol . enableFiltering = false ;
775783 rowHeaderCol . enableSorting = false ;
776784 rowHeaderCol . enableHiding = false ;
785+ rowHeaderCol . headerPriority = order ;
777786 self . rowHeaderColumns . push ( rowHeaderCol ) ;
787+ self . rowHeaderColumns = self . rowHeaderColumns . sort ( function ( a , b ) {
788+ return a . headerPriority - b . headerPriority ;
789+ } ) ;
790+
778791 self . buildColumns ( )
779792 . then ( function ( ) {
780793 self . preCompileCellTemplates ( ) ;
@@ -836,9 +849,11 @@ angular.module('ui.grid')
836849 }
837850
838851 //add row header columns to the grid columns array _after_ columns without columnDefs have been removed
839- self . rowHeaderColumns . forEach ( function ( rowHeaderColumn ) {
840- self . columns . unshift ( rowHeaderColumn ) ;
841- } ) ;
852+ //rowHeaderColumns is ordered by priority so insert in reverse
853+ for ( var j = self . rowHeaderColumns . length - 1 ; j >= 0 ; j -- ) {
854+ self . columns . unshift ( self . rowHeaderColumns [ j ] ) ;
855+ }
856+
842857
843858
844859 // look at each column def, and update column properties to match. If the column def
@@ -898,6 +913,19 @@ angular.module('ui.grid')
898913 } ) ;
899914 } ;
900915
916+ Grid . prototype . preCompileCellTemplate = function ( col ) {
917+ var self = this ;
918+ var html = col . cellTemplate . replace ( uiGridConstants . MODEL_COL_FIELD , self . getQualifiedColField ( col ) ) ;
919+ html = html . replace ( uiGridConstants . COL_FIELD , 'grid.getCellValue(row, col)' ) ;
920+
921+ var compiledElementFn = $compile ( html ) ;
922+ col . compiledElementFn = compiledElementFn ;
923+
924+ if ( col . compiledElementFnDefer ) {
925+ col . compiledElementFnDefer . resolve ( col . compiledElementFn ) ;
926+ }
927+ } ;
928+
901929/**
902930 * @ngdoc function
903931 * @name preCompileCellTemplates
@@ -906,25 +934,12 @@ angular.module('ui.grid')
906934 */
907935 Grid . prototype . preCompileCellTemplates = function ( ) {
908936 var self = this ;
909-
910- var preCompileTemplate = function ( col ) {
911- var html = col . cellTemplate . replace ( uiGridConstants . MODEL_COL_FIELD , self . getQualifiedColField ( col ) ) ;
912- html = html . replace ( uiGridConstants . COL_FIELD , 'grid.getCellValue(row, col)' ) ;
913-
914- var compiledElementFn = $compile ( html ) ;
915- col . compiledElementFn = compiledElementFn ;
916-
917- if ( col . compiledElementFnDefer ) {
918- col . compiledElementFnDefer . resolve ( col . compiledElementFn ) ;
919- }
920- } ;
921-
922- this . columns . forEach ( function ( col ) {
937+ self . columns . forEach ( function ( col ) {
923938 if ( col . cellTemplate ) {
924- preCompileTemplate ( col ) ;
939+ self . preCompileCellTemplate ( col ) ;
925940 } else if ( col . cellTemplatePromise ) {
926941 col . cellTemplatePromise . then ( function ( ) {
927- preCompileTemplate ( col ) ;
942+ self . preCompileCellTemplate ( col ) ;
928943 } ) ;
929944 }
930945 } ) ;
@@ -2363,18 +2378,13 @@ angular.module('ui.grid')
23632378
23642379 // We were given a column to scroll to
23652380 if ( gridCol !== null ) {
2366- // This is the index of the row we want to scroll to, within the list of rows that can be visible
2381+ // This is the index of the column we want to scroll to, within the list of columns that can be visible
23672382 var seekColumnIndex = visColCache . indexOf ( gridCol ) ;
23682383
2369- // Total vertical scroll length of the grid
2384+ // Total horizontal scroll length of the grid
23702385 var horizScrollLength = ( self . renderContainers . body . getCanvasWidth ( ) - self . renderContainers . body . getViewportWidth ( ) ) ;
23712386
2372- // Add the height of the native horizontal scrollbar to the scroll length, if it's there. Otherwise it will mask over the final row
2373- // if (self.verticalScrollbarWidth && self.verticalScrollbarWidth > 0) {
2374- // horizScrollLength = horizScrollLength + self.verticalScrollbarWidth;
2375- // }
2376-
2377- // This is the minimum amount of pixels we need to scroll vertical in order to see this column
2387+ // This is the minimum amount of pixels we need to scroll horizontal in order to see this column
23782388 var columnLeftEdge = 0 ;
23792389 for ( var i = 0 ; i < seekColumnIndex ; i ++ ) {
23802390 var col = visColCache [ i ] ;
@@ -2389,9 +2399,9 @@ angular.module('ui.grid')
23892399
23902400 var horizScrollPixels , horizPercentage ;
23912401
2392- // If the scroll position we need to see the row is LESS than the top boundary, i.e. obscured above the top of the self...
2402+ // If the scroll position we need to see the column is LESS than the left boundary, i.e. obscured before the left of the self...
23932403 if ( columnLeftEdge < leftBound ) {
2394- // Get the different between the top boundary and the required scroll position and subtract it from the current scroll position\
2404+ // Get the different between the left boundary and the required scroll position and subtract it from the current scroll position\
23952405 // to get the full position we need
23962406 horizScrollPixels = self . renderContainers . body . prevScrollLeft - ( leftBound - columnLeftEdge ) ;
23972407
@@ -2400,9 +2410,9 @@ angular.module('ui.grid')
24002410 horizPercentage = ( horizPercentage > 1 ) ? 1 : horizPercentage ;
24012411 scrollEvent . x = { percentage : horizPercentage } ;
24022412 }
2403- // Otherwise if the scroll position we need to see the row is MORE than the bottom boundary, i.e. obscured below the bottom of the self...
2413+ // Otherwise if the scroll position we need to see the column is MORE than the right boundary, i.e. obscured after the right of the self...
24042414 else if ( columnRightEdge > rightBound ) {
2405- // Get the different between the bottom boundary and the required scroll position and add it to the current scroll position
2415+ // Get the different between the right boundary and the required scroll position and add it to the current scroll position
24062416 // to get the full position we need
24072417 horizScrollPixels = columnRightEdge - rightBound + self . renderContainers . body . prevScrollLeft ;
24082418
0 commit comments