From 89478b9aa4461859cb739e25e9d0b8dfb3f4aaea Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Sat, 22 Aug 2015 00:45:07 -0300 Subject: [PATCH] Prevent download of images in phone and allow click to download --- client/stylesheets/base.less | 17 +++++++++++++++++ client/views/app/room.coffee | 3 +++ .../client/oembedImageWidget.coffee | 3 +++ .../client/oembedImageWidget.html | 17 ++++++++++++----- packages/rocketchat-oembed/package.js | 1 + 5 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 packages/rocketchat-oembed/client/oembedImageWidget.coffee diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less index 3e3796d64279..7c9aa70e3ad9 100644 --- a/client/stylesheets/base.less +++ b/client/stylesheets/base.less @@ -1988,6 +1988,23 @@ a.github-fork { } } +.image-to-download { + background-color: #fafafa; + border-radius: 6px; + border: 1px dashed #ddd; + padding: 20px 15px; + margin-bottom: 5px; + display: inline-block; + text-transform: uppercase; + color: #aaa; + text-align: center; + cursor: pointer; + + i { + font-size: 24px; + } +} + .upload-progress { position: absolute; top: 60px; diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee index fdb662412260..ade4ad6380ca 100644 --- a/client/views/app/room.coffee +++ b/client/views/app/room.coffee @@ -518,6 +518,9 @@ Template.room.events Session.set('flexOpened', true) Session.set('showUserInfo', $(e.currentTarget).data('username')) + 'click .image-to-download': (event) -> + ChatMessage.update {_id: this._arguments[1]._id, 'urls.url': $(event.currentTarget).data('url')}, {$set: {'urls.$.downloadImages': true}} + 'click .delete-message': (event) -> message = @_arguments[1] msg = event.currentTarget.parentNode.parentNode diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.coffee b/packages/rocketchat-oembed/client/oembedImageWidget.coffee new file mode 100644 index 000000000000..4a4089af0fbd --- /dev/null +++ b/packages/rocketchat-oembed/client/oembedImageWidget.coffee @@ -0,0 +1,3 @@ +Template.oembedImageWidget.helpers + showImage: -> + return @downloadImages is true or not Meteor.Device.isPhone() \ No newline at end of file diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.html b/packages/rocketchat-oembed/client/oembedImageWidget.html index 27ca5c3b6773..39231aed7d8a 100644 --- a/packages/rocketchat-oembed/client/oembedImageWidget.html +++ b/packages/rocketchat-oembed/client/oembedImageWidget.html @@ -1,9 +1,16 @@ diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js index d17ed9f76cef..ceefbe83b725 100644 --- a/packages/rocketchat-oembed/package.js +++ b/packages/rocketchat-oembed/package.js @@ -18,6 +18,7 @@ Package.onUse(function(api) { api.addFiles('client/baseWidget.coffee', 'client'); api.addFiles('client/oembedImageWidget.html', 'client'); + api.addFiles('client/oembedImageWidget.coffee', 'client'); api.addFiles('client/oembedAudioWidget.html', 'client');