Merge pull request #2571 from PaulL1/2542_401_render

Fix #2542 (renderContainer): mis-render on 401 on initial render
angular-ui · Jan 16, 2015 · fe38be0 · fe38be0
2 parents db48c95 + a684c17
commit fe38be0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/js/core/directives/ui-pinned-container.js b/src/js/core/directives/ui-pinned-container.js
@@ -27,7 +27,7 @@
                 var width = 0;
                 for (var i = 0; i < cols.length; i++) {
                   var col = cols[i];
-                  width += col.drawnWidth;
+                  width += col.drawnWidth || col.width || 0;
                 }
 
                 myWidth = width;
@@ -57,7 +57,7 @@
             }
 
             grid.renderContainers.body.registerViewportAdjuster(function (adjustment) {
-              if ( myWidth === 0 ){
+              if ( myWidth === 0 || !myWidth ){
                 updateContainerWidth();
               }
               // Subtract our own width