Skip to content

Commit f44bfd6

Browse files
kushthedudemariobehling
authored andcommitted
feat: URL Trimming for Twitter URL (#3109)
* URL Trimming for Twitter URL * Removal of extra line * Remove of one if blocl
1 parent 2639f35 commit f44bfd6

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

app/components/forms/session-speaker-form.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,11 @@ export default Component.extend(FormMixin, {
424424
type : 'regExp',
425425
value : validTwitterProfileUrlPattern,
426426
prompt : this.l10n.t('Please enter a valid twitter profile url')
427+
},
428+
{
429+
type : 'regExp',
430+
value : protocolLessValidUrlPattern,
431+
prompt : this.l10n.t('Please enter a valid url')
427432
}
428433
]
429434
},

app/models/speaker.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ export default ModelBase.extend({
3333
gender : attr('string'),
3434
heardFrom : attr('string'),
3535

36-
segmentedLinkWebsite: computedSegmentedLink.bind(this)('website'),
36+
segmentedLinkWebsite : computedSegmentedLink.bind(this)('website'),
37+
segmentedLinkTwitter : computedSegmentedLink.bind(this)('twitter'),
3738

3839
/**
3940
* Relationships

app/templates/components/forms/session-speaker-form.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@
177177
{{widgets/forms/rich-text-editor value=(mut (get data.speaker field.fieldIdentifier))
178178
textareaId=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))}}
179179
{{else}}
180-
{{#if (eq field.name 'Website')}}
180+
{{#if (or (eq field.name 'Website') (eq field.name 'Twitter'))}}
181181
{{widgets/forms/link-input
182182
fixedName=true
183183
inputId=(if field.isRequired (concat 'speaker_' field.fieldIdentifier '_required') (concat 'speaker_' field.fieldIdentifier))
184-
segmentedLink=data.speaker.segmentedLinkWebsite
184+
segmentedLink=(if (eq field.name 'Website') data.speaker.segmentedLinkWebsite data.speaker.segmentedLinkTwitter)
185185
canRemoveItem=false
186186
}}
187187
{{else}}

0 commit comments

Comments
 (0)