Merge branch 'release/1.1.0' of https://github.com/particl/particl-de…

…sktop into release/1.1.0
particl · Feb 1, 2018 · 78d2845 · 78d2845
2 parents 00f1cb1 + c7e8ba4
commit 78d2845
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -177,7 +177,7 @@
     "@types/node": "^9.3.0",
     "codelyzer": "^4.1.0",
     "coveralls": "^3.0.0",
-    "electron": "1.7.11",
+    "electron": "1.7.12",
     "electron-builder": "^19.55.2",
     "htmlhint": "^0.9.13",
     "jasmine-core": "^2.9.1",

diff --git a/src/app/core-ui/main/main-view.component.ts b/src/app/core-ui/main/main-view.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, HostListener } from '@angular/core';
 import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
 import { Log } from 'ng2-logger';
 import { MatDialog } from '@angular/material';
@@ -148,6 +148,14 @@ export class MainViewComponent implements OnInit, OnDestroy {
     return sec;
   }
 
+  // Paste Event Handle
+  @HostListener('window:keydown', ['$event'])
+  keyDownEvent(event: any) {
+    if (event.metaKey && event.keyCode === 86 && navigator.platform.indexOf('Mac') > -1) {
+      document.execCommand('Paste');
+    }
+  }
+
   /**
   // Sample code for open modal box
   openDemonConnectionModal() {