This repository has been archived by the owner on Sep 5, 2024. It is now read-only.
fix(mdToolbar): Allow md-scroll-shrink usage with ng-if. #4394
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@ThomasBurleson When you review this PR, could you please check to ensure this doesn't constitute a breaking change? Particularly, I've added an isolate scope, but it should be okay since I added the transclusion. I just wanted a second pair of eyes. |
| @@ -113,7 +157,7 @@ function mdToolbarDirective($$rAF, $mdConstant, $mdUtil, $mdTheming, $animate ) | |||
| // | |||
| // As the user scrolls down, the content will be transformed up slowly | |||
| // to put the content underneath where the toolbar was. | |||
| var margin = (-toolbarHeight * shrinkSpeedFactor) + 'px'; | |||
| var margin = (-toolbarHeight * shrinkSpeedFactor) + 'px'; | |||
| contentElement.css('margin-top', margin); | |||
| contentElement.css('margin-bottom', margin); | |||
There was a problem hiding this comment.
I think this is better:
contentElement.css({
'margin-top' : margin,
'margin-bottom' : margin
});
ThomasBurleson
added
needs: work
and removed
needs: review
|
|
||
| $$rAF(updateToolbarHeight); | ||
| } | ||
|
|
||
| function onMdContentLoad($event, newContentEl) { | ||
| // Toolbar and content must be siblings | ||
| if (element.parent()[0] === newContentEl.parent()[0]) { |
There was a problem hiding this comment.
FYI - scope.$on(...) will call onMdContentLoad( ) without the 2nd argument.
There was a problem hiding this comment.
In what case will it do so? All of my testing showed that it always passed the newContentEl.
Previously, the toolbar would fail to enable scroll shrinking if the developer used an `ng-if` statement on the `md-toolbar`. This commit allows usage of `ng-if` as well as watching the `md-scroll-shrink` for changes so they can enable/disable scroll shrinking. Fixes #2751.
topherfangio
force-pushed
the
fix-toolbar-scroll-shrink-if-2751
branch
from
9e5432e
to
2ec70ea
Compare
kennethcachia
pushed a commit
to kennethcachia/material
that referenced
this pull request
Sep 23, 2015
Previously, the toolbar would fail to enable scroll shrinking if the developer used an `ng-if` statement on the `md-toolbar`. This commit allows usage of `ng-if` as well as watching the `md-scroll-shrink` for changes so they can enable/disable scroll shrinking. Fixes angular#2751. Closes angular#4394.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the toolbar would fail to enable scroll shrinking
if the developer used an
ng-ifstatement on themd-toolbar.This commit allows usage of
ng-ifas well as watching themd-scroll-shrinkfor changes so they can enable/disablescroll shrinking.
Fixes #2751.