From 010ee6a711042396834f0192095070470fde59af Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Sat, 6 Jun 2015 21:31:43 +0900 Subject: [PATCH] popup will emit ipc event for main process to write clipboard --- electron_src/popup/popup.js | 10 ++++------ main.js | 24 ++++++++++++++++++++++-- package.json | 3 +++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/electron_src/popup/popup.js b/electron_src/popup/popup.js index a874fec4..bac0438e 100644 --- a/electron_src/popup/popup.js +++ b/electron_src/popup/popup.js @@ -2,15 +2,14 @@ var remote = require('remote') var ipc = require('ipc') -var clipboard = require('clipboard') var SEARCH_INPUT = 1 var RESULT_LIST = 2 var RESULT_CONTROL = 3 var RESULT_CONTENT = 4 -var btnClipboard = document.getElementById('btnClipboard') -var btnEdit = document.getElementById('btnEdit') -var btnShare = document.getElementById('btnShare') +// var btnClipboard = document.getElementById('btnClipboard') +// var btnEdit = document.getElementById('btnEdit') +// var btnShare = document.getElementById('btnShare') var aceView = document.getElementById('aceView') angular.module('codexen.popup', [ @@ -105,8 +104,7 @@ angular.module('codexen.popup', [ switch ($scope.isFocusing) { case RESULT_LIST: console.log($scope.selectedItem.content) - clipboard.writeText($scope.selectedItem.content) - hidePopUp() + ipc.send('writeCode', $scope.selectedItem.content) break } e.preventDefault() diff --git a/main.js b/main.js index 3e13070f..cb095ae2 100644 --- a/main.js +++ b/main.js @@ -12,6 +12,10 @@ app.on('window-all-closed', function () { if (process.platform !== 'darwin') app.quit() }) +var robot = require('robotjs') + +var clipboard = require('clipboard') + var Tray = require('tray') var appIcon = null @@ -19,7 +23,13 @@ app.on('ready', function () { appIcon = new Tray('./icon.png') appIcon.setToolTip('This is my application.') - mainWindow = new BrowserWindow({width: 800, height: 600}) + mainWindow = new BrowserWindow({ + width: 800, + height: 600, + 'web-preferences': { + 'overlay-scrollbars': true + } + }) mainWindow.loadUrl('file://' + __dirname + '/electron_build/index.html') @@ -36,7 +46,10 @@ app.on('ready', function () { width: 600, height: 400, show: false, - frame: false + frame: false, + 'web-preferences': { + 'overlay-scrollbars': true + } }) popUpWindow.loadUrl('file://' + __dirname + '/electron_build/electron/popup/index.html') @@ -74,6 +87,13 @@ app.on('ready', function () { ipc.on('hidePopUp', function () { hidePopUp() }) + ipc.on('writeCode', function (e, code) { + clipboard.writeText(code) + // setTimeout(function () { + // robot.typeString(code) + // }, 200) + hidePopUp() + }) var fromMain // Register a 'ctrl+x' shortcut listener. diff --git a/package.json b/package.json index 38eb81f5..d012e3a9 100644 --- a/package.json +++ b/package.json @@ -35,12 +35,15 @@ "angular-ui-router": "^0.2.15", "font-awesome": "^4.3.0", "moment": "^2.10.3", + "robotjs": "^0.1.2", "satellizer": "^0.10.1", "ui-select": "^0.11.2" }, "devDependencies": { "bootstrap-sass": "^3.3.4", "del": "^1.2.0", + "electron-prebuilt": "^0.27.2", + "electron-rebuild": "^0.2.1", "globby": "^2.0.0", "gulp": "^3.8.11", "gulp-angular-templatecache": "^1.6.0",