From e30ed11ae6296b24e3e7ac8c9356ebaeedd36eb0 Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Fri, 26 May 2017 14:05:10 -0300 Subject: [PATCH 1/2] Fix clipboard --- packages/rocketchat-lib/client/MessageAction.js | 5 +++-- packages/rocketchat-message-pin/client/actionButton.js | 2 +- packages/rocketchat-message-star/client/actionButton.js | 2 +- packages/rocketchat-ui-master/package.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 51ad67e3fa57..e85db33b0609 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -211,13 +211,14 @@ Meteor.startup(function() { i18nLabel: 'Permalink', classes: 'clipboard', context: ['message', 'message-mobile'], - action() { + action(event) { const message = this._arguments[1]; const permalink = RocketChat.MessageAction.getPermaLink(message._id); RocketChat.MessageAction.hideDropDown(); if (Meteor.isCordova) { cordova.plugins.clipboard.copy(permalink); } else { + console.log('permalink', $(event.currentTarget)); $(event.currentTarget).attr('data-clipboard-text', permalink); } return toastr.success(TAPi18n.__('Copied')); @@ -238,7 +239,7 @@ Meteor.startup(function() { i18nLabel: 'Copy', classes: 'clipboard', context: ['message', 'message-mobile'], - action() { + action(event) { const message = this._arguments[1].msg; RocketChat.MessageAction.hideDropDown(); if (Meteor.isCordova) { diff --git a/packages/rocketchat-message-pin/client/actionButton.js b/packages/rocketchat-message-pin/client/actionButton.js index 826f33f9fbe0..5e77c3fb7308 100644 --- a/packages/rocketchat-message-pin/client/actionButton.js +++ b/packages/rocketchat-message-pin/client/actionButton.js @@ -79,7 +79,7 @@ Meteor.startup(function() { i18nLabel: 'Permalink', classes: 'clipboard', context: ['pinned'], - action() { + action(event) { const message = this._arguments[1]; RocketChat.MessageAction.hideDropDown(); $(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id)); diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js index 64faa7b24bad..cbcbc64f1522 100644 --- a/packages/rocketchat-message-star/client/actionButton.js +++ b/packages/rocketchat-message-star/client/actionButton.js @@ -70,7 +70,7 @@ Meteor.startup(function() { i18nLabel: 'Permalink', classes: 'clipboard', context: ['starred'], - action() { + action(event) { const message = this._arguments[1]; RocketChat.MessageAction.hideDropDown(); $(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id)); diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js index 9ed815f8b0b6..4a0509d0723d 100644 --- a/packages/rocketchat-ui-master/package.js +++ b/packages/rocketchat-ui-master/package.js @@ -11,7 +11,7 @@ Package.describe({ }); Npm.depends({ - 'clipboard': '1.5.12' + clipboard: '1.6.1' }); Package.onUse(function(api) { From 997da21928bc7a9c1bc7b3cb2c5ca96ac16f7b52 Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Fri, 26 May 2017 14:27:50 -0300 Subject: [PATCH 2/2] remove console.log --- packages/rocketchat-lib/client/MessageAction.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index e85db33b0609..5dd9021a8b60 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -218,7 +218,6 @@ Meteor.startup(function() { if (Meteor.isCordova) { cordova.plugins.clipboard.copy(permalink); } else { - console.log('permalink', $(event.currentTarget)); $(event.currentTarget).attr('data-clipboard-text', permalink); } return toastr.success(TAPi18n.__('Copied'));