diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-12-11 13:33:33 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-12-11 13:33:33 +0900 |
| commit | e36a7081324b9e538ae40918072edd93ebc9b2cb (patch) | |
| tree | 98983f6f3d37f55627f2fedcb6ebb7cde9b902a6 /src/web/app/mobile | |
| parent | Fix bug (diff) | |
| download | misskey-e36a7081324b9e538ae40918072edd93ebc9b2cb.tar.gz misskey-e36a7081324b9e538ae40918072edd93ebc9b2cb.tar.bz2 misskey-e36a7081324b9e538ae40918072edd93ebc9b2cb.zip | |
#986
Diffstat (limited to 'src/web/app/mobile')
| -rw-r--r-- | src/web/app/mobile/tags/drive/file-viewer.tag | 7 | ||||
| -rw-r--r-- | src/web/app/mobile/tags/drive/file.tag | 6 | ||||
| -rw-r--r-- | src/web/app/mobile/tags/images.tag | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/web/app/mobile/tags/drive/file-viewer.tag b/src/web/app/mobile/tags/drive/file-viewer.tag index 48fc83fa67..259873d95c 100644 --- a/src/web/app/mobile/tags/drive/file-viewer.tag +++ b/src/web/app/mobile/tags/drive/file-viewer.tag @@ -1,6 +1,11 @@ <mk-drive-file-viewer> <div class="preview"> - <img if={ kind == 'image' } src={ file.url } alt={ file.name } title={ file.name } onload={ onImageLoaded } ref="img"> + <img if={ kind == 'image' } ref="img" + src={ file.url } + alt={ file.name } + title={ file.name } + onload={ onImageLoaded } + style="background-color:rgb({ file.properties.average_color.join(',') })"> <virtual if={ kind != 'image' }>%fa:file%</virtual> <footer if={ kind == 'image' && file.properties && file.properties.width && file.properties.height }> <span class="size"> diff --git a/src/web/app/mobile/tags/drive/file.tag b/src/web/app/mobile/tags/drive/file.tag index 196dd1141e..684df7dd08 100644 --- a/src/web/app/mobile/tags/drive/file.tag +++ b/src/web/app/mobile/tags/drive/file.tag @@ -1,7 +1,7 @@ <mk-drive-file data-is-selected={ isSelected }> <a onclick={ onclick } href="/i/drive/file/{ file.id }"> <div class="container"> - <div class="thumbnail" style={ 'background-image: url(' + file.url + '?thumbnail&size=128)' }></div> + <div class="thumbnail" style={ thumbnail }></div> <div class="body"> <p class="name"><span>{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }</span><span class="ext" if={ file.name.lastIndexOf('.') != -1 }>{ file.name.substr(file.name.lastIndexOf('.')) }</span></p> <!-- @@ -132,6 +132,10 @@ this.browser = this.parent; this.file = this.opts.file; + this.thumbnail = { + 'background-color': this.file.properties.average_color ? `rgb(${this.file.properties.average_color.join(',')})` : 'transparent', + 'background-image': `url(${this.file.url}?thumbnail&size=128)` + }; this.isSelected = this.browser.selectedFiles.some(f => f.id == this.file.id); this.browser.on('change-selection', selections => { diff --git a/src/web/app/mobile/tags/images.tag b/src/web/app/mobile/tags/images.tag index aaa80e4fd1..b200eefe7e 100644 --- a/src/web/app/mobile/tags/images.tag +++ b/src/web/app/mobile/tags/images.tag @@ -56,7 +56,7 @@ </mk-images> <mk-images-image> - <a ref="view" href={ image.url } target="_blank" style={ 'background-image: url(' + image.url + '?thumbnail&size=512' } title={ image.name }></a> + <a ref="view" href={ image.url } target="_blank" style={ styles } title={ image.name }></a> <style> :scope display block @@ -74,5 +74,9 @@ </style> <script> this.image = this.opts.image; + this.styles = { + 'background-color': `rgb(${this.image.properties.average_color.join(',')})`, + 'background-image': `url(${this.image.url}?thumbnail&size=512)` + }; </script> </mk-images-image> |