delete travis and update main.js

Toinane · Mar 2, 2017 · a3d56a4 · a3d56a4
1 parent 398845b
commit a3d56a4
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 151 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Electron · octalmagerobotjs Wiki.URL → links/Electron · octalmagerobotjs Wiki.URL b/Electron · octalmagerobotjs Wiki.URL → links/Electron · octalmagerobotjs Wiki.URL
diff --git a/...election - electron - Atom Discussion.URL → ...election - electron - Atom Discussion.URL b/...election - electron - Atom Discussion.URL → ...election - electron - Atom Discussion.URL
diff --git a/...electron - electron - Atom Discussion.URL → ...electron - electron - Atom Discussion.URL b/...electron - electron - Atom Discussion.URL → ...electron - electron - Atom Discussion.URL
diff --git a/desktopCapturer - Electron.URL → links/desktopCapturer - Electron.URL b/desktopCapturer - Electron.URL → links/desktopCapturer - Electron.URL
diff --git a/...turer.md at master · electronelectron.URL → ...turer.md at master · electronelectron.URL b/...turer.md at master · electronelectron.URL → ...turer.md at master · electronelectron.URL
diff --git a/...gerobotjs Node.js Desktop Automation..URL → ...gerobotjs Node.js Desktop Automation..URL b/...gerobotjs Node.js Desktop Automation..URL → ...gerobotjs Node.js Desktop Automation..URL
diff --git a/main.js b/main.js
@@ -9,15 +9,15 @@ let win, tray;
 
 function createWindow(){
 
-  var robot = require("robotjs");
+//var robot = require("robotjs");
 
 // Get mouse position.
-var mouse = robot.getMousePos();
+//var mouse = robot.getMousePos();
 
 // Get pixel color in hex format.
-var hex = robot.getPixelColor(mouse.x, mouse.y);
-console.log("#" + hex + " at x:" + mouse.x + " y:" + mouse.y);
-  
+//var hex = robot.getPixelColor(mouse.x, mouse.y);
+//console.log("#" + hex + " at x:" + mouse.x + " y:" + mouse.y);
+
    /*app.setUserTasks([
   {
     program: __dirname+'/main.js',

diff --git a/package.json b/package.json
@@ -6,18 +6,19 @@
   "main": "main.js",
   "scripts": {
     "start": "electron .",
+    "text": "xvfb-maybe electron-mocha main.js",
     "pack": "build --dir",
     "dist": "build"
   },
-  "build":{
-      "appId": "toinane.colorpicker",
-      "mac": {
-         "category": "toinane.app.design"
-      },
-      "win": {
-         "iconUrl": "logo.png"
-      }
-   },
+  "build": {
+    "appId": "toinane.colorpicker",
+    "mac": {
+      "category": "toinane.app.design"
+    },
+    "win": {
+      "iconUrl": "logo.png"
+    }
+  },
   "repository": "https://github.com/toinane/colorpicker",
   "keywords": [
     "ColorPicker",
@@ -26,7 +27,7 @@
     "crea-that"
   ],
   "devDependencies": {
-    "electron": "^1.5.0"
+    "electron": "^1.6.1"
   },
   "author": "Toinane",
   "homepage": "https://toinane.crea-th.at",