IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Improve the readability of code (#7076)

Browse Source
This commit is contained in:
Vinoth Kannan
2019-02-26 23:03:49 +05:30
committed by GitHub
parent fbedaea5ed
commit 59c66fd226
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/controllers/preferences/account.js.es6
View File

@@ -106,9 +106,15 @@ export default Ember.Controller.extend(
@computed("showAllAuthTokens", "model.user_auth_tokens") @computed("showAllAuthTokens", "model.user_auth_tokens")
authTokens(showAllAuthTokens, tokens) { authTokens(showAllAuthTokens, tokens) {
tokens.sort((a, b) => tokens.sort((a, b) => {
a.is_active ? -1 : b.is_active ? 1 : b.seen_at.localeCompare(a.seen_at) if (a.is_active) {
); return -1;
} else if (b.is_active) {
return 1;
} else {
return b.seen_at.localeCompare(a.seen_at);
}
});
return showAllAuthTokens return showAllAuthTokens
? tokens ? tokens

8
test/javascripts/acceptance/preferences-test.js.es6
View File

@@ -299,6 +299,14 @@ QUnit.test("visit my preferences", async assert => {
QUnit.test("recently connected devices", async assert => { QUnit.test("recently connected devices", async assert => {
await visit("/u/eviltrout/preferences"); await visit("/u/eviltrout/preferences");
assert.equal(
find(".auth-tokens > .auth-token:first .auth-token-device")
.text()
.trim(),
"Linux Computer",
"it should display active token first"
);
assert.equal( assert.equal(
find(".pref-auth-tokens > a:first") find(".pref-auth-tokens > a:first")
.text() .text()