Skip to content

chore(package): update ember-concurrency to version 0.8.1 #1210

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

Merged
merged 1 commit into from
Mar 30, 2017
Merged

chore(package): update ember-concurrency to version 0.8.1 #1210

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
32 changes: 17 additions & 15 deletions app/components/signup-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ const {
Component,
computed,
computed: { alias, and, gte },
run: { later }
get,
run: { later },
set
} = Ember;

export default Component.extend({
Expand All @@ -19,50 +21,50 @@ export default Component.extend({
passwordValid: gte('passwordLength', 6),

password: computed('user.password', function() {
return this.get('user.password') || '';
return get(this, 'user.password') || '';
}),

actions: {
emailValidated(result) {
this.set('emailValid', result);
set(this, 'emailValid', result);
},

signUp() {
if (this.get('canSubmit')) {
this.get('_submit').perform();
if (get(this, 'canSubmit')) {
get(this, '_submit').perform();
} else {
this._shakeButton();
}
},

usernameValidated(result) {
this.set('usernameValid', result);
set(this, 'usernameValid', result);
}
},

_setError() {
this.set('hasError', true);
set(this, 'hasError', true);
},

_shakeButton() {
if (!this.get('hasError')) {
this.set('hasError', true);
if (!get(this, 'hasError')) {
set(this, 'hasError', true);
later(this, function() {
this.set('hasError', false);
set(this, 'hasError', false);
}, 1000);
}
},

_submit: task(function* () {
let credentials = {
identification: this.get('user.email'),
password: this.get('user.password')
identification: get(this, 'user.email'),
password: get(this, 'user.password')
};

let promise = this.get('user').save().then(() => {
this.get('signIn')(credentials);
let promise = get(this, 'user').save().then(() => {
get(this, 'signIn')(credentials);
}).catch((error) => {
this.get('handleErrors')(error);
get(this, 'handleErrors')(error);
});

yield promise;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"ember-cli-uglify": "^1.2.0",
"ember-click-outside": "0.1.6",
"ember-composable-helpers": "2.0.0",
"ember-concurrency": "^0.7.11",
"ember-concurrency": "^0.8.1",
"ember-data": "^2.12.0",
"ember-deferred-content": "0.2.0",
"ember-disable-proxy-controllers": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/components/user-menu-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ test('clicking the menu toggles the dropdown', function(assert) {
assert.ok(page.dropdownIsHidden, 'The dropdown is initially hidden');
page.toggle();
assert.notOk(page.dropdownIsHidden, 'The dropdown is now visible');
this.$('.user-menu .dropdown-menu').click();
page.clickDropdownMenu();
assert.ok(page.dropdownIsHidden, 'The dropdown is now hidden');
});
2 changes: 2 additions & 0 deletions tests/pages/components/user-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { attribute, clickable, hasClass, isVisible, text } from 'ember-cli-page-
export default {
scope: '.user-menu',

clickDropdownMenu: clickable('.dropdown-menu'),

dropdownIsHidden: hasClass('menu-hidden'),

icon: {
Expand Down
14 changes: 11 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2313,7 +2313,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-c
ember-cli-version-checker "^1.0.2"
resolve "^1.1.2"

ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9:
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.5, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9:
version "6.0.0-beta.9"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.0.0-beta.9.tgz#b597d52f12d4429cd5716b55f749ebf6144b7b16"
dependencies:
Expand Down Expand Up @@ -2945,14 +2945,22 @@ ember-composable-helpers@2.0.0:
broccoli-funnel "^1.0.1"
ember-cli-babel "^5.1.7"

ember-concurrency@^0.7.11, ember-concurrency@^0.7.15:
ember-concurrency@^0.7.15:
version "0.7.19"
resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.19.tgz#095f2ede1b56ab068958cac5b55e77b9de67e1c6"
dependencies:
ember-cli-babel "^5.1.5"
ember-getowner-polyfill "^1.1.0"
ember-maybe-import-regenerator "^0.1.4"

ember-concurrency@^0.8.1:
version "0.8.1"
resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.1.tgz#28f4e05d1afe15f9d8611f37a87a59ce8c21a331"
dependencies:
ember-cli-babel "^6.0.0-beta.5"
ember-getowner-polyfill "^1.1.0"
ember-maybe-import-regenerator "^0.1.5"

ember-cookies@^0.0.12:
version "0.0.12"
resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-0.0.12.tgz#aba3a4a2c36f856e0bba35a4ecf6a58f8950eb9c"
Expand Down Expand Up @@ -3104,7 +3112,7 @@ ember-macro-helpers@^0.4.0:
dependencies:
ember-cli-babel "^5.1.7"

ember-maybe-import-regenerator@^0.1.4:
ember-maybe-import-regenerator@^0.1.4, ember-maybe-import-regenerator@^0.1.5:
version "0.1.6"
resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
dependencies:
Expand Down