@@ -249,7 +249,6 @@ function MdTabsController ($scope, $element, $window, $mdConstant, $mdTabInkRipp
249
249
handleResizeWhenVisible . watcher ( ) ;
250
250
handleResizeWhenVisible . watcher = null ;
251
251
252
- // we have to trigger our own $apply so that the DOM bindings will update
253
252
handleWindowResize ( ) ;
254
253
}
255
254
} , false ) ;
@@ -335,11 +334,11 @@ function MdTabsController ($scope, $element, $window, $mdConstant, $mdTabInkRipp
335
334
* Update size calculations when the window is resized.
336
335
*/
337
336
function handleWindowResize ( ) {
338
- $scope . $apply ( function ( ) {
339
- ctrl . lastSelectedIndex = ctrl . selectedIndex ;
340
- ctrl . offsetLeft = fixOffset ( ctrl . offsetLeft ) ;
341
- $mdUtil . nextTick ( ctrl . updateInkBarStyles , false ) ;
342
- $mdUtil . nextTick ( updatePagination ) ;
337
+ ctrl . lastSelectedIndex = ctrl . selectedIndex ;
338
+ ctrl . offsetLeft = fixOffset ( ctrl . offsetLeft ) ;
339
+ $mdUtil . nextTick ( function ( ) {
340
+ ctrl . updateInkBarStyles ( ) ;
341
+ updatePagination ( ) ;
343
342
} ) ;
344
343
}
345
344
@@ -487,7 +486,7 @@ function MdTabsController ($scope, $element, $window, $mdConstant, $mdTabInkRipp
487
486
*/
488
487
function shouldPaginate ( ) {
489
488
if ( ctrl . noPagination || ! loaded ) return false ;
490
- var canvasWidth = Math . min ( $element . prop ( 'clientWidth' ) , ctrl . maxTabWidth ) ;
489
+ var canvasWidth = $element . prop ( 'clientWidth' ) ;
491
490
angular . forEach ( elements . dummies , function ( tab ) { canvasWidth -= tab . offsetWidth ; } ) ;
492
491
return canvasWidth < 0 ;
493
492
}
@@ -590,7 +589,7 @@ function MdTabsController ($scope, $element, $window, $mdConstant, $mdTabInkRipp
590
589
var tab = elements . tabs [ index ] ,
591
590
left = tab . offsetLeft ,
592
591
right = tab . offsetWidth + left ;
593
- ctrl . offsetLeft = Math . max ( ctrl . offsetLeft , fixOffset ( right - elements . canvas . clientWidth ) ) ;
592
+ ctrl . offsetLeft = Math . max ( ctrl . offsetLeft , fixOffset ( right - elements . canvas . clientWidth + 32 * 2 ) ) ;
594
593
ctrl . offsetLeft = Math . min ( ctrl . offsetLeft , fixOffset ( left ) ) ;
595
594
}
596
595
0 commit comments