From c932ebabd9bedc2fc2f728ed3f4a6a44bcddbf9e Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Thu, 23 Nov 2017 18:07:23 -0200 Subject: [PATCH] Fix snippetted messages --- .../.npm/package/npm-shrinkwrap.json | 30 ++++----- .../client/actionButton.js | 4 +- .../client/tabBar/views/snippetMessage.html | 63 ------------------- .../client/tabBar/views/snippetMessage.js | 20 ------ .../tabBar/views/snippetedMessages.html | 18 +++--- .../rocketchat-message-snippet/package.js | 2 - 6 files changed, 28 insertions(+), 109 deletions(-) delete mode 100644 packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.html delete mode 100644 packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json index 2b45ef4db29dc..d4614b928f688 100644 --- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json @@ -2,9 +2,9 @@ "lockfileVersion": 1, "dependencies": { "ajv": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", - "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=" + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz", + "integrity": "sha1-MtHPCNvIDEMvQm8S4QslEfa0ZHQ=" }, "ansi-regex": { "version": "2.1.1", @@ -353,9 +353,9 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, "grpc": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.1.tgz", - "integrity": "sha512-lMgjZUzJx09VL5iCfs7rFagE5htikdv/9VzX/ji3zuwlzAhijqcU47bi5N5lbVw/UB2fxneeYg8sBTfQfd0c4A==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.2.tgz", + "integrity": "sha512-GH6xziNGjW8LAtqQ3HmYI7Tx8BIlr46iaMRXHfh46kkaOP6PNWUx47ULNTUlXSYR3P00d0Pl8uzodTLwPk805w==", "dependencies": { "abbrev": { "version": "1.0.9", @@ -1099,9 +1099,9 @@ "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" }, "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.5.0.tgz", + "integrity": "sha512-v/jMDoK/qKptnTuC3YUNbIj8uUYvTCIHzVu9BHldKSWja48wusAtfjlcBlqnFrqClu3yf69ScDxBPrIyFnF51g==" }, "mime-db": { "version": "1.30.0", @@ -1124,9 +1124,9 @@ "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=" }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=" + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" }, "node-forge": { "version": "0.7.1", @@ -1209,9 +1209,9 @@ "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=" }, "pump": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", - "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", + "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==" }, "pumpify": { "version": "1.3.5", diff --git a/packages/rocketchat-message-snippet/client/actionButton.js b/packages/rocketchat-message-snippet/client/actionButton.js index 9c588caf52930..2e61fe5ecd003 100644 --- a/packages/rocketchat-message-snippet/client/actionButton.js +++ b/packages/rocketchat-message-snippet/client/actionButton.js @@ -8,6 +8,8 @@ Meteor.startup(function() { 'message', 'message-mobile' ], + order: 10, + group: 'menu', action() { const message = this._arguments[1]; @@ -48,7 +50,7 @@ Meteor.startup(function() { return false; } - RocketChat.authz.hasAtLeastOnePermission('snippet-message', message.rid); + return RocketChat.authz.hasAtLeastOnePermission('snippet-message', message.rid); } }); }); diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.html b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.html deleted file mode 100644 index 5afbeb99bde48..0000000000000 --- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.html +++ /dev/null @@ -1,63 +0,0 @@ - - diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js deleted file mode 100644 index d7fe82702d7bf..0000000000000 --- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js +++ /dev/null @@ -1,20 +0,0 @@ -import s from 'underscore.string'; - -import moment from 'moment'; - -Template.snippetMessage.helpers({ - time() { - return moment(this.ts).format(RocketChat.settings.get('Message_TimeFormat')); - }, - date() { - return moment(this.ts).format(RocketChat.settings.get('Message_DateFormat')); - }, - own() { - if (this.u !== undefined && this.u && this.u._id === Meteor.userId()) { - return 'own'; - } - }, - body() { - return `${ s.escapeHTML(this.snippetName) }`; - } -}); diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html index 984c0b5ab8b40..fe36358e7012a 100644 --- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html +++ b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html @@ -1,5 +1,5 @@ diff --git a/packages/rocketchat-message-snippet/package.js b/packages/rocketchat-message-snippet/package.js index b8b928ca95ea6..71f65b2c94e09 100644 --- a/packages/rocketchat-message-snippet/package.js +++ b/packages/rocketchat-message-snippet/package.js @@ -45,9 +45,7 @@ Package.onUse(function(api) { 'client/page/snippetPage.js', 'client/tabBar/tabBar.js', 'client/tabBar/views/snippetedMessages.html', - 'client/tabBar/views/snippetMessage.html', 'client/tabBar/views/snippetedMessages.js', - 'client/tabBar/views/snippetMessage.js', 'client/page/stylesheets/snippetPage.css' ], 'client');