From 337b43591be1c784e7945215eeaeb014d71297fb Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Fri, 4 Apr 2014 15:44:11 -0700 Subject: [PATCH] Fix webm PDF bug Conflicts: builds/4chan-X.user.js builds/crx/script.js --- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/Miscellaneous/FileInfo.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 3241c6673..5c3037692 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -11168,7 +11168,7 @@ return FileInfo.convertUnit(this.file.sizeInBytes, 'MB'); }, r: function() { - if (this.file.isImage) { + if (this.file.isImage || this.file.isVideo) { return this.file.dimensions; } else { return 'PDF'; diff --git a/builds/crx/script.js b/builds/crx/script.js index ba5996c5d..a402c05e9 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -11171,7 +11171,7 @@ return FileInfo.convertUnit(this.file.sizeInBytes, 'MB'); }, r: function() { - if (this.file.isImage) { + if (this.file.isImage || this.file.isVideo) { return this.file.dimensions; } else { return 'PDF'; diff --git a/src/Miscellaneous/FileInfo.coffee b/src/Miscellaneous/FileInfo.coffee index e58f9faef..b637ba489 100755 --- a/src/Miscellaneous/FileInfo.coffee +++ b/src/Miscellaneous/FileInfo.coffee @@ -47,4 +47,4 @@ FileInfo = B: -> FileInfo.convertUnit @file.sizeInBytes, 'B' K: -> FileInfo.convertUnit @file.sizeInBytes, 'KB' M: -> FileInfo.convertUnit @file.sizeInBytes, 'MB' - r: -> if @file.isImage then @file.dimensions else 'PDF' + r: -> if @file.isImage or @file.isVideo then @file.dimensions else 'PDF'