Fix up unsupported attachment rendering

Rather than simply displaying an inactionable error, render a link that
allows the user to save the unsupported attachment.

// FREEBIE
This commit is contained in:
lilia 2015-12-21 17:36:33 -08:00
parent 239ec8e318
commit 881aa1685d
4 changed files with 46 additions and 28 deletions

View file

@ -4,8 +4,24 @@
(function () { (function () {
'use strict'; 'use strict';
Whisper.FileTypeToast = Whisper.ToastView.extend({ var FileView = Backbone.View.extend({
template: $('#attachment-type-modal').html() tagName: 'a',
initialize: function(dataUrl) {
this.dataUrl = dataUrl;
this.$el.text("Unsupported attachment type. Click to save.");
},
events: {
'click': 'open'
},
open: function (e) {
e.preventDefault();
window.open(this.dataUrl, '_blank');
},
render: function() {
this.$el.attr('href', this.dataUrl);
this.trigger('update');
return this;
}
}); });
var ImageView = Backbone.View.extend({ var ImageView = Backbone.View.extend({
@ -58,33 +74,18 @@
className: 'attachment', className: 'attachment',
render: function() { render: function() {
var View; var View;
var isUnsupportedType = false;
switch(this.model.contentType.split('/')[0]) { switch(this.model.contentType.split('/')[0]) {
case 'image': View = ImageView; break; case 'image': View = ImageView; break;
case 'audio': View = AudioView; break; case 'audio': View = AudioView; break;
case 'video': View = VideoView; break; case 'video': View = VideoView; break;
default: default : View = FileView; break;
isUnsupportedType = true;
} }
var blob = new Blob([this.model.data], {type: this.model.contentType});
if (isUnsupportedType) { var view = new View(window.URL.createObjectURL(blob), this.model.contentType);
var toast = new Whisper.FileTypeToast({ view.$el.appendTo(this.$el);
model: {type: this.model.contentType.split('/')[0]} view.on('update', this.trigger.bind(this, 'update'));
}); view.render();
toast.$el.insertAfter(this.$el); return this;
toast.render();
return toast;
} else {
var blob = new Blob([this.model.data], {type: this.model.contentType});
var view = new View(window.URL.createObjectURL(blob), this.model.contentType);
view.$el.appendTo(this.$el);
view.render();
view.on('update', this.trigger.bind(this, 'update'));
return this;
}
},
deleteView: function(e) {
if (e) { e.stopPropagation(); }
} }
}); });

View file

@ -100,12 +100,13 @@
}, },
loadAttachments: function() { loadAttachments: function() {
this.model.get('attachments').forEach(function(attachment) { this.model.get('attachments').forEach(function(attachment) {
var view = new Whisper.AttachmentView({ model: attachment }).render(); var view = new Whisper.AttachmentView({ model: attachment });
this.listenTo(view, 'update', function() { this.listenTo(view, 'update', function() {
this.trigger('beforeChangeHeight'); this.trigger('beforeChangeHeight');
this.$('.attachments').append(view.el); this.$('.attachments').append(view.el);
this.trigger('afterChangeHeight'); this.trigger('afterChangeHeight');
}); });
view.render();
}.bind(this)); }.bind(this));
} }
}); });

View file

@ -365,11 +365,12 @@
border-left: 8px solid $blue; border-left: 8px solid $blue;
} }
.content { .attachments, .content {
a { a {
color: $grey_l; color: $grey_l;
} }
}
.content {
&::selection, a::selection { &::selection, a::selection {
color: $grey_d; color: $grey_d;
background: white; background: white;
@ -396,6 +397,13 @@
} }
.attachments { .attachments {
a {
font-style: italic;
display: block;
padding: 1em;
background-color: #ccc;
}
img, audio, video { img, audio, video {
max-width: 100%; max-width: 100%;
max-height: 300px; max-height: 300px;
@ -409,6 +417,7 @@
img { img {
cursor: pointer; cursor: pointer;
} }
} }
.outgoing .avatar { .outgoing .avatar {

View file

@ -852,7 +852,8 @@ input.search {
.message-list .outgoing .bubble::after { .message-list .outgoing .bubble::after {
right: -8px; right: -8px;
border-left: 8px solid #2090ea; } border-left: 8px solid #2090ea; }
.message-detail .outgoing .bubble .content a, .message-detail .outgoing .bubble .attachments a, .message-detail .outgoing .bubble .content a,
.message-list .outgoing .bubble .attachments a,
.message-list .outgoing .bubble .content a { .message-list .outgoing .bubble .content a {
color: #f3f3f3; } color: #f3f3f3; }
.message-detail .outgoing .bubble .content::selection, .message-detail .outgoing .bubble .content a::selection, .message-detail .outgoing .bubble .content::selection, .message-detail .outgoing .bubble .content a::selection,
@ -872,6 +873,12 @@ input.search {
.message-list .control .bubble::before, .message-list .control .bubble::before,
.message-list .control .bubble::after { .message-list .control .bubble::after {
display: none; } display: none; }
.message-detail .attachments a,
.message-list .attachments a {
font-style: italic;
display: block;
padding: 1em;
background-color: #ccc; }
.message-detail .attachments img, .message-detail .attachments audio, .message-detail .attachments video, .message-detail .attachments img, .message-detail .attachments audio, .message-detail .attachments video,
.message-list .attachments img, .message-list .attachments img,
.message-list .attachments audio, .message-list .attachments audio,