SAN-6097#2196
Merged
damienrunnable merged 4 commits intomasterfrom Apr 27, 2017
Merged
Conversation
* master: add condition for back button add back button + typo alphabetical order use class for green check prevent save password prompt update copy add invalid state add authorized state add validation to form add form elements for private registry update input placeholder color, set input color add feature flag for private registry add template for private registry add tab for private registry
Myztiq
reviewed
Apr 26, 2017
| data-event-name = "Selected Compose Setup" | ||
| ng-class = "{'active': NCC.state.dockerFileTab === 'compose'}" | ||
| ng-click = "NCC.state.dockerFileTab = 'compose'; NCC.state.configurationMethod = 'dockerComposeFile'" | ||
| ng-click = "NCC.isSaving() || ((NCC.state.dockerFileTab = 'compose') && (NCC.state.configurationMethod = 'dockerComposeFile'))" |
Contributor
There was a problem hiding this comment.
This is enough that I think we should make this a function instead of relying on javascript's ability to short-circuit
Myztiq
approved these changes
Apr 26, 2017
Contributor
Myztiq
left a comment
Myztiq
left a comment
There was a problem hiding this comment.
One nit, but this is fine.
* master: (56 commits) 5.19.17 add events for all settings tabs add events for all settings buttons fix button width in safari fix PR bot button alignment add event for private registry "back" button add events for accounts popover buttons add events for settings modal tabs update adding private registry event add ssh key events add private registry events add documentation link add orgs to key names update authed modal fix creating state fix indentation remove negative margins + fix recently added state remove loading state fix border color on recently added state title case ... # Conflicts: # client/directives/components/mirrorDockerfile/addDockerfileView.jade # client/directives/components/newContainer/forms/configureNewServiceView.jade Also had to manually edit setupMethodView.jade since it was where the conflict for configureNewServiceView.jade had been moved too.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Disable fields when creating.