-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[BUGFIX release-1-13] Allow current-when to be specified via a variable #12344
Conversation
Awesome. I suspect each of the other attr gets in that function should also use getValue |
But the class ones need to be fixed in master also: https://github.com/emberjs/ember.js/blob/master/packages/ember-routing-views/lib/components/link-to.js#L748-L762 |
@stefanpenner @rwjblue I'm happy to update this PR to fix the others in that file if you'd like. Something like this:
becomes
? Unsure how/if to test these other cases. |
Thanks for tackling! The fix for For
Roughly the same test will work, basically use a bound param for |
@rwjblue have a look when you get a chance and see if I was able to follow your direction correctly |
} | ||
|
||
var currentWhen = attrs['current-when']; | ||
var currentWhen = getValue(attrs['current-when']); | ||
|
||
if (attrs.currentWhen) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
416 and 418 feel somewhat misaligned. we should use currentWhen in both cases, or refactor to improve clarity of intent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought the same thing but didn't act because of the deprecation and this being 1.13 and all
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, agreed. Lets do go forward refactorings on master (so they get more battle tested through our canary -> beta -> stable process).
@stefanpenner I think that block could just be removed like with |
Yep, looks like what I had in mind. I think this is good once you remove the section @stefanpenner just mentioned. |
* Fixes a bug with allowing current-when to be specified via a bound param * Removes unneccessary massaging of activeClass/disableClass/loadingClass attrs * Use getValue to lookup disabledWhen * Add tests
Removed that block and squashed all the commits |
👍 - Looks good to me! @Dhaulagiri - Would you mind making a PR to master adding these tests and removing the extra unneeded blocks (labeled |
Sure thing, I'll do that this afternoon. |
[BUGFIX release-1-13] Allow current-when to be specified via a variable
Awesome, thank you! |
👍 |
Thanks @rwjblue @stefanpenner for the assistance! |
@rwjblue do you know when you might cut a new release of 1.13 with this in it? |
Actually, I just saw in a linked issue how I can point to the release-1-13 branch, so this is not particularly urgent for us. |
As the docs say, `A link will be active if current-when is true`. Looks like this might have been broken since 1.13 and emberjs#12344 did not seem to actually fix this particular bug. Related issues: - emberjs#12512 - emberjs#12630 (fix was not merged) - emberjs#12296
As the docs say, `A link will be active if current-when is true`. Looks like this might have been broken since 1.13 and emberjs#12344 did not seem to actually fix this particular bug. Related issues: - emberjs#12512 - emberjs#12630 (fix was not merged) - emberjs#12296
# This is the 1st commit message: typo in comment # The commit message #2 will be skipped: # indent yuidoc comment # The commit message #3 will be skipped: # remove IE8 test # The commit message #4 will be skipped: # remove commented out test # The commit message #5 will be skipped: # use file path and add imports # # Used RFC #176 modules API for imports. # Also cleaned up some of the globals-mode usage. # The commit message #6 will be skipped: # clean up more globals style documentation # The commit message #7 will be skipped: # Updates blueprints # The commit message #8 will be skipped: # remove extra type check # The commit message #9 will be skipped: # [BUGFIX beta] Reusing element causes problems in Safari # # When testing allowed input types, in some versions of Safari the type # cannot be change to `file` if previously set to a different one. # # Fixes #14727 # The commit message #10 will be skipped: # [DOC release]missed code block added # The commit message #1 will be skipped: # [DOC release] Update wait.js - Add missing backticks to code snippet. # The commit message #2 will be skipped: # use safe `toString` for array content in `mixins/array` # The commit message #3 will be skipped: # avoid expanding already expanded property key in computed.sort # The commit message #4 will be skipped: # avoid expanding already expanded property key in reduceMacro/arrayMacro/multiArrayMacro # The commit message #5 will be skipped: # [DOC release] Make `Ember.expandProperties` public # The commit message #6 will be skipped: # reuse meta `arrayContentDidChange` # The commit message #7 will be skipped: # replace `throw` with assertion in `enumerable` # The commit message #8 will be skipped: # [BUGFIX beta] Allow boolean values for current-when # # As the docs say, `A link will be active if current-when is true`. # Looks like this might have been broken since 1.13 and #12344 # did not seem to actually fix this particular bug. # # Related issues: # # - #12512 # - #12630 (fix was not merged) # - #12296 # The commit message #9 will be skipped: # remove unused imports # The commit message #10 will be skipped: # [DOC] Improve Ember.isEmpty # The commit message #1 will be skipped: # micro optimization in `enumerable`
Per guidance from @stefanpenner this fixes the issue where we are not able to set
current-when
to a variable property in 1.13.Fixes #12296