-
Notifications
You must be signed in to change notification settings - Fork 231
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
Let users paste certificate values #1068
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,40 @@ | ||
| <div ng-attr-id="{{dropMessageID}}" class="drag-and-drop-zone"> | ||
| <p>Drop file here</p> | ||
| </div> | ||
| <div class="input-group"> | ||
| <input | ||
| type="text" | ||
| class="form-control" | ||
| ng-model="fileName" | ||
| readonly | ||
| ng-show="supportsFileUpload" | ||
| <div class="osc-file-input"> | ||
| <div ng-attr-id="{{dropMessageID}}" class="drag-and-drop-zone"> | ||
| <p>Drop file here</p> | ||
| </div> | ||
| <div class="input-group"> | ||
| <input | ||
| type="text" | ||
| class="form-control" | ||
| ng-model="fileName" | ||
| readonly | ||
| ng-show="supportsFileUpload" | ||
| ng-disabled="disabled" | ||
| ng-attr-aria-describedby="{{helpText ? helpID : undefined}}"> | ||
| <span class="input-group-btn"> | ||
| <span class="btn btn-default btn-file" ng-show="supportsFileUpload" ng-attr-disabled="{{ disabled || undefined }}"> | ||
| Browse… | ||
| <input type="file" ng-disabled="disabled" class="form-control"> | ||
| </span> | ||
| </span> | ||
| </div> | ||
| <div ng-if="helpText"> | ||
| <span ng-attr-id="{{helpID}}" class="help-block">{{::helpText}}</span> | ||
| </div> | ||
| <div class="has-error" ng-show="uploadError"> | ||
| <span class="help-block">There was an error reading the file. Please copy the file content into the text area.</span> | ||
| </div> | ||
| <textarea class="form-control" | ||
| rows="5" | ||
| ng-show="showTextArea || !supportsFileUpload" | ||
| ng-model="model" | ||
| ng-required="required" | ||
| ng-disabled="disabled" | ||
| autocorrect="off" | ||
| autocapitalize="off" | ||
| spellcheck="false" | ||
| ng-attr-aria-describedby="{{helpText ? helpID : undefined}}"> | ||
| <span class="input-group-btn"> | ||
| <span class="btn btn-default btn-file" ng-show="supportsFileUpload" ng-attr-disabled="{{ disabled || undefined }}"> | ||
| Browse… | ||
| <input type="file" ng-disabled="disabled" class="form-control"> | ||
| </span> | ||
| </span> | ||
| </div> | ||
| <textarea class="form-control" | ||
| rows="8" | ||
| ng-hide="supportsFileUpload" | ||
| ng-model="model" | ||
| ng-required="required" | ||
| ng-disabled="disabled" | ||
| ng-attr-aria-describedby="{{helpText ? helpID : undefined}}"> | ||
| </textarea> | ||
| <div ng-if="helpText"> | ||
| <span ng-attr-id="{{helpID}}" class="help-block">{{::helpText}}</span> | ||
| </div> | ||
| <div class="has-error" ng-show="uploadError"> | ||
| <span class="help-block">There was an error reading the file. Please copy the file content into the text area.</span> | ||
| </div> | ||
| </textarea> | ||
|
|
||
| <div ng-if="model && showValues && supportsFileUpload"> | ||
| <pre ng-if="model && showValues && supportsFileUpload" class="clipped scroll">{{model}}</pre> | ||
| <a href="" ng-show="(model || fileName) && !disabled" ng-click="cleanInputValues()">Clear Value</a> | ||
| </div> | ||
| <a href="" ng-show="model || fileName" class="clear-btn" ng-click="cleanInputValues()">Clear Value</a> |
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
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
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
Oops, something went wrong.
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.
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.
nit: we could do
inputFileField = element.find('input[type=file]')[0];orinputFileField = _.first(element.find())here & not have to repeat the[0]a few places below.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.
Unfortunately I can't because I need the jQuery object in one place :/
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.
Ah, true, because of the
.changeon 73, no worries!