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

Jump to bottom

Store username change script shouldn't be setting html #2743

Merged
merged 4 commits into from
Mar 20, 2018
Merged

Store username change script shouldn't be setting html #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
684b19c
set text content instead of html.
notbakaneko Mar 20, 2018
ed71646
none of these nedd to be html ಠ_ಠ
notbakaneko Mar 20, 2018
8fcf38d
might as well change to route while we're here
notbakaneko Mar 20, 2018
cf9505d
make localizable
notbakaneko Mar 20, 2018
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
12 changes: 6 additions & 6 deletions resources/assets/coffee/store-username-change.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@

preventUsernameSubmission = ->
StoreCart.setEnabled(false)
$('#username-check-price').html ''
$('#username-check-price').text ''

checkUsernameValidity = ->
$status = $('#username-check-status')
requestedUsername = $('#username.form-control').val()

$.post '/users/check-username-availability', username: requestedUsername
$.post laroute.route('users.check-username-availability'), username: requestedUsername
.done (data) ->
return unless data.username == $('#username.form-control').val()

if data.available
$('.js-store-add-to-cart').attr 'disabled', false
$('#username-check-price').html data.costString
$('#username-check-price').text data.costString
$('#username-form-price').val data.cost
$('#product-form').data('disabled', false)
else
preventUsernameSubmission()

$status.html data.message
$status.text data.message
$status.toggleClass 'green-dark', data.available
$status.toggleClass 'pink-dark', !data.available
.fail (xhr) ->
Expand All @@ -54,9 +54,9 @@ $(document).on 'input', '.js-username-change #username.form-control', ->
preventUsernameSubmission()

if requestedUsername.length == 0
$status.html 'Enter a username to check availability!'
$status.text Lang.get('store.username_change.check')
else
$status.html "Checking availability of #{requestedUsername}..."
$status.text Lang.get('store.username_change.checking', username: requestedUsername)
debouncedCheckUsernameValidity()

$(document).on 'turbolinks:load', ->
Expand Down
2 changes: 2 additions & 0 deletions resources/lang/en/store.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
],

'username_change' => [
'check' => 'Enter a username to check availability!',
'checking' => 'Checking availability of :username...',
'require_login' => [
'_' => 'You need to be :link to change your name!',
'link_text' => 'logged in',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/store/products/username-change.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{!! Form::text('item[extra_info]', '', ['id' => 'username', 'class' => 'form-control', 'placeholder' => 'Requested Username', 'autocomplete' => 'off']) !!}
</div>
<strong>
<div id="username-check-status">Enter a username to check availability!</div>
<div id="username-check-status">@lang('store.username_change.check')</div>
</strong>
<div>Your current username is "<i>{{ Auth::user()->username }}</i>".</div>
</div>
Expand Down