diff --git a/lib/units/device/plugins/screen/stream.js b/lib/units/device/plugins/screen/stream.js index 9d2c7383..f2e46150 100644 --- a/lib/units/device/plugins/screen/stream.js +++ b/lib/units/device/plugins/screen/stream.js @@ -4,7 +4,7 @@ var Promise = require('bluebird') var syrup = require('stf-syrup') var WebSocket = require('ws') var uuid = require('node-uuid') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') var split = require('split') var adbkit = require('adbkit') diff --git a/lib/units/device/plugins/screen/util/broadcastset.js b/lib/units/device/plugins/screen/util/broadcastset.js index 9b1a0720..838bd098 100644 --- a/lib/units/device/plugins/screen/util/broadcastset.js +++ b/lib/units/device/plugins/screen/util/broadcastset.js @@ -1,6 +1,6 @@ var util = require('util') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') function BroadcastSet() { this.set = Object.create(null) diff --git a/lib/units/device/plugins/touch/index.js b/lib/units/device/plugins/touch/index.js index 043323a8..ca444e13 100644 --- a/lib/units/device/plugins/touch/index.js +++ b/lib/units/device/plugins/touch/index.js @@ -3,7 +3,7 @@ var util = require('util') var Promise = require('bluebird') var syrup = require('stf-syrup') var split = require('split') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') var adbkit = require('adbkit') var Parser = require('adbkit/lib/adb/parser') diff --git a/lib/units/device/plugins/util/display.js b/lib/units/device/plugins/util/display.js index 5f20e1c3..93a44078 100644 --- a/lib/units/device/plugins/util/display.js +++ b/lib/units/device/plugins/util/display.js @@ -1,7 +1,7 @@ var util = require('util') var syrup = require('stf-syrup') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') var logger = require('../../../../util/logger') var streamutil = require('../../../../util/streamutil') diff --git a/lib/units/device/plugins/vnc/util/connection.js b/lib/units/device/plugins/vnc/util/connection.js index 49283667..1f53e85d 100644 --- a/lib/units/device/plugins/vnc/util/connection.js +++ b/lib/units/device/plugins/vnc/util/connection.js @@ -2,7 +2,7 @@ var util = require('util') var os = require('os') var crypto = require('crypto') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') var debug = require('debug')('vnc:connection') var Promise = require('bluebird') diff --git a/lib/units/device/plugins/vnc/util/pointertranslator.js b/lib/units/device/plugins/vnc/util/pointertranslator.js index 8161efa8..34dcad4b 100644 --- a/lib/units/device/plugins/vnc/util/pointertranslator.js +++ b/lib/units/device/plugins/vnc/util/pointertranslator.js @@ -1,6 +1,6 @@ var util = require('util') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') function PointerTranslator() { this.previousEvent = null diff --git a/lib/units/device/plugins/vnc/util/server.js b/lib/units/device/plugins/vnc/util/server.js index 5a8b2382..f5054d3a 100644 --- a/lib/units/device/plugins/vnc/util/server.js +++ b/lib/units/device/plugins/vnc/util/server.js @@ -1,6 +1,6 @@ var util = require('util') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') var debug = require('debug')('vnc:server') var VncConnection = require('./connection') diff --git a/lib/units/provider/index.js b/lib/units/provider/index.js index b3092b5c..aba026c2 100644 --- a/lib/units/provider/index.js +++ b/lib/units/provider/index.js @@ -1,7 +1,7 @@ var adb = require('adbkit') var Promise = require('bluebird') var _ = require('lodash') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') var logger = require('../../util/logger') var wire = require('../../wire') diff --git a/lib/util/failcounter.js b/lib/util/failcounter.js index 186abb1b..16228b19 100644 --- a/lib/util/failcounter.js +++ b/lib/util/failcounter.js @@ -1,6 +1,6 @@ var util = require('util') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') function FailCounter(threshold, time) { EventEmitter.call(this) diff --git a/lib/util/riskystream.js b/lib/util/riskystream.js index a3c67d22..642a6ee9 100644 --- a/lib/util/riskystream.js +++ b/lib/util/riskystream.js @@ -1,7 +1,7 @@ var util = require('util') var Promise = require('bluebird') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') function RiskyStream(stream) { EventEmitter.call(this) diff --git a/lib/util/ttlset.js b/lib/util/ttlset.js index 408dd7d0..d844da11 100644 --- a/lib/util/ttlset.js +++ b/lib/util/ttlset.js @@ -1,6 +1,6 @@ var util = require('util') -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') function TtlItem(value) { this.next = null diff --git a/lib/wire/router.js b/lib/wire/router.js index 840ebfd0..84aef60d 100644 --- a/lib/wire/router.js +++ b/lib/wire/router.js @@ -1,4 +1,4 @@ -var EventEmitter = require('eventemitter3').EventEmitter +var EventEmitter = require('eventemitter3') var util = require('util') var wire = require('./') diff --git a/package.json b/package.json index 53dc3412..f794734a 100644 --- a/package.json +++ b/package.json @@ -33,37 +33,37 @@ "adbkit": "^2.4.1", "adbkit-apkreader": "^1.0.0", "adbkit-monkey": "^1.0.1", - "aws-sdk": "^2.2.3", + "aws-sdk": "^2.4.12", "basic-auth": "^1.0.3", - "bluebird": "^2.9.34", + "bluebird": "^2.10.1", "body-parser": "^1.13.3", "bufferutil": "^1.2.1", "chalk": "~1.1.1", "commander": "^2.9.0", "compression": "^1.5.2", - "cookie-session": "^1.2.0", + "cookie-session": "^2.0.0-alpha.1", "csurf": "^1.7.0", "debug": "^2.2.0", - "eventemitter3": "^0.1.6", + "eventemitter3": "^1.2.0", "express": "^4.13.3", "express-validator": "^2.18.0", "formidable": "^1.0.17", "gm": "^1.21.1", - "hipchatter": "^0.2.0", + "hipchatter": "^0.3.1", "http-proxy": "^1.11.2", "in-publish": "^2.0.0", "jade": "^1.9.2", "jpeg-turbo": "^0.4.0", "jws": "^3.1.0", "ldapjs": "^1.0.0", - "lodash": "^3.10.1", + "lodash": "^4.14.1", "markdown-serve": "^0.3.2", "mime": "^1.3.4", "minimatch": "^3.0.0", "my-local-ip": "^1.0.0", "node-uuid": "^1.4.3", "passport": "^0.3.2", - "openid": "^0.5.13", + "openid": "^2.0.1", "passport-oauth2": "^1.1.2", "passport-saml": "^0.15.0", "protobufjs": "^3.8.2", @@ -84,29 +84,29 @@ "stf-wiki": "^1.0.0", "swagger-express-mw": "^0.6.0", "temp": "^0.8.1", - "transliteration": "^0.1.1", + "transliteration": "^1.1.6", "utf-8-validate": "^1.2.1", "ws": "^1.0.1", - "url-join": "0.0.1", + "url-join": "1.1.0", "zmq": "^2.14.0" }, "devDependencies": { - "async": "^1.5.2", + "async": "^2.0.1", "bower": "^1.7.2", "chai": "^3.4.1", "css-loader": "^0.23.1", "del": "^2.0.1", - "eslint": "^2.11.1", + "eslint": "^3.2.2", "event-stream": "^3.3.2", "exports-loader": "^0.6.2", "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", "gulp": "^3.8.11", "gulp-angular-gettext": "^2.1.0", - "gulp-eslint": "^1.1.1", + "gulp-eslint": "^3.0.1", "gulp-jade": "^1.0.0", "gulp-jsonlint": "^1.0.2", - "gulp-protractor": "^2.1.0", + "gulp-protractor": "^3.0.0", "gulp-run": "^1.6.12", "gulp-util": "^3.0.7", "html-loader": "^0.4.0", @@ -114,15 +114,15 @@ "jasmine-core": "^2.4.1", "jasmine-reporters": "^2.1.1", "json-loader": "^0.5.4", - "karma": "^0.13.19", - "karma-chrome-launcher": "^0.2.2", - "karma-firefox-launcher": "^0.1.7", - "karma-ie-launcher": "^0.2.0", - "karma-jasmine": "^0.3.5", - "karma-junit-reporter": "^0.3.8", - "karma-opera-launcher": "^0.3.0", + "karma": "^1.1.2", + "karma-chrome-launcher": "^1.0.1", + "karma-firefox-launcher": "^1.0.0", + "karma-ie-launcher": "^1.0.0", + "karma-jasmine": "^1.0.2", + "karma-junit-reporter": "^1.1.0", + "karma-opera-launcher": "^1.0.0", "karma-phantomjs-launcher": "^1.0.0", - "karma-safari-launcher": "^0.1.1", + "karma-safari-launcher": "^1.0.0", "karma-webpack": "^1.6.0", "less": "^2.4.0", "less-loader": "^2.2.2", @@ -130,7 +130,7 @@ "node-libs-browser": "^1.0.0", "node-sass": "^3.4.2", "phantomjs-prebuilt": "^2.1.3", - "protractor": "^3.0.0", + "protractor": "^4.0.2", "protractor-html-screenshot-reporter": "0.0.21", "raw-loader": "^0.5.1", "sass-loader": "^4.0.0", diff --git a/res/app/control-panes/dashboard/navigation/navigation-controller.js b/res/app/control-panes/dashboard/navigation/navigation-controller.js index 8ea10e15..c5472c3b 100644 --- a/res/app/control-panes/dashboard/navigation/navigation-controller.js +++ b/res/app/control-panes/dashboard/navigation/navigation-controller.js @@ -46,7 +46,7 @@ module.exports = function NavigationCtrl($scope, $rootScope) { if (browser && browser.apps) { var currentBrowser = {} if (browser.selected) { - var selectedBrowser = _.first(browser.apps, 'selected') + var selectedBrowser = _.head(browser.apps, 'selected') if (!_.isEmpty(selectedBrowser)) { currentBrowser = selectedBrowser } @@ -55,7 +55,7 @@ module.exports = function NavigationCtrl($scope, $rootScope) { if (defaultBrowser) { currentBrowser = defaultBrowser } else { - currentBrowser = _.first(browser.apps) + currentBrowser = _.head(browser.apps) } } $rootScope.browser = currentBrowser