Adapt IqonHash calls, dependencies

nimiq · Feb 27, 2019 · 167acc0 · 167acc0
1 parent cd737c4
commit 167acc0
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 17 deletions.
diff --git a/src/components/DownloadLoginFile.js b/src/components/DownloadLoginFile.js
@@ -3,7 +3,7 @@
 /* global LoginFile */
 /* global KeyStore */
 /* global Errors */
-/* global Iqons */
+/* global IqonHash */
 
 class DownloadLoginFile extends Nimiq.Observable {
     /**
@@ -84,7 +84,7 @@ class DownloadLoginFile extends Nimiq.Observable {
             throw new Errors.KeyguardError('Can only export encrypted Entropies');
         }
 
-        const color = Iqons.getBackgroundColorIndex(firstAddress.toUserFriendlyAddress());
+        const color = IqonHash.getBackgroundColorIndex(firstAddress.toUserFriendlyAddress());
         this.file = new LoginFile(Nimiq.BufferUtils.toBase64(encryptedEntropy), color);
     }
 

diff --git a/src/lib/IqonHash.js b/src/lib/IqonHash.js
@@ -1,4 +1,4 @@
-class IqonHash {
+class IqonHash { /* eslint-disable-line no-unused-vars */
     /**
      * @param {string} address
      * @returns {number}
@@ -53,12 +53,14 @@ class IqonHash {
      * @param {string} string
      * @param {number} maxLength
      * @param {string} fillString
+     * @returns {string}
      */
     static _padEnd(string, maxLength, fillString) {
-        if (!!String.prototype.padEnd) return string.padEnd(maxLength, fillString);
-        else {
-            while (string.length < maxLength) string += fillString;
-            return string.substring(0, Math.max(string.length, maxLength));
+        if (String.prototype.padEnd) return string.padEnd(maxLength, fillString);
+
+        while (string.length < maxLength) {
+            string += fillString;
         }
+        return string.substring(0, Math.max(string.length, maxLength));
     }
 }
diff --git a/src/request/change-password/ChangePassword.js b/src/request/change-password/ChangePassword.js
@@ -9,7 +9,7 @@
 /* global DownloadLoginFile */
 /* global LoginFileIcon */
 /* global ProgressIndicator */
-/* global Iqons */
+/* global IqonHash */
 /* global LoginFile */
 
 /**
@@ -149,7 +149,7 @@ class ChangePassword {
     async _prepare() {
         let colorClass = '';
         if (this.key.secret instanceof Nimiq.Entropy) {
-            const color = Iqons.getBackgroundColorIndex(
+            const color = IqonHash.getBackgroundColorIndex(
                 new Nimiq.Address(
                     // use color of first address as loginFile color
                     this.key.deriveAddress(Constants.DEFAULT_DERIVATION_PATH).serialize(),

diff --git a/src/request/change-password/index.html b/src/request/change-password/index.html
@@ -37,7 +37,7 @@
     <script defer bundle-toplevel src="../TopLevelApi.js"></script>
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
-    <script defer src="../../lib/Iqons.js"></script>
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/LoginFile.js"></script>
     <script defer src="../../lib/PasswordStrength.js"></script>
     <script defer src="../../lib/QrEncoder.js"></script>

diff --git a/src/request/create/index.html b/src/request/create/index.html
@@ -36,6 +36,7 @@
     <script defer bundle-toplevel src="../TopLevelApi.js"></script>
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/Iqons.js"></script>
     <script defer src="../../lib/PasswordStrength.js"></script>
     <script defer src="../../components/Identicon.js"></script>

diff --git a/src/request/derive-address/index.html b/src/request/derive-address/index.html
@@ -37,6 +37,7 @@
     <script defer bundle-toplevel src="../TopLevelApi.js"></script>
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/Iqons.js"></script>
     <script defer src="../../components/Identicon.js"></script>
     <script defer src="DerivedIdenticonSelector.js"></script>

diff --git a/src/request/export/ExportFile.js b/src/request/export/ExportFile.js
@@ -1,5 +1,5 @@
 /* global Constants */
-/* global Iqons */
+/* global IqonHash */
 /* global LoginFileIcon */
 /* global LoginFile */
 /* global Nimiq */
@@ -117,7 +117,7 @@ class ExportFile extends Nimiq.Observable {
             $setPasswordPage.classList.add('repeat-password');
 
             let colorClass = '';
-            const color = Iqons.getBackgroundColorIndex(
+            const color = IqonHash.getBackgroundColorIndex(
                 this._request.keyInfo.defaultAddress.toUserFriendlyAddress(),
             );
             const colorString = LoginFile.CONFIG[color].name;

diff --git a/src/request/export/index.html b/src/request/export/index.html
@@ -38,7 +38,7 @@
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
     <script defer src="../../lib/AutoComplete.js"></script>
-    <script defer src="../../lib/Iqons.js"></script>
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/PasswordStrength.js"></script>
     <script defer src="../../lib/QrEncoder.js"></script>
     <script defer src="../../lib/LoginFile.js"></script>

diff --git a/src/request/import/ImportWords.js b/src/request/import/ImportWords.js
@@ -3,7 +3,7 @@
 /* global Errors */
 /* global FlippableHandler */
 /* global ImportApi */
-/* global Iqons */
+/* global IqonHash */
 /* global Key */
 /* global KeyStore */
 /* global LoginFile */
@@ -90,7 +90,7 @@ class ImportWords {
             let colorClass = '';
             if (this._secrets.entropy) {
                 const key = new Key(this._secrets.entropy, false);
-                const color = Iqons.getBackgroundColorIndex(
+                const color = IqonHash.getBackgroundColorIndex(
                     key.defaultAddress.toUserFriendlyAddress(),
                 );
                 const colorString = LoginFile.CONFIG[color].name;

diff --git a/src/request/import/index.html b/src/request/import/index.html
@@ -38,7 +38,7 @@
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
     <script defer src="../../lib/AutoComplete.js"></script>
-    <script defer src="../../lib/Iqons.js"></script>
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/QrScanner.js"></script>
     <script defer src="../../lib/LoginFile.js"></script>
     <script defer src="../../lib/PasswordStrength.js"></script>

diff --git a/src/request/remove-key/index.html b/src/request/remove-key/index.html
@@ -39,7 +39,7 @@
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
     <script defer src="../../lib/AutoComplete.js"></script>
-    <script defer src="../../lib/Iqons.js"></script>
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/PasswordStrength.js"></script>
     <script defer src="../../lib/QrEncoder.js"></script>
     <script defer src="../../lib/LoginFile.js"></script>

diff --git a/src/request/sign-message/index.html b/src/request/sign-message/index.html
@@ -37,6 +37,7 @@
     <script defer bundle-toplevel src="../TopLevelApi.js"></script>
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/Iqons.js"></script>
     <script defer src="../../components/Identicon.js"></script>
     <script defer src="SignMessageApi.js"></script>

diff --git a/src/request/sign-transaction/index.html b/src/request/sign-transaction/index.html
@@ -37,6 +37,7 @@
     <script defer bundle-toplevel src="../TopLevelApi.js"></script>
     <script defer bundle-toplevel src="../../translations/index.js"></script>
 
+    <script defer src="../../lib/IqonHash.js"></script>
     <script defer src="../../lib/Iqons.js"></script>
     <script defer src="../../components/Identicon.js"></script>
     <script defer src="../../components/AddressInfo.js"></script>