pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some leftover 'watch' attributes from Vue components

Browse Source
This commit is contained in:
leigh-mil 2019-11-22 09:22:47 -05:00
parent c2975fff69
commit 62cdcbe6dc
7 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/options_input.js
View File

@ -10,10 +10,6 @@ export default {
default: () => [],
},
initialValue: String,
watch: {
type: Boolean,
default: false,
},
optional: Boolean,
nullOption: {
type: String,

4
js/mixins/text_input_mixin.js
View File

@ -27,10 +27,6 @@ export default {
paragraph: String,
noMaxWidth: String,
optional: Boolean,
watch: {
type: Boolean,
default: false,
},
},
data: function() {

3
templates/applications/fragments/member_form_fields.html
View File

@ -66,8 +66,7 @@
<optionsinput inline-template
v-bind:initial-value="'{{ sub_form.role.data | string }}'"
v-bind:name="'{{ sub_form.name | string }}{% if member_role_id %}-{{ member_role_id }}{% endif %}'"
v-bind:optional="true"
v-bind:watch="true">
v-bind:optional="true">
<fieldset data-ally-disabled="true" v-on:change="onInput" class="usa-input__choices">
{{ sub_form.role(**{"v-model": "value", "id": "{}-{}".format(sub_form.role.name, member_role_id)}) }}
</fieldset>

11
templates/components/clin_dollar_amount.html
View File

@ -1,6 +1,6 @@
{% from 'components/icon.html' import Icon %}
{% macro CLINDollarAmount(type, field=None, funding_validation=False) -%}
{% macro CLINDollarAmount(type, field=None, funding_validation=False) -%}
<div class="form-row">
<div class="form-col">
<clindollaramount
@ -21,16 +21,15 @@
:key="'clins-' + clinIndex + '-' + '{{ type }}' + '_amount'"
{% endif %}
validation="clinDollars"
:watch='true'>
validation="clinDollars">
<div v-bind:class="['usa-input usa-input--validation--dollars', { 'usa-input--error': showFundingError, 'usa-input--success': showFundingValid}]">
{% if field %}
<label for='{{ field.name }}'>
<label for='{{ field.name }}'>
{% else %}
<label :for='name'>
{% endif %}
{% if type=="obligated" %}
{% if type=="obligated" %}
<div class="usa-input__title">{{ 'task_orders.form.obligated_funds_label' | translate }}</div>
{% else %}
<div class="usa-input__title">{{ 'task_orders.form.total_funds_label' | translate }}</div>
@ -67,4 +66,4 @@
</clindollaramount>
</div>
</div>
{%- endmacro %}
{%- endmacro %}

9
templates/components/clin_fields.html
View File

@ -41,10 +41,9 @@
<div class="form-row">
<div class="form-col">
{% if fields %}
{{ TextInput(fields.number, watch=True, optional=False) }}
{{ TextInput(fields.number, optional=False) }}
{% else %}
<textinput :name="'clins-' + clinIndex + '-number'" :watch='true'
inline-template>
<textinput :name="'clins-' + clinIndex + '-number'" inline-template>
<div v-bind:class="['usa-input usa-input--validation--' + validation, { 'usa-input--error': showError, 'usa-input--success': showValid, 'usa-input--validation--paragraph': paragraph, 'no-max-width': noMaxWidth }]">
<label :for="name">
<span v-show='showError'>{{ Icon('alert',classes="icon-validation") }}</span>
@ -82,9 +81,9 @@
<div class="form-row">
<div class="form-col">
{% if fields %}
{{ OptionsInput(fields.jedi_clin_type, watch=True, show_validation=False, optional=False) }}
{{ OptionsInput(fields.jedi_clin_type, show_validation=False, optional=False) }}
{% else %}
<optionsinput :name="'clins-' + clinIndex + '-jedi_clin_type'" :watch='true' :optional='false' inline-template>
<optionsinput :name="'clins-' + clinIndex + '-jedi_clin_type'" :optional='false' inline-template>
<div v-bind:class="['usa-input', { 'usa-input--error': showError, 'usa-input--success': showValid }]">
<fieldset data-ally-disabled="true" class="usa-input__choices" v-on:change="onInput">
<legend>

2
templates/components/options_input.html
View File

@ -8,7 +8,6 @@
label=True,
show_validation=True,
disabled=False,
watch=False,
optional=True) -%}
<optionsinput
name='{{ field.name }}'
@ -16,7 +15,6 @@
{% if field.errors %}v-bind:initial-errors='{{ field.errors | list }}'{% endif %}
{% if field.data and field.data != "None" %}v-bind:initial-value="'{{ field.data }}'"{% endif %}
key='{{ field.name }}'
v-bind:watch='{{ watch | string | lower }}'
v-bind:optional={{ optional|lower }}
v-bind:null-option="'{{ field.default }}'"
>

2
templates/components/text_input.html
View File

@ -17,7 +17,6 @@
optional=True,
showOptional=True,
showLabel=True,
watch=False,
show_validation=True) -%}
<textinput
@ -30,7 +29,6 @@
{% if field.errors %}v-bind:initial-errors='{{ field.errors | list }}'{% endif %}
v-bind:optional={{ optional|lower }}
key='{{ field.name }}'
:watch='{{ watch | string | lower }}'
inline-template>
<div