From e30ed11ae6296b24e3e7ac8c9356ebaeedd36eb0 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karlprieb@gmail.com>
Date: Fri, 26 May 2017 14:05:10 -0300
Subject: [PATCH] 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 51ad67e3fa5..e85db33b060 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 826f33f9fbe..5e77c3fb730 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 64faa7b24ba..cbcbc64f152 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 9ed815f8b0b..4a0509d0723 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) {
--
GitLab