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

disable gestures after expanding image to full size

Browse Source
This commit is contained in:
r888888888
2017-10-09 14:03:12 -07:00
parent e3529b827f
commit 12a815a53b
1 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/assets/javascripts/posts.js
View File

@@ -46,7 +46,6 @@
if (!window.matchMedia) { if (!window.matchMedia) {
return; return;
} }
var mq = window.matchMedia('(max-width: 660px)'); var mq = window.matchMedia('(max-width: 660px)');
if (!mq.matches) { if (!mq.matches) {
return; return;
@@ -54,7 +53,7 @@
var hasPrev = $("#a-show").length || $(".paginator a[rel~=prev]").length; var hasPrev = $("#a-show").length || $(".paginator a[rel~=prev]").length;
var hasNext = $("#a-index").length && $(".paginator a[rel~=next]").length; var hasNext = $("#a-index").length && $(".paginator a[rel~=next]").length;
$("body").hammer().bind("panend", function(e) { $body.hammer().bind("panend", function(e) {
var percentage = e.gesture.deltaX / window.innerWidth; var percentage = e.gesture.deltaX / window.innerWidth;
var swipe = Math.abs(e.gesture.velocityX) > 0.6; var swipe = Math.abs(e.gesture.velocityX) > 0.6;
if (Math.abs(e.gesture.deltaY) > 75) { if (Math.abs(e.gesture.deltaY) > 75) {
@@ -339,46 +338,38 @@
$img.attr("title", $post.attr("data-tags") + " user:" + $post.attr("data-uploader").replace(/_/g, " ") + " rating:" + $post.data("rating") + score); $img.attr("title", $post.attr("data-tags") + " user:" + $post.attr("data-uploader").replace(/_/g, " ") + " rating:" + $post.data("rating") + score);
} }
Danbooru.Post.initialize_post_image_resize_links = function() { Danbooru.Post.expand_image = function(e) {
$("#image-resize-link").click(function(e) { var $link = $(e.target);
var $link = $(e.target); var $image = $("#image");
var $image = $("#image"); var $notice = $("#image-resize-notice");
var $notice = $("#image-resize-notice"); $image.attr("src", $link.attr("href"));
$image.attr("src", $link.attr("href")); $image.css("opacity", "0.25");
$image.css("opacity", "0.25"); $image.width($image.data("original-width"));
$image.width($image.data("original-width")); $image.height($image.data("original-height"));
$image.height($image.data("original-height")); $image.on("load", function() {
$image.on("load", function() { $image.css("opacity", "1");
$image.css("opacity", "1"); $notice.hide();
$notice.hide();
});
$notice.children().eq(0).hide();
$notice.children().eq(1).show(); // Loading message
Danbooru.Note.Box.scale_all();
$image.data("scale-factor", 1);
e.preventDefault();
}); });
$notice.children().eq(0).hide();
$notice.children().eq(1).show(); // Loading message
Danbooru.Note.Box.scale_all();
$image.data("scale-factor", 1);
if ($("body").data("hammer")) {
$("#image-container").css({overflow: "scroll"});
$("body").data("hammer").set({enable: false});
}
e.preventDefault();
}
Danbooru.Post.initialize_post_image_resize_links = function() {
$("#image-resize-link").click(Danbooru.Post.expand_image);
if ($("#image-resize-notice").length) { if ($("#image-resize-notice").length) {
Danbooru.keydown("v", "resize", function(e) { Danbooru.keydown("v", "resize", function(e) {
if ($("#image-resize-notice").is(":visible")) { if ($("#image-resize-notice").is(":visible")) {
$("#image-resize-link").click(); $("#image-resize-link").click();
} else { } else {
var $image = $("#image"); Danbooru.Post.expand_image(e);
var $notice = $("#image-resize-notice");
$image.attr("src", $("#image-container").data("large-file-url"));
$image.css("opacity", "0.25");
$image.width($image.data("large-width"));
$image.height($image.data("large-height"));
$notice.children().eq(0).show();
$notice.children().eq(1).hide(); // Loading message
$image.on("load", function() {
$image.css("opacity", "1");
$notice.show();
});
Danbooru.Note.Box.scale_all();
$image.data("scale-factor", 1);
e.preventDefault();
} }
}); });
} }
@@ -399,8 +390,8 @@
$img.css("width", $img.data("original-width") * ratio); $img.css("width", $img.data("original-width") * ratio);
$img.css("height", $img.data("original-height") * ratio); $img.css("height", $img.data("original-height") * ratio);
Danbooru.Post.resize_ugoira_controls(); Danbooru.Post.resize_ugoira_controls();
$("#image-container").css({overflow: "visible"});
if ($("body").data("hammer")) { if ($("body").data("hammer")) {
$("#image-container").css({overflow: "visible"});
$("body").data("hammer").set({enable: true}); $("body").data("hammer").set({enable: true});
} }
} }
@@ -409,8 +400,8 @@
$img.width($img.data("original-width")); $img.width($img.data("original-width"));
$img.height($img.data("original-height")); $img.height($img.data("original-height"));
Danbooru.Post.resize_ugoira_controls(); Danbooru.Post.resize_ugoira_controls();
$("#image-container").css({overflow: "scroll"});
if ($("body").data("hammer")) { if ($("body").data("hammer")) {
$("#image-container").css({overflow: "scroll"});
$("body").data("hammer").set({enable: false}); $("body").data("hammer").set({enable: false});
} }
} }