[IMPROVE] Move pathFor helper to templateHelpers directory (#15255)

client/main.js

@@ -7,9 +7,7 @@ import '../imports/startup/client';
 import '../lib/RegExp';
 
 import './lib/toastr';
-import './helpers/escapeCssUrl';
-import './helpers/log';
-import './helpers/not';
+import './templateHelpers';
 import './methods/deleteMessage';
 import './methods/hideRoom';
 import './methods/openRoom';

client/routes/router.js

@@ -11,10 +11,6 @@ import { Session } from 'meteor/session';
 
 import { KonchatNotification } from '../../app/ui';
 
-Blaze.registerHelper('pathFor', function(path, kw) {
-	return FlowRouter.path(path, kw.hash);
-});
-
 BlazeLayout.setRoot('body');
 
 const createTemplateForComponent = async (

client/templateHelpers/index.js

@@ -0,0 +1,4 @@
+import './escapeCssUrl';
+import './log';
+import './not';
+import './pathFor';

client/templateHelpers/pathFor.js

@@ -0,0 +1,5 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+
+
+Template.registerHelper('pathFor', (path, { hash }) => FlowRouter.path(path, hash));

package-lock.json

@@ -4948,7 +4948,7 @@
 		},
 		"colors": {
 			"version": "1.1.2",
-			"resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
 			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
 			"dev": true
 		},
@@ -6199,6 +6199,11 @@
 			"resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
 			"integrity": "sha1-BpYswKRCFnWbo7mOOyV3wM4w/Aw="
 		},
+		"emitter-component": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.1.tgz",
+			"integrity": "sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY="
+		},
 		"emojione": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/emojione/-/emojione-4.5.0.tgz",
@@ -8444,7 +8449,7 @@
 		},
 		"get-stream": {
 			"version": "3.0.0",
-			"resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
 			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
 		},
 		"get-value": {
@@ -9544,6 +9549,11 @@
 				"pify": "^3.0.0"
 			}
 		},
+		"hammerjs": {
+			"version": "2.0.8",
+			"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+			"integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+		},
 		"hapi": {
 			"version": "8.8.0",
 			"resolved": "https://registry.npmjs.org/hapi/-/hapi-8.8.0.tgz",
@@ -11602,6 +11612,11 @@
 				}
 			}
 		},
+		"keycharm": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.2.0.tgz",
+			"integrity": "sha1-+m6i5DuQpoAohD0n8gddNajD5vk="
+		},
 		"keypress": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz",
@@ -12744,7 +12759,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",
@@ -12766,7 +12781,7 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -12915,7 +12930,7 @@
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 			"requires": {
 				"brace-expansion": "^1.1.7"
 			}
@@ -13832,7 +13847,7 @@
 		"npmlog": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 			"requires": {
 				"are-we-there-yet": "~1.1.2",
 				"console-control-strings": "~1.1.0",
@@ -14525,7 +14540,7 @@
 				},
 				"tough-cookie": {
 					"version": "2.3.4",
-					"resolved": "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
 					"integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
 					"dev": true,
 					"requires": {
@@ -15481,6 +15496,14 @@
 				"react-is": "^16.8.1"
 			}
 		},
+		"propagating-hammerjs": {
+			"version": "1.4.7",
+			"resolved": "https://registry.npmjs.org/propagating-hammerjs/-/propagating-hammerjs-1.4.7.tgz",
+			"integrity": "sha512-oW9Wd+W2Tp5uOz6Fh4mEU7p+FoyU85smLH/mPga83Loh0pHa6AH4ZHGywvwMk3TWP31l7iUsvJyW265p4Ipwrg==",
+			"requires": {
+				"hammerjs": "^2.0.8"
+			}
+		},
 		"protobufjs": {
 			"version": "6.8.8",
 			"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz",
@@ -15802,7 +15825,7 @@
 				},
 				"pify": {
 					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
 					"dev": true
 				}
@@ -18829,6 +18852,18 @@
 				"unist-util-stringify-position": "^1.1.1"
 			}
 		},
+		"vis": {
+			"version": "4.21.0",
+			"resolved": "https://registry.npmjs.org/vis/-/vis-4.21.0.tgz",
+			"integrity": "sha1-3XFji/9/ZJXQC8n0DCU1JhM97Ws=",
+			"requires": {
+				"emitter-component": "^1.1.1",
+				"hammerjs": "^2.0.8",
+				"keycharm": "^0.2.0",
+				"moment": "^2.18.1",
+				"propagating-hammerjs": "^1.4.6"
+			}
+		},
 		"vm-browserify": {
 			"version": "0.0.4",
 			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",