Skip to content
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.

Sign up for GitHub

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

Fix self-closing tags for jquery 3.5 compat #7553

Merged
merged 1 commit into from
Jul 6, 2020
Merged

Fix self-closing tags for jquery 3.5 compat #7553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions awx/ui/client/features/credentials/add-edit-credentials.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
on-item-select="vm.onInputSourceItemSelect"
on-test="vm.onInputSourceTest"
results-filter="vm.filterInputSourceCredentialResults"
/>
></at-input-source-lookup>
<at-external-credential-test
ng-if="vm.externalTest.metadataInputs"
on-close="vm.onExternalTestClose"
on-submit="vm.onExternalTest"
form="vm.externalTest.form"
/>
></at-external-credential-test>
<div ng-if="$state.current.name.includes('permissions.add')" ui-view="modal"></div>
5 changes: 3 additions & 2 deletions awx/ui/client/features/credentials/input-source-lookup.partial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
ng-show="vm.selectedName"
tag="vm.selectedName"
icon="external"
/>
></at-tag>
</div>
<div
class="InputSourceLookup-selectedItemText"
Expand All @@ -45,7 +45,8 @@
selected-id="vm.selectedId"
on-ready="vm.onReady"
on-item-select="vm.onItemSelect"
/>
>
</at-lookup-list>
<at-form state="vm.form" autocomplete="off" id="input_source_form">
<at-input-group
ng-if="vm.tabs.metadata._active"
Expand Down
5 changes: 3 additions & 2 deletions awx/ui/client/lib/components/input/text.partial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
icon="external"
tag="state._tagValue"
remove-tag="state._onRemoveTag(state)"
/>
>
</at-tag>
<at-tag
ng-show="state._disabled && state._tagValue"
icon="external"
tag="state._tagValue"
/>
></at-tag>
</div>
</span>
<input ng-if="!state.asTag" type="text" class="form-control at-Input"
Expand Down
8 changes: 4 additions & 4 deletions awx/ui/client/lib/components/input/textarea-secret.partial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
ng-class="{'at-InputFile--drag': drag }"
type="file"
name="files"
/>
></input>
<div
ng-if="state.asTag"
ng-disabled="state._disabled || form.disabled"
Expand All @@ -31,12 +31,12 @@
icon="external"
tag="state._tagValue"
remove-tag="state._onRemoveTag(state)"
/>
></at-tag>
<at-tag
ng-show="state._disabled && state._tagValue"
icon="external"
tag="state._tagValue"
/>
></at-tag>
</div>
</div>
<textarea
Expand All @@ -49,7 +49,7 @@
ng-attr-tabindex="{{ tab || undefined }}"
ng-attr-placeholder="{{state._placeholder || undefined }}"
ng-disabled="state._disabled || form.disabled"
/>
></textarea>
<div ng-if="state._edit" class="input-group-btn at-InputGroup-button input-group-append">
<button
aria-label="{{:: vm.strings.get('secret.REPLACE')}}"
Expand Down
2 changes: 1 addition & 1 deletion awx/ui/client/src/scheduler/schedulerDatePicker.partial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
type="text"
readonly
ng-model="dateValue"
ng-class="inputClass()">
ng-class="inputClass()"/>
</div>
32 changes: 16 additions & 16 deletions awx/ui/client/src/scheduler/schedulerForm.partial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
id="schedulerName"
ng-model="schedulerName" required
ng-disabled="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd) || credentialRequiresPassword"
placeholder="{{strings.get('form.SCHEDULE_NAME')}}">
placeholder="{{strings.get('form.SCHEDULE_NAME')}}" />
<div class="error"
ng-show="scheduler_form.$dirty && scheduler_form.schedulerName.$error.required">
{{ strings.get('form.NAME_REQUIRED_MESSAGE') }}
Expand Down Expand Up @@ -74,7 +74,7 @@
placeholder="{{strings.get('form.HH24')}}"
aw-min="0" min="0" aw-max="23"
max="23" data-zero-pad="2" required
ng-change="timeChange()" >
ng-change="timeChange()" />
<span
class="SchedulerTime-separator">
:
Expand All @@ -90,7 +90,7 @@
placeholder="{{strings.get('form.MM')}}"
min="0" max="59" data-zero-pad="2"
required
ng-change="timeChange()" >
ng-change="timeChange()" />
<span
class="SchedulerTime-separator">
:
Expand All @@ -106,7 +106,7 @@
placeholder="{{strings.get('form.SS')}}"
min="0" max="59" data-zero-pad="2"
required
ng-change="timeChange()" >
ng-change="timeChange()" />
</div>
<div class="error"
ng-show="scheduler_startTime_error">
Expand Down Expand Up @@ -173,7 +173,7 @@
min="1"
max="999"
ng-change="resetError('scheduler_interval_error')"
>
/>
<label class="inline-label
RepeatFrequencyOptions-inlineLabel"
ng-bind="schedulerIntervalLabel">
Expand All @@ -196,7 +196,7 @@
ng-model="$parent.monthlyRepeatOption"
ng-change="monthlyRepeatChange()"
name="monthlyRepeatOption"
id="monthlyRepeatOption">
id="monthlyRepeatOption" />
{{ strings.get('form.ON_DAY') }}
</label>
</div>
Expand All @@ -209,7 +209,7 @@
aw-spinner="$parent.monthDay"
ng-model="$parent.monthDay"
min="1" max="31"
ng-change="resetError('scheduler_monthDay_error')" >
ng-change="resetError('scheduler_monthDay_error')" />
<div class="error"
ng-show="$parent.scheduler_monthDay_error">
{{ strings.get('form.MONTH_DAY_ERROR_MESSAGE') }}
Expand All @@ -228,7 +228,7 @@
ng-model="$parent.monthlyRepeatOption"
ng-change="monthlyRepeatChange()"
name="monthlyRepeatOption"
id="monthlyRepeatOption">
id="monthlyRepeatOption" />
{{ strings.get('form.ON_THE') }}
</label>
</div>
Expand Down Expand Up @@ -267,7 +267,7 @@
ng-model="$parent.yearlyRepeatOption"
ng-change="yearlyRepeatChange()"
name="yearlyRepeatOption"
id="yearlyRepeatOption">
id="yearlyRepeatOption" />
{{ strings.get('form.ON') }}
</label>
</div>
Expand All @@ -292,7 +292,7 @@
ng-model="$parent.yearlyMonthDay"
min="1" max="31"
ng-change="resetError('scheduler_yearlyMonthDay_error')"
>
/>
</div>
<div class="error"
ng-show="$parent.scheduler_yearlyMonthDay_error">
Expand All @@ -312,7 +312,7 @@
ng-model="$parent.yearlyRepeatOption"
ng-change="yearlyRepeatChange()"
name="yearlyRepeatOption"
id="yearlyRepeatOption">
id="yearlyRepeatOption" />
{{ strings.get('form.ON_THE') }}
</label>
</div>
Expand Down Expand Up @@ -524,7 +524,7 @@
placeholder="{{strings.get('form.HH24')}}"
aw-min="0" min="0" aw-max="23"
max="23" data-zero-pad="2" required
ng-change="schedulerEndChange('schedulerEndHour', $parent.schedulerEndHour)" >
ng-change="schedulerEndChange('schedulerEndHour', $parent.schedulerEndHour)" />
<span
class="SchedulerTime-separator">
:
Expand All @@ -540,7 +540,7 @@
placeholder="{{strings.get('form.MM')}}"
min="0" max="59" data-zero-pad="2"
required
ng-change="schedulerEndChange('schedulerEndMinute', $parent.schedulerEndMinute)" >
ng-change="schedulerEndChange('schedulerEndMinute', $parent.schedulerEndMinute)" />
<span
class="SchedulerTime-separator">
:
Expand All @@ -556,7 +556,7 @@
placeholder="{{strings.get('form.SS')}}"
min="0" max="59" data-zero-pad="2"
required
ng-change="schedulerEndChange('schedulerEndSecond', $parent.schedulerEndSecond)" >
ng-change="schedulerEndChange('schedulerEndSecond', $parent.schedulerEndSecond)" />
</div>
<div class="error"
ng-show="scheduler_startTime_error">
Expand Down Expand Up @@ -604,7 +604,7 @@
class="SchedulerFormDetail-radioButton"
ng-model="dateChoice"
id="date-choice-local"
value="local" >
value="local" />
{{ strings.get('form.LOCAL_TIME_ZONE') }}
</label>
<label class="radio-inline
Expand All @@ -613,7 +613,7 @@
class="SchedulerFormDetail-radioButton"
ng-model="dateChoice"
id="date-choice-utc"
value="utc" >
value="utc" />
UTC
</label>
</div>
Expand Down