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

Merge pull request #2787 from evazion/fix-video_with_sound-blacklists

Browse Source 
Prevent video_with_sound posts from autoplaying when blacklisted.
This commit is contained in:
Albert Yi
2016-12-19 13:10:23 -08:00
committed by GitHub
parent 66384d78a7 5d0e950cdb
commit aa5e65129b
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/assets/javascripts/blacklists.js
View File

@@ -43,9 +43,9 @@
if (match) {
match.disabled = !match.disabled;
if (match.disabled) {
$(e.target).addClass("blacklisted-active");
Danbooru.Blacklist.post_hide(e.target);
} else {
$(e.target).removeClass("blacklisted-active");
Danbooru.Blacklist.post_unhide(e.target);
}
}
Danbooru.Blacklist.apply();
@@ -121,7 +121,7 @@
if (post_count > 0) {
Danbooru.Blacklist.post_hide(post);
} else {
$(post).removeClass("blacklisted-active");
Danbooru.Blacklist.post_unhide(post);
}
});
@@ -157,6 +157,22 @@
Danbooru.Blacklist.post_hide = function(post) {
var $post = $(post);
$post.addClass("blacklisted").addClass("blacklisted-active");
var $video = $post.find("video").get(0);
if ($video) {
$video.pause();
$video.currentTime = 0;
}
}
Danbooru.Blacklist.post_unhide = function(post) {
var $post = $(post);
$post.addClass("blacklisted").removeClass("blacklisted-active");
var $video = $post.find("video").get(0);
if ($video) {
$video.play();
}
}
Danbooru.Blacklist.initialize_all = function() {