Merge branch 'master' into 2.5.0-pre

app/search.js

@@ -180,8 +180,7 @@ function buildIndex () {
 }
 
 function isWord (charCode) {
-  var word = String.fromCharCode(charCode).match(/\w/)
-  return Boolean(word) ? word : false
+  return String.fromCharCode(charCode).match(/\w/)
 }
 
 function jumpto (destination) {

index.js

@@ -1,8 +1,17 @@
 var { app, ipcMain, globalShortcut, Menu } = require('electron')
 var isMac = /darwin/.test(process.platform)
 var menubar = require('menubar')
-var mb = menubar({ dir: __dirname + '/app', width: 440, height: 270, icon: __dirname + '/app/Icon-Template.png', preloadWindow: true, windowPosition: 'topRight', alwaysOnTop: true })
 var isDev = require('electron-is-dev')
+var path = require('path')
+var mb = menubar({
+  dir: path.join(__dirname, '/app'),
+  width: 440,
+  height: 270,
+  icon: path.join(__dirname, '/app/Icon-Template.png'),
+  preloadWindow: true,
+  windowPosition: 'topRight',
+  alwaysOnTop: true
+})
 
 mb.on('show', function () {
   mb.window.webContents.send('show')

package.json

@@ -5,13 +5,13 @@
   "main": "index.js",
   "dependencies": {
     "electron-is-dev": "^0.1.2",
-    "emojilib": "2.0.7",
+    "emojilib": "2.2.0",
     "menubar": "^5.1.0"
   },
   "devDependencies": {
-    "electron": "^1.4.0",
+    "electron": "^1.6.0",
     "electron-packager": "^8.0.0",
-    "standard": "^4.5.3"
+    "standard": "^9.0.2"
   },
   "scripts": {
     "start": "electron .",

readme.md

@@ -1,4 +1,4 @@
-# Mojibar [![Travis CI build status](https://img.shields.io/travis/muan/mojibar.svg)](https://travis-ci.org/muan/mojibar) [![JS Standard Style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://github.com/feross/standard)
+# Mojibar [![Travis CI build status](https://img.shields.io/travis/muan/mojibar.svg)](https://travis-ci.org/muan/mojibar) [![JS Standard Style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://github.com/feross/standard) [![Greenkeeper badge](https://badges.greenkeeper.io/muan/mojibar.svg)](https://greenkeeper.io/)
 
 A menubar app adaptation of [Emoji searcher](http://emoji.muan.co).