Skip to content

Commit

Permalink
Merge pull request #7103 from RocketChat/fix-clipboard
Browse files Browse the repository at this point in the history
[FIX] clipboard (permalink, copy, pin, star buttons)
  • Loading branch information
engelgabriel committed May 26, 2017
2 parents b7f7752 + 997da21 commit db603a9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions packages/rocketchat-lib/client/MessageAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ 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();
Expand All @@ -238,7 +238,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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-message-pin/client/actionButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-message-star/client/actionButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-master/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Package.describe({
});

Npm.depends({
'clipboard': '1.5.12'
clipboard: '1.6.1'
});

Package.onUse(function(api) {
Expand Down

0 comments on commit db603a9

Please sign in to comment.