Merge pull request angular-ui#4717 from IQMS/master

swalters · swalters · commit cecb7eb70973 · 2016-01-19T16:06:17.000-06:00
fix(core): Fix columns reverting back to original size after restoring
diff --git a/src/features/saveState/js/saveState.js b/src/features/saveState/js/saveState.js
@@ -544,8 +544,9 @@
                 grid.api.core.raise.columnVisibilityChanged(currentCol);
               }
 
-              if ( grid.options.saveWidths ){
+              if ( grid.options.saveWidths && currentCol.width !== columnState.width){
                 currentCol.width = columnState.width;
+                currentCol.hasCustomWidth = true;
               }
 
               if ( grid.options.saveSort &&

Original file line number	Diff line number	Diff line change
`@@ -544,8 +544,9 @@`
`544`	`544`	`grid.api.core.raise.columnVisibilityChanged(currentCol);`
`545`	`545`	`}`
`546`	`546`
`547`		`- if ( grid.options.saveWidths ){`
	`547`	`+ if ( grid.options.saveWidths && currentCol.width !== columnState.width){`
`548`	`548`	`currentCol.width = columnState.width;`
	`549`	`+ currentCol.hasCustomWidth = true;`
`549`	`550`	`}`
`550`	`551`
`551`	`552`	`if ( grid.options.saveSort &&`