From 06d10db251c43b70766fba3f70db1f8e1ef7502c Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Thu, 8 Oct 2015 00:09:22 +0900
Subject: [PATCH 01/14] Refactor changeAccount.xul

---
 xpi/chrome/content/changeAccount/changeAccount.xul | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.xul b/xpi/chrome/content/changeAccount/changeAccount.xul
index af22047a..e7aa24a1 100755
--- a/xpi/chrome/content/changeAccount/changeAccount.xul
+++ b/xpi/chrome/content/changeAccount/changeAccount.xul
@@ -2,19 +2,21 @@
 <?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
 <?xml-stylesheet type="text/css" href="changeAccount.css"?>
 <!DOCTYPE dialog SYSTEM "chrome://tombfix/locale/tombfix.dtd">
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<dialog
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&label.action.changeAccount;"
   buttons="accept">
   <hbox flex="1">
-    <radiogroup class="services"></radiogroup>
+    <radiogroup class="services"/>
     <vbox class="right-box" flex="1">
-      <listbox class="accounts" flex="1"></listbox>
-      <button class="login-button"
+      <listbox class="accounts" flex="1"/>
+      <button
+        class="login-button"
         label="Login"
         image="chrome://tombfix/skin/accept.png"
         disabled="true"
         dlgtype="accept"/>
     </vbox>
   </hbox>
-  <script type="application/javascript" src="changeAccount.js"></script>
+  <script type="application/javascript" src="changeAccount.js"/>
 </dialog>

From efca7ab7937fbf32bfc8d85642331a26bc282f4c Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Thu, 8 Oct 2015 00:22:48 +0900
Subject: [PATCH 02/14] Change "label.action.changeAccount" Entity

* tombfix.dtd: Rename "label.action.changeAccount" to "title.changeAccount"
---
 xpi/chrome/content/changeAccount/changeAccount.xul | 2 +-
 xpi/chrome/locale/en-US/tombfix.dtd                | 2 +-
 xpi/chrome/locale/ja-JP/tombfix.dtd                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.xul b/xpi/chrome/content/changeAccount/changeAccount.xul
index e7aa24a1..86824b72 100755
--- a/xpi/chrome/content/changeAccount/changeAccount.xul
+++ b/xpi/chrome/content/changeAccount/changeAccount.xul
@@ -4,7 +4,7 @@
 <!DOCTYPE dialog SYSTEM "chrome://tombfix/locale/tombfix.dtd">
 <dialog
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  title="&label.action.changeAccount;"
+  title="&title.changeAccount;"
   buttons="accept">
   <hbox flex="1">
     <radiogroup class="services"/>
diff --git a/xpi/chrome/locale/en-US/tombfix.dtd b/xpi/chrome/locale/en-US/tombfix.dtd
index 2758019d..159ed1ce 100755
--- a/xpi/chrome/locale/en-US/tombfix.dtd
+++ b/xpi/chrome/locale/en-US/tombfix.dtd
@@ -38,4 +38,4 @@
 <!ENTITY label.browse "Browse...">
 
 <!-- Change Account -->
-<!ENTITY label.action.changeAccount "Change Account">
+<!ENTITY title.changeAccount "Change Account">
diff --git a/xpi/chrome/locale/ja-JP/tombfix.dtd b/xpi/chrome/locale/ja-JP/tombfix.dtd
index d91e79ad..db38086a 100755
--- a/xpi/chrome/locale/ja-JP/tombfix.dtd
+++ b/xpi/chrome/locale/ja-JP/tombfix.dtd
@@ -38,4 +38,4 @@
 <!ENTITY label.browse "参照...">
 
 <!-- Change Account -->
-<!ENTITY label.action.changeAccount "アカウントの切り替え">
+<!ENTITY title.changeAccount "アカウントの切り替え">

From 9636bfddcdc8e826584df77048b983d2c9fd055e Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Thu, 8 Oct 2015 00:33:14 +0900
Subject: [PATCH 03/14] Change Account: Translate "Login" button's label

* tombfix.dtd: Add "label.changeAccount.login"
---
 xpi/chrome/content/changeAccount/changeAccount.xul | 2 +-
 xpi/chrome/locale/en-US/tombfix.dtd                | 1 +
 xpi/chrome/locale/ja-JP/tombfix.dtd                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.xul b/xpi/chrome/content/changeAccount/changeAccount.xul
index 86824b72..451bd1f1 100755
--- a/xpi/chrome/content/changeAccount/changeAccount.xul
+++ b/xpi/chrome/content/changeAccount/changeAccount.xul
@@ -12,7 +12,7 @@
       <listbox class="accounts" flex="1"/>
       <button
         class="login-button"
-        label="Login"
+        label="&label.changeAccount.login;"
         image="chrome://tombfix/skin/accept.png"
         disabled="true"
         dlgtype="accept"/>
diff --git a/xpi/chrome/locale/en-US/tombfix.dtd b/xpi/chrome/locale/en-US/tombfix.dtd
index 159ed1ce..5220be79 100755
--- a/xpi/chrome/locale/en-US/tombfix.dtd
+++ b/xpi/chrome/locale/en-US/tombfix.dtd
@@ -39,3 +39,4 @@
 
 <!-- Change Account -->
 <!ENTITY title.changeAccount "Change Account">
+<!ENTITY label.changeAccount.login "Login">
diff --git a/xpi/chrome/locale/ja-JP/tombfix.dtd b/xpi/chrome/locale/ja-JP/tombfix.dtd
index db38086a..997fa854 100755
--- a/xpi/chrome/locale/ja-JP/tombfix.dtd
+++ b/xpi/chrome/locale/ja-JP/tombfix.dtd
@@ -39,3 +39,4 @@
 
 <!-- Change Account -->
 <!ENTITY title.changeAccount "アカウントの切り替え">
+<!ENTITY label.changeAccount.login "ログイン">

From 15b56a21ef3d4744f7f64f10d704d0eaeff83fed Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Thu, 8 Oct 2015 00:43:55 +0900
Subject: [PATCH 04/14] Move changeAccount.xul's XUL Box Styling to
 changeAccount.css

---
 xpi/chrome/content/changeAccount/changeAccount.css | 6 ++++++
 xpi/chrome/content/changeAccount/changeAccount.xul | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.css b/xpi/chrome/content/changeAccount/changeAccount.css
index 879c1727..48af85c9 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.css
+++ b/xpi/chrome/content/changeAccount/changeAccount.css
@@ -1,3 +1,9 @@
+.main,
+.right-box,
+.accounts {
+  -moz-box-flex: 1;
+}
+
 .services > radio,
 .accounts > listitem,
 .login-button:not([disabled]) {
diff --git a/xpi/chrome/content/changeAccount/changeAccount.xul b/xpi/chrome/content/changeAccount/changeAccount.xul
index 451bd1f1..08f7f630 100755
--- a/xpi/chrome/content/changeAccount/changeAccount.xul
+++ b/xpi/chrome/content/changeAccount/changeAccount.xul
@@ -6,10 +6,10 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&title.changeAccount;"
   buttons="accept">
-  <hbox flex="1">
+  <hbox class="main">
     <radiogroup class="services"/>
-    <vbox class="right-box" flex="1">
-      <listbox class="accounts" flex="1"/>
+    <vbox class="right-box">
+      <listbox class="accounts"/>
       <button
         class="login-button"
         label="&label.changeAccount.login;"

From 56c22e3bcc6c05108fc3308a7f3447745aac12a1 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Fri, 9 Oct 2015 18:06:28 +0900
Subject: [PATCH 05/14] Change Account: Fix dialog's padding

---
 xpi/chrome/content/changeAccount/changeAccount.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.css b/xpi/chrome/content/changeAccount/changeAccount.css
index 48af85c9..8840252d 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.css
+++ b/xpi/chrome/content/changeAccount/changeAccount.css
@@ -1,3 +1,10 @@
+dialog {
+  padding-top: 10px;
+  padding-right: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
+}
+
 .main,
 .right-box,
 .accounts {

From 1bc1ff5934501b1620726b4eea2f4ca7f59133bf Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Sun, 3 Jan 2016 19:40:56 +0900
Subject: [PATCH 06/14] utility.js: Add showMessage()

---
 xpi/chrome/content/library/utility.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xpi/chrome/content/library/utility.js b/xpi/chrome/content/library/utility.js
index 180c3826..2a70959f 100755
--- a/xpi/chrome/content/library/utility.js
+++ b/xpi/chrome/content/library/utility.js
@@ -2590,3 +2590,9 @@ function getFlavoredString(target) {
     flavors : {html}
   }) : '';
 }
+
+function showMessage(val, target) {
+  (target || this).alert((
+    Array.isArray(val) ? getMessage(...val) : getMessage(val)
+  ) || val);
+}

From 265e2965aa7535d2cb06dfdbff5dacdf861bd2f7 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Tue, 5 Jan 2016 18:24:49 +0900
Subject: [PATCH 07/14] expand.js: Add Function.execute()

* manual test: Update expand_test_patch.js
---
 test/manual/expand_test_patch.js     | 18 ++++++++++++++++++
 xpi/chrome/content/library/expand.js | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/test/manual/expand_test_patch.js b/test/manual/expand_test_patch.js
index 15cc939f..d2953cfe 100644
--- a/test/manual/expand_test_patch.js
+++ b/test/manual/expand_test_patch.js
@@ -315,6 +315,24 @@
     assert(JSON.stringify(arr.cutIn(1, ...['b', 'd'])), '["a","b","d","c"]');
   }
 
+  assert(Function.execute(), null);
+  assert(Function.execute(function () {}), void 0);
+  assert(Function.execute(function () { return this; }, Array), Array);
+  assert(Function.execute(a => a, null, 0), 0);
+  assert(Function.execute(function () { return this instanceof Boolean; }, false));
+  assert(Function.execute('toString', false), 'false');
+  assert(Function.execute(function (target) { return this.isArray(target); }, Array, [[]]), true);
+  assert(Function.execute(function (target) { return this.isArray(target); }, Array, []), false);
+  assert(Function.execute(function (num1, num2) { return num1 + num2; }, null, [1, 2]), 3);
+  assert(Function.execute(Object.keys, Object, {hoge : 0})[0], 'hoge');
+  assert(Function.execute('keys', Object, {hoge : 0})[0], 'hoge');
+  assert(Function.execute(void 0, Object, {hoge : 0}), null);
+  assert(Function.execute(void 0, Object), null);
+  assert(Function.execute('hoge', {hoge : arg => arg}, 0), 0);
+  assert(Function.execute('hoge', {}, 0), null);
+  assert(Function.execute('hoge', null, 0), null);
+  assert(Function.execute('hoge'), null);
+
   assert(JSON.parseable(void 0), false);
   assert(JSON.parseable(''), false);
   assert(JSON.parseable(NaN), false);
diff --git a/xpi/chrome/content/library/expand.js b/xpi/chrome/content/library/expand.js
index 51c9027f..8fd3cba3 100755
--- a/xpi/chrome/content/library/expand.js
+++ b/xpi/chrome/content/library/expand.js
@@ -75,6 +75,24 @@
     }
   });
 
+  Object.expand(Function, {
+    execute(target, obj, arr) {
+      let func = target;
+      let funcThis = obj == null ? null : obj;
+      let funcArgs = Array.wrap(arr);
+
+      if (typeof func === 'string' && funcThis !== null) {
+        func = funcThis[func];
+      }
+
+      if (typeof func === 'function') {
+        return func.call(funcThis, ...funcArgs);
+      }
+
+      return null;
+    }
+  });
+
   Object.expand(JSON, {
     parseable(target) {
       try {

From 9fa3ef953de7a5cf1fc17a8808addca1a47b18e5 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Tue, 5 Jan 2016 20:33:42 +0900
Subject: [PATCH 08/14] expand.js: Add Function.prototype.async()

* manual test: Update expand_test_patch.js
---
 test/manual/expand_test_patch.js     | 11 +++++++++++
 xpi/chrome/content/library/expand.js |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/test/manual/expand_test_patch.js b/test/manual/expand_test_patch.js
index d2953cfe..a2db8ef7 100644
--- a/test/manual/expand_test_patch.js
+++ b/test/manual/expand_test_patch.js
@@ -333,6 +333,17 @@
   assert(Function.execute('hoge', null, 0), null);
   assert(Function.execute('hoge'), null);
 
+  assert((function () {}).async(), void 0);
+  assert((function () {}).async(void 0), void 0);
+  assert((function () {}).async(null), void 0);
+  assert((function () {}).async({}), void 0);
+  assert((function () {}).async(null, 'hoge'), void 0);
+  assert((function () {}).async({}, 'hoge'), void 0);
+  assert((function () {}).async(null, ['hoge', 'fuga']), void 0);
+  assert((function () {}).async({}, ['hoge', 'fuga']), void 0);
+  assert((function () {}).async({}, [['hoge', 'fuga']]), void 0);
+  assert((function () { return this instanceof Boolean; }).async(false), void 0);
+
   assert(JSON.parseable(void 0), false);
   assert(JSON.parseable(''), false);
   assert(JSON.parseable(NaN), false);
diff --git a/xpi/chrome/content/library/expand.js b/xpi/chrome/content/library/expand.js
index 8fd3cba3..05947b57 100755
--- a/xpi/chrome/content/library/expand.js
+++ b/xpi/chrome/content/library/expand.js
@@ -93,6 +93,14 @@
     }
   });
 
+  Object.expand(Function.prototype, {
+    async(obj, arr) {
+      setTimeout(() => {
+        this.call(obj == null ? null : obj, ...Array.wrap(arr));
+      }, 0);
+    }
+  });
+
   Object.expand(JSON, {
     parseable(target) {
       try {

From 8b5fd9c1f6bdcbce9a57f10c9e687fd789cae2ea Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Tue, 5 Jan 2016 20:50:28 +0900
Subject: [PATCH 09/14] Refine Change Account

* changeAccount.xul: Load expand.js
* changeAccount.js: Change coding style
* Gruntfile.js: Update "eslint:main" task options's rules
---
 Gruntfile.js                                  |  4 +-
 .../content/changeAccount/changeAccount.css   |  4 +-
 .../content/changeAccount/changeAccount.js    | 74 +++++++++++--------
 .../content/changeAccount/changeAccount.xul   |  3 +
 4 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index b1214dad..54878e28 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -164,9 +164,7 @@
                 capIsNewExceptions: [
                   'QueryInterface', 'ConvertToUnicode', 'ConvertFromUnicode'
                 ]
-              }],
-              'one-var': 0,
-              indent: 0
+              }]
             }
           }
         },
diff --git a/xpi/chrome/content/changeAccount/changeAccount.css b/xpi/chrome/content/changeAccount/changeAccount.css
index 8840252d..060bbaef 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.css
+++ b/xpi/chrome/content/changeAccount/changeAccount.css
@@ -12,7 +12,7 @@ dialog {
 }
 
 .services > radio,
-.accounts > listitem,
+.account,
 .login-button:not([disabled]) {
   cursor: pointer;
 }
@@ -21,7 +21,7 @@ dialog {
   margin-left: 0.7em;
 }
 
-.accounts > listitem {
+.account {
   padding-top: 0.5em;
   padding-right: 0.2em;
   padding-bottom: 0.5em;
diff --git a/xpi/chrome/content/changeAccount/changeAccount.js b/xpi/chrome/content/changeAccount/changeAccount.js
index de2e30ec..4c7207c2 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.js
+++ b/xpi/chrome/content/changeAccount/changeAccount.js
@@ -4,15 +4,25 @@
   'use strict';
 
   let env = Components.classes[
-        '@tombfix.github.io/tombfix-service;1'
-      ].getService().wrappedJSObject,
-      {Models} = env,
-      services = doc.querySelector('.services');
+    '@tombfix.github.io/tombfix-service;1'
+  ].getService().wrappedJSObject;
+  let {Models} = env;
+
+  function getAccountInfoList(model) {
+    let infoList;
+
+    if (model.getPasswords) {
+      infoList = model.getPasswords();
+    }
+
+    return Array.isArray(infoList) ? infoList : [];
+  }
+
+  let services = doc.querySelector('.services');
 
   for (let model of Models.values) {
     if (
-      model.login && model.getCurrentUser &&
-        model.getPasswords && model.getPasswords().length
+      model.login && model.getCurrentUser && getAccountInfoList(model).length
     ) {
       let modelName = model.name;
 
@@ -23,54 +33,58 @@
   if (!services.childElementCount) {
     win.addEventListener('load', () => {
       // load時は、まだダイアログが表示されていない
-      setTimeout(() => {
-        win.alert(env.getMessage('message.changeAccount.infoNotFound'));
-      }, 0);
+      env.showMessage.async(env, ['message.changeAccount.infoNotFound', win]);
     });
 
     return;
   }
 
-  let loginButton = doc.querySelector('.login-button'),
-      accounts = doc.querySelector('.accounts');
+  let loginButton = doc.querySelector('.login-button');
+  let accounts = doc.querySelector('.accounts');
+
+  function createAccountList(accountInfoList, currentUserList) {
+    for (let {user, password} of accountInfoList) {
+      let account = accounts.appendItem(user, password);
+
+      account.classList.add('listitem-iconic', 'account');
+
+      if (currentUserList.some(currentUser =>
+        currentUser && currentUser === user
+      )) {
+        account.image = 'chrome://tombfix/skin/tick.png';
+        account.disabled = true;
+
+        accounts.selectedItem = account;
+      } else {
+        account.image = 'chrome://tombfix/skin/empty.png';
+      }
+    }
+  }
 
   services.addEventListener('select', () => {
     loginButton.disabled = true;
 
     let model = Models[services.value];
 
-    model.getCurrentUser().addBoth(result => {
+    model.getCurrentUser().addErrback(() => []).addCallback(list => {
       if (model.name !== services.value) {
         return;
       }
 
       env.clearChildren(accounts);
 
-      let currentUser = typeof result === 'string' ? result : '';
-
-      for (let {user, password} of model.getPasswords()) {
-        let account = accounts.appendItem(user, password);
-
-        account.classList.add('listitem-iconic');
-
-        if (currentUser && currentUser === user) {
-          account.image = 'chrome://tombfix/skin/tick.png';
-          account.disabled = true;
-
-          accounts.selectedItem = account;
-        } else {
-          account.image = 'chrome://tombfix/skin/empty.png';
-        }
-      }
+      createAccountList(getAccountInfoList(model), Array.wrap(list));
     });
   });
 
   accounts.addEventListener('select', () => {
     let account = accounts.selectedItem;
 
-    if (account) {
-      loginButton.disabled = account.disabled;
+    if (!account) {
+      return;
     }
+
+    loginButton.disabled = account.disabled;
   });
 
   win.addEventListener('dialogaccept', () => {
diff --git a/xpi/chrome/content/changeAccount/changeAccount.xul b/xpi/chrome/content/changeAccount/changeAccount.xul
index 08f7f630..b6643a90 100755
--- a/xpi/chrome/content/changeAccount/changeAccount.xul
+++ b/xpi/chrome/content/changeAccount/changeAccount.xul
@@ -18,5 +18,8 @@
         dlgtype="accept"/>
     </vbox>
   </hbox>
+  <script
+    type="application/javascript"
+    src="chrome://tombfix/content/library/expand.js"/>
   <script type="application/javascript" src="changeAccount.js"/>
 </dialog>

From 20577be2e59d31322149ea83467a9d2edcdc60a0 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Mon, 4 Jan 2016 18:16:45 +0900
Subject: [PATCH 10/14] Change Account: Hide services when account information
 is not found

---
 .../content/changeAccount/changeAccount.css   |  5 +---
 .../content/changeAccount/changeAccount.js    | 24 ++++++++++---------
 .../content/changeAccount/changeAccount.xul   |  4 +++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.css b/xpi/chrome/content/changeAccount/changeAccount.css
index 060bbaef..049440f8 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.css
+++ b/xpi/chrome/content/changeAccount/changeAccount.css
@@ -6,6 +6,7 @@ dialog {
 }
 
 .main,
+.left-box,
 .right-box,
 .accounts {
   -moz-box-flex: 1;
@@ -17,10 +18,6 @@ dialog {
   cursor: pointer;
 }
 
-.right-box {
-  margin-left: 0.7em;
-}
-
 .account {
   padding-top: 0.5em;
   padding-right: 0.2em;
diff --git a/xpi/chrome/content/changeAccount/changeAccount.js b/xpi/chrome/content/changeAccount/changeAccount.js
index 4c7207c2..3494c952 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.js
+++ b/xpi/chrome/content/changeAccount/changeAccount.js
@@ -18,19 +18,13 @@
     return Array.isArray(infoList) ? infoList : [];
   }
 
-  let services = doc.querySelector('.services');
-
-  for (let model of Models.values) {
-    if (
-      model.login && model.getCurrentUser && getAccountInfoList(model).length
-    ) {
-      let modelName = model.name;
+  let targets = Models.values.filter(model =>
+    model.login && model.getCurrentUser && getAccountInfoList(model).length
+  );
 
-      services.appendItem(modelName, modelName).setAttribute('src', model.ICON);
-    }
-  }
+  if (!targets.length) {
+    doc.querySelector('.left-box').hidden = true;
 
-  if (!services.childElementCount) {
     win.addEventListener('load', () => {
       // load時は、まだダイアログが表示されていない
       env.showMessage.async(env, ['message.changeAccount.infoNotFound', win]);
@@ -39,6 +33,7 @@
     return;
   }
 
+  let services = doc.querySelector('.services');
   let loginButton = doc.querySelector('.login-button');
   let accounts = doc.querySelector('.accounts');
 
@@ -94,6 +89,13 @@
   });
 
   win.addEventListener('load', () => {
+    // load後でないとアイコンが表示されない
+    for (let model of targets) {
+      let modelName = model.name;
+
+      services.appendItem(modelName, modelName).setAttribute('src', model.ICON);
+    }
+
     services.selectedIndex = 0;
   });
 }(window, document));
diff --git a/xpi/chrome/content/changeAccount/changeAccount.xul b/xpi/chrome/content/changeAccount/changeAccount.xul
index b6643a90..cf1d4bc5 100755
--- a/xpi/chrome/content/changeAccount/changeAccount.xul
+++ b/xpi/chrome/content/changeAccount/changeAccount.xul
@@ -7,7 +7,9 @@
   title="&title.changeAccount;"
   buttons="accept">
   <hbox class="main">
-    <radiogroup class="services"/>
+    <vbox class="left-box">
+      <radiogroup class="services"/>
+    </vbox>
     <vbox class="right-box">
       <listbox class="accounts"/>
       <button

From a6832387eb64b80fb5196c6db57046bc9dc2d335 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Mon, 4 Jan 2016 18:27:16 +0900
Subject: [PATCH 11/14] Change Account: Fix radio icon's size

---
 xpi/chrome/content/changeAccount/changeAccount.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.css b/xpi/chrome/content/changeAccount/changeAccount.css
index 049440f8..5df5c675 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.css
+++ b/xpi/chrome/content/changeAccount/changeAccount.css
@@ -18,6 +18,11 @@ dialog {
   cursor: pointer;
 }
 
+.services .radio-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .account {
   padding-top: 0.5em;
   padding-right: 0.2em;

From 25aef77a2b09fec59cfc2db9738e2243ebe25000 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Mon, 4 Jan 2016 18:39:16 +0900
Subject: [PATCH 12/14] Change Account: Use menulist instead of radiogroup
 about service list

* Fix a bug about radiogroup
* Suppress being too longer service list
---
 xpi/chrome/content/changeAccount/changeAccount.css | 4 ++--
 xpi/chrome/content/changeAccount/changeAccount.js  | 4 +++-
 xpi/chrome/content/changeAccount/changeAccount.xul | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.css b/xpi/chrome/content/changeAccount/changeAccount.css
index 5df5c675..7895f43d 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.css
+++ b/xpi/chrome/content/changeAccount/changeAccount.css
@@ -12,13 +12,13 @@ dialog {
   -moz-box-flex: 1;
 }
 
-.services > radio,
+.services,
 .account,
 .login-button:not([disabled]) {
   cursor: pointer;
 }
 
-.services .radio-icon {
+.services .menulist-icon {
   width: 16px;
   height: 16px;
 }
diff --git a/xpi/chrome/content/changeAccount/changeAccount.js b/xpi/chrome/content/changeAccount/changeAccount.js
index 3494c952..c2ba0e5b 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.js
+++ b/xpi/chrome/content/changeAccount/changeAccount.js
@@ -92,8 +92,10 @@
     // load後でないとアイコンが表示されない
     for (let model of targets) {
       let modelName = model.name;
+      let menuitem = services.appendItem(modelName, modelName);
 
-      services.appendItem(modelName, modelName).setAttribute('src', model.ICON);
+      menuitem.classList.add('menuitem-iconic');
+      menuitem.image = model.ICON;
     }
 
     services.selectedIndex = 0;
diff --git a/xpi/chrome/content/changeAccount/changeAccount.xul b/xpi/chrome/content/changeAccount/changeAccount.xul
index cf1d4bc5..535d03cd 100755
--- a/xpi/chrome/content/changeAccount/changeAccount.xul
+++ b/xpi/chrome/content/changeAccount/changeAccount.xul
@@ -8,7 +8,7 @@
   buttons="accept">
   <hbox class="main">
     <vbox class="left-box">
-      <radiogroup class="services"/>
+      <menulist class="services"/>
     </vbox>
     <vbox class="right-box">
       <listbox class="accounts"/>

From 314fbe4a66eb82bee9374b83e2a5cd929e27d944 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Tue, 5 Jan 2016 20:45:36 +0900
Subject: [PATCH 13/14] Change Account: Fix a bug about display #175

Close #175
---
 xpi/chrome/content/changeAccount/changeAccount.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.js b/xpi/chrome/content/changeAccount/changeAccount.js
index c2ba0e5b..ccb5efa4 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.js
+++ b/xpi/chrome/content/changeAccount/changeAccount.js
@@ -68,7 +68,11 @@
 
       env.clearChildren(accounts);
 
-      createAccountList(getAccountInfoList(model), Array.wrap(list));
+      // 「アカウントの切り替え」を開いて2回目以降にアカウントリストの表示がおかしくなるのを防ぐ
+      createAccountList.async(null, [
+        getAccountInfoList(model),
+        Array.wrap(list)
+      ]);
     });
   });
 

From 0b828e6d6d95cbd059e4acdc7a37c99a9073f769 Mon Sep 17 00:00:00 2001
From: Syoichi Tsuyuhara <syoichi@outlook.com>
Date: Thu, 15 Oct 2015 15:45:36 +0900
Subject: [PATCH 14/14] Change Account: Change account selection from login
 user to logout user

---
 xpi/chrome/content/changeAccount/changeAccount.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xpi/chrome/content/changeAccount/changeAccount.js b/xpi/chrome/content/changeAccount/changeAccount.js
index ccb5efa4..6a486e43 100644
--- a/xpi/chrome/content/changeAccount/changeAccount.js
+++ b/xpi/chrome/content/changeAccount/changeAccount.js
@@ -48,10 +48,12 @@
       )) {
         account.image = 'chrome://tombfix/skin/tick.png';
         account.disabled = true;
-
-        accounts.selectedItem = account;
       } else {
         account.image = 'chrome://tombfix/skin/empty.png';
+
+        if (!accounts.selectedItem) {
+          accounts.selectedItem = account;
+        }
       }
     }
   }