From 0b07f0050e4e74c181793460a09401afed5cd0cf Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 7 Aug 2019 14:46:29 -0300
Subject: [PATCH 1/4] Move tooltip component to app/ui

---
 app/reactions/client/init.js                  |   2 +-
 app/tooltip/README.md                         |   0
 app/tooltip/client/index.js                   |   4 -
 app/tooltip/index.js                          |   1 -
 app/ui-master/client/main.js                  |   2 +-
 .../client/components}/tooltip.css            |   0
 .../client/components/tooltip.html}           |   2 +-
 .../client/components/tooltip.js}             |   5 +-
 app/ui/client/index.js                        |   1 +
 client/importPackages.js                      |   1 -
 client/importsCss.js                          |   1 -
 package-lock.json                             | 229 ++++++++----------
 12 files changed, 113 insertions(+), 135 deletions(-)
 delete mode 100644 app/tooltip/README.md
 delete mode 100644 app/tooltip/client/index.js
 delete mode 100644 app/tooltip/index.js
 rename app/{tooltip/client => ui/client/components}/tooltip.css (100%)
 rename app/{tooltip/client/rocketchat-tooltip.html => ui/client/components/tooltip.html} (75%)
 rename app/{tooltip/client/rocketchat-tooltip.js => ui/client/components/tooltip.js} (93%)

diff --git a/app/reactions/client/init.js b/app/reactions/client/init.js
index faba7df8d7b2..e6c9acaf7d62 100644
--- a/app/reactions/client/init.js
+++ b/app/reactions/client/init.js
@@ -6,7 +6,7 @@ import { Rooms } from '../../models';
 import { MessageAction } from '../../ui-utils';
 import { messageArgs } from '../../ui-utils/client/lib/messageArgs';
 import { EmojiPicker } from '../../emoji';
-import { tooltip } from '../../tooltip';
+import { tooltip } from '../../ui/client/components/tooltip';
 
 Template.room.events({
 	'click .add-reaction, click [data-message-action="reaction-message"]'(event) {
diff --git a/app/tooltip/README.md b/app/tooltip/README.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/app/tooltip/client/index.js b/app/tooltip/client/index.js
deleted file mode 100644
index 41cf931eaf81..000000000000
--- a/app/tooltip/client/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import './rocketchat-tooltip.html';
-import { tooltip } from './rocketchat-tooltip';
-
-export { tooltip };
diff --git a/app/tooltip/index.js b/app/tooltip/index.js
deleted file mode 100644
index 40a7340d3887..000000000000
--- a/app/tooltip/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './client/index';
diff --git a/app/ui-master/client/main.js b/app/ui-master/client/main.js
index 45685d58d9e5..70a04fafee7e 100644
--- a/app/ui-master/client/main.js
+++ b/app/ui-master/client/main.js
@@ -15,7 +15,7 @@ import { settings } from '../../settings';
 import { CachedChatSubscription, Roles, ChatSubscription, Users } from '../../models';
 import { CachedCollectionManager } from '../../ui-cached-collection';
 import { hasRole } from '../../authorization';
-import { tooltip } from '../../tooltip';
+import { tooltip } from '../../ui/client/components/tooltip';
 import { callbacks } from '../../callbacks/client';
 
 function executeCustomScript(script) {
diff --git a/app/tooltip/client/tooltip.css b/app/ui/client/components/tooltip.css
similarity index 100%
rename from app/tooltip/client/tooltip.css
rename to app/ui/client/components/tooltip.css
diff --git a/app/tooltip/client/rocketchat-tooltip.html b/app/ui/client/components/tooltip.html
similarity index 75%
rename from app/tooltip/client/rocketchat-tooltip.html
rename to app/ui/client/components/tooltip.html
index 5fea5460a40d..f5e64a61f960 100644
--- a/app/tooltip/client/rocketchat-tooltip.html
+++ b/app/ui/client/components/tooltip.html
@@ -1,4 +1,4 @@
-<template name="rocketchatTooltip">
+<template name="tooltip">
 	<div class="tooltip">
 		<div class="content">
 		</div>
diff --git a/app/tooltip/client/rocketchat-tooltip.js b/app/ui/client/components/tooltip.js
similarity index 93%
rename from app/tooltip/client/rocketchat-tooltip.js
rename to app/ui/client/components/tooltip.js
index 412948a99c23..2eed2278674a 100644
--- a/app/tooltip/client/rocketchat-tooltip.js
+++ b/app/ui/client/components/tooltip.js
@@ -1,6 +1,9 @@
 import { Template } from 'meteor/templating';
 import { Blaze } from 'meteor/blaze';
 
+import './tooltip.html';
+import './tooltip.css';
+
 export const tooltip = {
 	source: null,
 	initiated: false,
@@ -12,7 +15,7 @@ export const tooltip = {
 		}
 		this.initiated = true;
 
-		Blaze.render(Template.rocketchatTooltip, document.body);
+		Blaze.render(Template.tooltip, document.body);
 	},
 
 	showElement(element, source) {
diff --git a/app/ui/client/index.js b/app/ui/client/index.js
index e36fa871c620..3a134daf54cb 100644
--- a/app/ui/client/index.js
+++ b/app/ui/client/index.js
@@ -59,6 +59,7 @@ import './components/header/headerRoom.html';
 import './components/header/headerRoom';
 import './components/contextualBar.html';
 import './components/contextualBar';
+import './components/tooltip';
 
 export { ChatMessages } from './lib/chatMessages';
 export { fileUpload } from './lib/fileUpload';
diff --git a/client/importPackages.js b/client/importPackages.js
index e26dde77f6f7..a2a44dfe2982 100644
--- a/client/importPackages.js
+++ b/client/importPackages.js
@@ -71,7 +71,6 @@ import '../app/slider';
 import '../app/spotify/client';
 import '../app/theme/client';
 import '../app/tokenpass/client';
-import '../app/tooltip';
 import '../app/ui';
 import '../app/ui-account';
 import '../app/ui-admin/client';
diff --git a/client/importsCss.js b/client/importsCss.js
index d723973c6a22..9b3b49c4fd6a 100644
--- a/client/importsCss.js
+++ b/client/importsCss.js
@@ -33,7 +33,6 @@ import '../app/search/client/style/style.css';
 import '../app/tokenpass/client/login-button.css';
 import '../app/tokenpass/client/channelSettings.css';
 import '../app/tokenpass/client/styles.css';
-import '../app/tooltip/client/tooltip.css';
 import '../app/ui-clean-history/client/views/stylesheets/cleanHistory.css';
 import '../app/ui-vrecord/client/vrecord.css';
 import '../app/videobridge/client/stylesheets/video.less';
diff --git a/package-lock.json b/package-lock.json
index 8e69f954cbff..ca57db40b374 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "Rocket.Chat",
-	"version": "1.3.0-develop",
+	"version": "1.4.0-develop",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -675,9 +675,9 @@
 			"integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
 		},
 		"@rocket.chat/apps-engine": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.5.1.tgz",
-			"integrity": "sha512-Nlj5NOxqNo7Ae+1wLD48AXBPIeMiQqUXlYOjRH6o5P9Q5IrTmIA28ZCKjjthUGnso8TB8KDWCPqY9aJWynoOtw==",
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.5.2.tgz",
+			"integrity": "sha512-2Ncbv6XTSNHfEnXwrKBv/WQ19jA+w7Xa3I8FVYYNLLIAss3ZLsqu8k2LeSkSt6H0DWuOViJ8ZIfv/21Vpsu8GQ==",
 			"requires": {
 				"adm-zip": "^0.4.9",
 				"lodash.clonedeep": "^4.5.0",
@@ -758,7 +758,7 @@
 		},
 		"@types/events": {
 			"version": "1.2.0",
-			"resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
 			"integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="
 		},
 		"@types/express": {
@@ -1684,7 +1684,7 @@
 		},
 		"axios": {
 			"version": "0.18.0",
-			"resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
 			"integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
 			"requires": {
 				"follow-redirects": "^1.3.0",
@@ -2022,7 +2022,7 @@
 		},
 		"babel-plugin-add-module-exports": {
 			"version": "0.2.1",
-			"resolved": "http://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
 			"integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
 			"dev": true
 		},
@@ -2043,79 +2043,79 @@
 		},
 		"babel-plugin-syntax-async-functions": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
 			"integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
 			"dev": true
 		},
 		"babel-plugin-syntax-async-generators": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
 			"integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
 			"dev": true
 		},
 		"babel-plugin-syntax-class-constructor-call": {
 			"version": "6.18.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
 			"integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
 			"dev": true
 		},
 		"babel-plugin-syntax-class-properties": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
 			"integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
 			"dev": true
 		},
 		"babel-plugin-syntax-decorators": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
 			"integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
 			"dev": true
 		},
 		"babel-plugin-syntax-do-expressions": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
 			"integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
 			"dev": true
 		},
 		"babel-plugin-syntax-dynamic-import": {
 			"version": "6.18.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
 			"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
 			"dev": true
 		},
 		"babel-plugin-syntax-exponentiation-operator": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
 			"integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
 			"dev": true
 		},
 		"babel-plugin-syntax-export-extensions": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
 			"integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
 			"dev": true
 		},
 		"babel-plugin-syntax-flow": {
 			"version": "6.18.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
 			"integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
 			"dev": true
 		},
 		"babel-plugin-syntax-function-bind": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
 			"integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
 			"dev": true
 		},
 		"babel-plugin-syntax-jsx": {
 			"version": "6.18.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
 			"integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
 			"dev": true
 		},
 		"babel-plugin-syntax-object-rest-spread": {
 			"version": "6.13.0",
-			"resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
 			"integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
 			"dev": true
 		},
@@ -2512,7 +2512,7 @@
 		},
 		"babel-preset-es2015": {
 			"version": "6.3.13",
-			"resolved": "http://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
+			"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.3.13.tgz",
 			"integrity": "sha1-l9zn7ykuGMubK3VF2AxZPCjZUX8=",
 			"dev": true,
 			"requires": {
@@ -2540,7 +2540,7 @@
 		},
 		"babel-preset-react": {
 			"version": "6.3.13",
-			"resolved": "http://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.3.13.tgz",
+			"resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.3.13.tgz",
 			"integrity": "sha1-E9VeBqZfqqoHw5v2Op2DbgMhFvo=",
 			"dev": true,
 			"requires": {
@@ -2554,7 +2554,7 @@
 		},
 		"babel-preset-stage-0": {
 			"version": "6.3.13",
-			"resolved": "http://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.3.13.tgz",
+			"resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.3.13.tgz",
 			"integrity": "sha1-eKN8VvCzmI8qeZMtywzrj/N3sNE=",
 			"dev": true,
 			"requires": {
@@ -3461,7 +3461,7 @@
 		},
 		"bl": {
 			"version": "1.2.2",
-			"resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
 			"integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
 			"requires": {
 				"readable-stream": "^2.3.5",
@@ -3845,7 +3845,7 @@
 				},
 				"readable-stream": {
 					"version": "1.1.14",
-					"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
 					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"requires": {
 						"core-util-is": "~1.0.0",
@@ -4201,7 +4201,7 @@
 		},
 		"chalk": {
 			"version": "1.1.3",
-			"resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
 			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
 			"requires": {
 				"ansi-styles": "^2.2.1",
@@ -4304,7 +4304,7 @@
 		},
 		"chimp": {
 			"version": "0.51.1",
-			"resolved": "http://registry.npmjs.org/chimp/-/chimp-0.51.1.tgz",
+			"resolved": "https://registry.npmjs.org/chimp/-/chimp-0.51.1.tgz",
 			"integrity": "sha1-6hIbzfJsidV/jvNBlUDPPCeaPMU=",
 			"dev": true,
 			"requires": {
@@ -4324,13 +4324,13 @@
 				"chromedriver": "^2.35",
 				"colors": "1.1.2",
 				"commander": "^2.9.0",
-				"cucumber": "github:xolvio/cucumber-js#v1.3.0-chimp.6",
+				"cucumber": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
 				"deep-extend": "^0.4.1",
 				"exit": "^0.1.2",
 				"fibers": "^1.0.14",
 				"freeport": "~1.0.5",
 				"fs-extra": "^1.0.0",
-				"glob": "github:lucetius/node-glob#chimp",
+				"glob": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
 				"hapi": "8.8.0",
 				"jasmine": "^2.4.1",
 				"loglevel": "~1.4.0",
@@ -4350,7 +4350,7 @@
 			"dependencies": {
 				"async": {
 					"version": "0.9.2",
-					"resolved": "http://registry.npmjs.org/async/-/async-0.9.2.tgz",
+					"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
 					"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
 					"dev": true
 				},
@@ -4422,7 +4422,7 @@
 				},
 				"minimist": {
 					"version": "1.2.0",
-					"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
 					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 					"dev": true
 				},
@@ -4474,7 +4474,7 @@
 				},
 				"progress": {
 					"version": "1.1.8",
-					"resolved": "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+					"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
 					"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
 					"dev": true
 				},
@@ -4497,7 +4497,7 @@
 		},
 		"chokidar": {
 			"version": "1.6.1",
-			"resolved": "http://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
 			"integrity": "sha1-L0RHq16W5Q+z14n9kNTHLg5McMI=",
 			"dev": true,
 			"requires": {
@@ -5221,7 +5221,7 @@
 			"dependencies": {
 				"core-js": {
 					"version": "1.2.7",
-					"resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
 					"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
 				}
 			}
@@ -5615,7 +5615,7 @@
 					"dependencies": {
 						"pify": {
 							"version": "2.3.0",
-							"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 							"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
 							"dev": true
 						}
@@ -5645,7 +5645,7 @@
 		},
 		"deprecate": {
 			"version": "1.0.0",
-			"resolved": "http://registry.npmjs.org/deprecate/-/deprecate-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/deprecate/-/deprecate-1.0.0.tgz",
 			"integrity": "sha1-ZhSQ7SQokWpsiIPYg05WRvTkpKg="
 		},
 		"deprecated-decorator": {
@@ -5697,7 +5697,7 @@
 				},
 				"readable-stream": {
 					"version": "1.1.14",
-					"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
 					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"requires": {
 						"core-util-is": "~1.0.0",
@@ -5764,7 +5764,7 @@
 			"dependencies": {
 				"domelementtype": {
 					"version": "1.1.3",
-					"resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
 					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
 				}
 			}
@@ -6092,7 +6092,7 @@
 		},
 		"es6-promisify": {
 			"version": "5.0.0",
-			"resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
 			"integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
 			"requires": {
 				"es6-promise": "^4.0.3"
@@ -6504,7 +6504,7 @@
 		},
 		"events": {
 			"version": "1.1.1",
-			"resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
 			"integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
 		},
 		"evp_bytestokey": {
@@ -6905,7 +6905,7 @@
 		},
 		"external-editor": {
 			"version": "2.2.0",
-			"resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
 			"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
 			"dev": true,
 			"requires": {
@@ -7048,13 +7048,13 @@
 			"dependencies": {
 				"lodash": {
 					"version": "2.4.2",
-					"resolved": "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
 					"integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
 					"dev": true
 				},
 				"underscore.string": {
 					"version": "2.3.3",
-					"resolved": "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
+					"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz",
 					"integrity": "sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=",
 					"dev": true
 				}
@@ -7395,8 +7395,7 @@
 				"ansi-regex": {
 					"version": "2.1.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"aproba": {
 					"version": "1.2.0",
@@ -7417,14 +7416,12 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -7439,20 +7436,17 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -7569,8 +7563,7 @@
 				"inherits": {
 					"version": "2.0.3",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -7582,7 +7575,6 @@
 					"version": "1.0.0",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -7597,7 +7589,6 @@
 					"version": "3.0.4",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"brace-expansion": "^1.1.7"
 					}
@@ -7605,14 +7596,12 @@
 				"minimist": {
 					"version": "0.0.8",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"minipass": {
 					"version": "2.3.5",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"safe-buffer": "^5.1.2",
 						"yallist": "^3.0.0"
@@ -7631,7 +7620,6 @@
 					"version": "0.5.1",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -7719,8 +7707,7 @@
 				"number-is-nan": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
@@ -7732,7 +7719,6 @@
 					"version": "1.4.0",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"wrappy": "1"
 					}
@@ -7818,8 +7804,7 @@
 				"safe-buffer": {
 					"version": "5.1.2",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
@@ -7855,7 +7840,6 @@
 					"version": "1.0.2",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"code-point-at": "^1.0.0",
 						"is-fullwidth-code-point": "^1.0.0",
@@ -7875,7 +7859,6 @@
 					"version": "3.0.1",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"ansi-regex": "^2.0.0"
 					}
@@ -7919,14 +7902,12 @@
 				"wrappy": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"yallist": {
 					"version": "3.0.3",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				}
 			}
 		},
@@ -8230,7 +8211,7 @@
 			"dependencies": {
 				"minimist": {
 					"version": "1.1.3",
-					"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
 					"integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
 					"dev": true
 				}
@@ -9085,7 +9066,7 @@
 		},
 		"hapi": {
 			"version": "8.8.0",
-			"resolved": "http://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
+			"resolved": "https://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
 			"integrity": "sha1-h+N6Bum0meiXkOLcERqpZotuYX8=",
 			"dev": true,
 			"requires": {
@@ -9155,7 +9136,7 @@
 				},
 				"catbox": {
 					"version": "4.3.0",
-					"resolved": "http://registry.npmjs.org/catbox/-/catbox-4.3.0.tgz",
+					"resolved": "https://registry.npmjs.org/catbox/-/catbox-4.3.0.tgz",
 					"integrity": "sha1-IiN3vWfxKRrA4l0AAC0GWp3385o=",
 					"dev": true,
 					"requires": {
@@ -9252,7 +9233,7 @@
 				},
 				"joi": {
 					"version": "6.4.1",
-					"resolved": "http://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
+					"resolved": "https://registry.npmjs.org/joi/-/joi-6.4.1.tgz",
 					"integrity": "sha1-9Q9CRTVgBo5jg9oVrC0w3Xzra24=",
 					"dev": true,
 					"requires": {
@@ -9264,7 +9245,7 @@
 					"dependencies": {
 						"isemail": {
 							"version": "1.1.1",
-							"resolved": "http://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz",
+							"resolved": "https://registry.npmjs.org/isemail/-/isemail-1.1.1.tgz",
 							"integrity": "sha1-4Mj23D9HCX53dzlcaJYnGqJWw7U=",
 							"dev": true
 						},
@@ -9297,7 +9278,7 @@
 					"dependencies": {
 						"mime-db": {
 							"version": "1.14.0",
-							"resolved": "http://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz",
+							"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz",
 							"integrity": "sha1-1WHxC27mbbUflK5leilRp0IX7YM=",
 							"dev": true
 						}
@@ -9897,7 +9878,7 @@
 				},
 				"readable-stream": {
 					"version": "1.1.14",
-					"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
 					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"requires": {
 						"core-util-is": "~1.0.0",
@@ -10233,7 +10214,7 @@
 		},
 		"is-builtin-module": {
 			"version": "1.0.0",
-			"resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
 			"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
 			"dev": true,
 			"requires": {
@@ -10394,7 +10375,7 @@
 		},
 		"is-obj": {
 			"version": "1.0.1",
-			"resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
 			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
 		},
 		"is-object": {
@@ -10549,7 +10530,7 @@
 		},
 		"isemail": {
 			"version": "1.2.0",
-			"resolved": "http://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
 			"integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo="
 		},
 		"isexe": {
@@ -10585,7 +10566,7 @@
 		},
 		"jasmine-core": {
 			"version": "2.99.1",
-			"resolved": "http://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
 			"integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
 			"dev": true
 		},
@@ -10785,7 +10766,7 @@
 		},
 		"jsonfile": {
 			"version": "2.4.0",
-			"resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
 			"integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
 			"dev": true,
 			"requires": {
@@ -11073,7 +11054,7 @@
 				},
 				"promise": {
 					"version": "6.1.0",
-					"resolved": "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz",
+					"resolved": "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz",
 					"integrity": "sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY=",
 					"optional": true,
 					"requires": {
@@ -11699,7 +11680,7 @@
 		},
 		"media-typer": {
 			"version": "0.3.0",
-			"resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
 			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
 		},
 		"mem": {
@@ -12174,14 +12155,14 @@
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
 			"requires": {
 				"brace-expansion": "^1.1.7"
 			}
 		},
 		"minimist": {
 			"version": "0.0.8",
-			"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
 			"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
 		},
 		"minimist-options": {
@@ -12269,7 +12250,7 @@
 		},
 		"mkdirp": {
 			"version": "0.5.1",
-			"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
 			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 			"requires": {
 				"minimist": "0.0.8"
@@ -12627,7 +12608,7 @@
 		},
 		"ncp": {
 			"version": "2.0.0",
-			"resolved": "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
 			"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
 			"optional": true
 		},
@@ -12935,7 +12916,7 @@
 		},
 		"npm-install-package": {
 			"version": "2.1.0",
-			"resolved": "http://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
 			"integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
 			"dev": true
 		},
@@ -12950,7 +12931,7 @@
 		"npmlog": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
 			"requires": {
 				"are-we-there-yet": "~1.1.2",
 				"console-control-strings": "~1.1.0",
@@ -13180,7 +13161,7 @@
 		},
 		"os-locale": {
 			"version": "1.4.0",
-			"resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
 			"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
 			"requires": {
 				"lcid": "^1.0.0"
@@ -13513,7 +13494,7 @@
 				},
 				"es6-promise": {
 					"version": "4.0.5",
-					"resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
+					"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
 					"integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI=",
 					"dev": true
 				},
@@ -13569,7 +13550,7 @@
 				},
 				"progress": {
 					"version": "1.1.8",
-					"resolved": "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+					"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
 					"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
 					"dev": true
 				},
@@ -14720,7 +14701,7 @@
 			"dependencies": {
 				"minimist": {
 					"version": "1.2.0",
-					"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
 					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 				}
 			}
@@ -14736,7 +14717,7 @@
 			"dependencies": {
 				"pify": {
 					"version": "2.3.0",
-					"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
 					"dev": true
 				}
@@ -14770,7 +14751,7 @@
 				},
 				"pify": {
 					"version": "2.3.0",
-					"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
 					"dev": true
 				}
@@ -14833,7 +14814,7 @@
 		},
 		"readable-stream": {
 			"version": "2.3.6",
-			"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"requires": {
 				"core-util-is": "~1.0.0",
@@ -14945,7 +14926,7 @@
 		},
 		"regjsgen": {
 			"version": "0.2.0",
-			"resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
 			"integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
 			"dev": true
 		},
@@ -15131,7 +15112,7 @@
 		},
 		"requestretry": {
 			"version": "1.5.0",
-			"resolved": "http://registry.npmjs.org/requestretry/-/requestretry-1.5.0.tgz",
+			"resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.5.0.tgz",
 			"integrity": "sha1-7RV7ulNSbt6z7DKo5wSkmYvs5ic=",
 			"dev": true,
 			"requires": {
@@ -15257,7 +15238,7 @@
 		},
 		"rimraf": {
 			"version": "2.4.5",
-			"resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
 			"integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=",
 			"requires": {
 				"glob": "^6.0.1"
@@ -15352,7 +15333,7 @@
 		},
 		"safe-regex": {
 			"version": "1.1.0",
-			"resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
 			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
 			"requires": {
 				"ret": "~0.1.10"
@@ -15374,7 +15355,7 @@
 		},
 		"sax": {
 			"version": "1.2.1",
-			"resolved": "http://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
 			"integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
 		},
 		"schema-inspector": {
@@ -15387,7 +15368,7 @@
 			"dependencies": {
 				"async": {
 					"version": "1.5.2",
-					"resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
+					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
 					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
 				}
 			}
@@ -15472,7 +15453,7 @@
 				},
 				"minimist": {
 					"version": "1.2.0",
-					"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
 					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 					"dev": true
 				},
@@ -16195,7 +16176,7 @@
 		},
 		"strip-ansi": {
 			"version": "3.0.1",
-			"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
 			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"requires": {
 				"ansi-regex": "^2.0.0"
@@ -16762,7 +16743,7 @@
 		},
 		"through": {
 			"version": "2.3.8",
-			"resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
 			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
 			"dev": true
 		},
@@ -17458,7 +17439,7 @@
 			"dependencies": {
 				"semver": {
 					"version": "5.3.0",
-					"resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
 					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
 				}
 			}
@@ -18067,7 +18048,7 @@
 		},
 		"wrap-ansi": {
 			"version": "2.1.0",
-			"resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
 			"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
 			"requires": {
 				"string-width": "^1.0.1",
@@ -18171,7 +18152,7 @@
 		},
 		"xolvio-ddp": {
 			"version": "0.12.3",
-			"resolved": "http://registry.npmjs.org/xolvio-ddp/-/xolvio-ddp-0.12.3.tgz",
+			"resolved": "https://registry.npmjs.org/xolvio-ddp/-/xolvio-ddp-0.12.3.tgz",
 			"integrity": "sha1-NqarlhKyQLWg0cCoNJCK8XwLjwI=",
 			"dev": true,
 			"requires": {
@@ -18196,7 +18177,7 @@
 				},
 				"async": {
 					"version": "0.9.2",
-					"resolved": "http://registry.npmjs.org/async/-/async-0.9.2.tgz",
+					"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
 					"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
 					"dev": true
 				},
@@ -18208,7 +18189,7 @@
 				},
 				"bl": {
 					"version": "0.9.5",
-					"resolved": "http://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
+					"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
 					"integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
 					"dev": true,
 					"requires": {
@@ -18217,7 +18198,7 @@
 				},
 				"bluebird": {
 					"version": "2.11.0",
-					"resolved": "http://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
+					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
 					"integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=",
 					"dev": true
 				},
@@ -18229,7 +18210,7 @@
 				},
 				"combined-stream": {
 					"version": "0.0.7",
-					"resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
 					"integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
 					"dev": true,
 					"requires": {
@@ -18250,7 +18231,7 @@
 				},
 				"form-data": {
 					"version": "0.2.0",
-					"resolved": "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+					"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
 					"integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
 					"dev": true,
 					"requires": {
@@ -18290,13 +18271,13 @@
 				},
 				"mime-db": {
 					"version": "1.12.0",
-					"resolved": "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
 					"integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
 					"dev": true
 				},
 				"mime-types": {
 					"version": "2.0.14",
-					"resolved": "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
 					"integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
 					"dev": true,
 					"requires": {
@@ -18323,7 +18304,7 @@
 				},
 				"readable-stream": {
 					"version": "1.0.34",
-					"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
 					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
 					"dev": true,
 					"requires": {
@@ -18335,7 +18316,7 @@
 				},
 				"request": {
 					"version": "2.53.0",
-					"resolved": "http://registry.npmjs.org/request/-/request-2.53.0.tgz",
+					"resolved": "https://registry.npmjs.org/request/-/request-2.53.0.tgz",
 					"integrity": "sha1-GAo66St7Y5gC5PlUXdj83rcddgw=",
 					"dev": true,
 					"requires": {
@@ -18374,7 +18355,7 @@
 		},
 		"xolvio-fiber-utils": {
 			"version": "2.0.3",
-			"resolved": "http://registry.npmjs.org/xolvio-fiber-utils/-/xolvio-fiber-utils-2.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/xolvio-fiber-utils/-/xolvio-fiber-utils-2.0.3.tgz",
 			"integrity": "sha1-vsjXDHQGGjFjFbun0w0lyz6C3FA=",
 			"dev": true,
 			"requires": {
@@ -18392,7 +18373,7 @@
 		},
 		"xolvio-jasmine-expect": {
 			"version": "1.1.0",
-			"resolved": "http://registry.npmjs.org/xolvio-jasmine-expect/-/xolvio-jasmine-expect-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/xolvio-jasmine-expect/-/xolvio-jasmine-expect-1.1.0.tgz",
 			"integrity": "sha1-vCud1ghCMR8EV59agtzqaisxnH0=",
 			"dev": true,
 			"requires": {
@@ -18453,7 +18434,7 @@
 		},
 		"yargs": {
 			"version": "3.32.0",
-			"resolved": "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
 			"integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
 			"requires": {
 				"camelcase": "^2.0.1",

From 0da41e351a7d90a0db18cdf293b4737591c32846 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 7 Aug 2019 15:37:00 -0300
Subject: [PATCH 2/4] Hide title-generated tooltips on reaction emojis

---
 app/reactions/client/stylesheets/reaction.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/reactions/client/stylesheets/reaction.css b/app/reactions/client/stylesheets/reaction.css
index cd737daa4880..6b250855e609 100644
--- a/app/reactions/client/stylesheets/reaction.css
+++ b/app/reactions/client/stylesheets/reaction.css
@@ -28,6 +28,7 @@
 					height: 16px;
 					min-height: 16px;
 					margin: -0.2ex 0.15em 0.2ex;
+					pointer-events: none; /* to avoid title attribute to trigger a tooltip */
 				}
 			}
 

From 273b26b57be1a36a447fc4fee3ef78db2216583b Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 7 Aug 2019 16:26:16 -0300
Subject: [PATCH 3/4] Use regular tooltip style for message tooltips

---
 app/reactions/client/stylesheets/reaction.css |  1 +
 app/ui/client/components/tooltip.css          | 29 ++++++++++---------
 app/ui/client/components/tooltip.js           |  4 +--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/reactions/client/stylesheets/reaction.css b/app/reactions/client/stylesheets/reaction.css
index 6b250855e609..b8d6e3897130 100644
--- a/app/reactions/client/stylesheets/reaction.css
+++ b/app/reactions/client/stylesheets/reaction.css
@@ -28,6 +28,7 @@
 					height: 16px;
 					min-height: 16px;
 					margin: -0.2ex 0.15em 0.2ex;
+
 					pointer-events: none; /* to avoid title attribute to trigger a tooltip */
 				}
 			}
diff --git a/app/ui/client/components/tooltip.css b/app/ui/client/components/tooltip.css
index 44184897956a..ac74b1f83793 100644
--- a/app/ui/client/components/tooltip.css
+++ b/app/ui/client/components/tooltip.css
@@ -4,23 +4,23 @@
 
 	visibility: hidden;
 
-	max-width: 400px;
-	padding: 8px 10px;
+	max-width: 25rem;
+	padding: 0.5em 1em;
 
 	transition: opacity 0.3s ease;
 	text-align: center;
 
 	opacity: 0;
-	color: #ffffff;
-	border-radius: 5px;
-	background: #000000;
+	color: var(--tooltip-text-color);
+	border-radius: var(--tooltip-radius);
+	background: var(--tooltip-background);
 
-	font-size: 0.8rem;
+	font-size: var(--tooltip-text-size);
 
 	&.show {
 		visibility: visible;
 
-		opacity: 0.9;
+		opacity: 1;
 	}
 
 	& .tooltip-arrow {
@@ -30,19 +30,20 @@
 
 		width: 0;
 		height: 0;
-		margin-left: -5px;
+		margin-left: -6px;
 
-		border-top: 5px solid #000000;
-		border-right: 5px solid transparent;
-		border-left: 5px solid transparent;
+		border-width: 6px 6px 0;
+		border-style: solid;
+		border-color: var(--tooltip-background) transparent transparent transparent;
 	}
 
-	&.bellow {
+	&.below {
 		& .tooltip-arrow {
-			top: -5px;
+			top: -6px;
+
+			border-color: transparent transparent var(--tooltip-background)  transparent;
 
 			border-top: none;
-			border-bottom: 5px solid #000000;
 		}
 	}
 }
diff --git a/app/ui/client/components/tooltip.js b/app/ui/client/components/tooltip.js
index 2eed2278674a..7e4080711cb7 100644
--- a/app/ui/client/components/tooltip.js
+++ b/app/ui/client/components/tooltip.js
@@ -76,9 +76,9 @@ export const tooltip = {
 
 		if (top < 0) {
 			top = sourcePos.top + $(this.source).outerHeight() + 5;
-			tip.addClass('bellow');
+			tip.addClass('below');
 		} else {
-			tip.removeClass('bellow');
+			tip.removeClass('below');
 		}
 
 		return tip

From 92a3fd222a22a1d96acb16a44a55d3fb3f06eb3b Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Wed, 7 Aug 2019 17:46:18 -0300
Subject: [PATCH 4/4] Expose some functions from tooltip module

---
 app/ui/client/components/tooltip.js | 168 ++++++++++++++--------------
 1 file changed, 86 insertions(+), 82 deletions(-)

diff --git a/app/ui/client/components/tooltip.js b/app/ui/client/components/tooltip.js
index 7e4080711cb7..b0e76384f9e3 100644
--- a/app/ui/client/components/tooltip.js
+++ b/app/ui/client/components/tooltip.js
@@ -4,87 +4,91 @@ import { Blaze } from 'meteor/blaze';
 import './tooltip.html';
 import './tooltip.css';
 
+let initiated = false;
+
+const init = () => {
+	if (initiated) {
+		return;
+	}
+	initiated = true;
+
+	Blaze.render(Template.tooltip, document.body);
+};
+
+let source = null;
+let opened = false;
+let timeout = null;
+
+const placeTip = () => {
+	const arrowSize = 6;
+	const sourceWidth = $(source).outerWidth();
+	const sourceHeight = $(source).outerHeight();
+	let { left, top } = $(source).offset();
+
+	const tip = $('.tooltip');
+	const tipWidth = tip.outerWidth();
+	const tipHeight = tip.outerHeight();
+
+	left = left + (sourceWidth / 2) - (tipWidth / 2);
+
+	$('.tooltip-arrow', tip).css({
+		'margin-left': left < 0 ? `${ left - arrowSize }px` : '',
+	});
+
+	if (left < 0) {
+		left = 0;
+	}
+
+	top = top - tipHeight - arrowSize;
+
+	tip.toggleClass('below', top < 0);
+
+	if (top < 0) {
+		top = top + sourceHeight + arrowSize;
+	}
+
+	return tip.css({
+		left: `${ left }px`,
+		top: `${ top }px`,
+	});
+};
+
+const showElement = (element, sourceElement) => {
+	if (opened) {
+		return;
+	}
+
+	if (timeout) {
+		clearTimeout(timeout);
+	}
+
+	const elementClone = $(element).clone();
+
+	timeout = setTimeout(() => {
+		timeout = null;
+		source = sourceElement;
+
+		$('.tooltip .content').empty().append(elementClone.show());
+		placeTip().addClass('show');
+
+		opened = true;
+	}, 300);
+};
+
+const hide = () => {
+	if (timeout) {
+		clearTimeout(timeout);
+	}
+
+	if (opened) {
+		$('.tooltip').removeClass('show');
+		$('.tooltip .content').empty();
+		opened = false;
+	}
+};
+
 export const tooltip = {
-	source: null,
-	initiated: false,
-	opened: false,
-
-	init() {
-		if (this.initiated) {
-			return;
-		}
-		this.initiated = true;
-
-		Blaze.render(Template.tooltip, document.body);
-	},
-
-	showElement(element, source) {
-		if (this.opened) {
-			return;
-		}
-
-		if (this.timeout) {
-			clearTimeout(this.timeout);
-		}
-
-		this.timeout = setTimeout(() => {
-			this.timeout = null;
-			this.source = source;
-
-			$('.tooltip .content').empty().append($(element).clone().show());
-
-			this.setPosition().addClass('show');
-
-			this.opened = true;
-		}, 300);
-	},
-
-	hide() {
-		if (this.timeout) {
-			clearTimeout(this.timeout);
-		}
-
-		if (this.opened) {
-			$('.tooltip').removeClass('show');
-			$('.tooltip .content').empty();
-			this.opened = false;
-		}
-	},
-
-	setPosition() {
-		const sourcePos = $(this.source).offset();
-
-		const sourceWidth = $(this.source).outerWidth();
-
-		const tip = $('.tooltip');
-
-		let top = sourcePos.top - tip.outerHeight() - 5;
-		let { left } = sourcePos;
-
-		left = left + (sourceWidth / 2) - (tip.outerWidth() / 2);
-
-		if (left < 0) {
-			$('.tooltip .tooltip-arrow').css({
-				'margin-left': `${ left - 5 }px`,
-			});
-			left = 0;
-		} else {
-			$('.tooltip .tooltip-arrow').css({
-				'margin-left': '',
-			});
-		}
-
-		if (top < 0) {
-			top = sourcePos.top + $(this.source).outerHeight() + 5;
-			tip.addClass('below');
-		} else {
-			tip.removeClass('below');
-		}
-
-		return tip
-			.css({
-				top: `${ top }px`,
-				left: `${ left }px`,
-			});
-	},
+	init,
+	showElement,
+	hide,
 };