jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2790 from evazion/fix-upload-resizer

Browse Source 
Fix upload preview image displayed at full size (fixes #1375, #2471)
This commit is contained in:
Albert Yi
2016-12-19 13:08:04 -08:00
committed by GitHub
parent 3e285ea4ce 78ca92c981
commit f3c8708c82
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/uploads.js
View File

@@ -8,7 +8,7 @@
} }
if ($("#c-uploads").length) { if ($("#c-uploads").length) {
this.initialize_image(); $("#image").load(this.initialize_image);
this.initialize_info_bookmarklet(); this.initialize_info_bookmarklet();
this.initialize_similar(); this.initialize_similar();
$("#related-tags-button").trigger("click"); $("#related-tags-button").trigger("click");
@@ -128,11 +128,6 @@
$("#scale").html("Scaled " + parseInt(100 * ratio) + "% (original: " + origin_width + "x" + origin_height + ")"); $("#scale").html("Scaled " + parseInt(100 * ratio) + "% (original: " + origin_width + "x" + origin_height + ")");
} }
}); });
} else if (height === 0) {
if (!this.tries || this.tries < 10) {
this.tries = (this.tries || 0) + 1;
window.setTimeout(Danbooru.Upload.initialize_image, 200);
}
} else { } else {
$("#scale").html("(original: " + width + "x" + height + ")"); $("#scale").html("(original: " + width + "x" + height + ")");
} }