js: drop jquery-timeout plugin.
Replace with `Danbooru.Utility.delay`.
This commit is contained in:
@@ -67,16 +67,18 @@ Post.initialize_gestures = function() {
|
|||||||
$body.data("hammer", hammer);
|
$body.data("hammer", hammer);
|
||||||
|
|
||||||
if (hasPrev) {
|
if (hasPrev) {
|
||||||
hammer.on("swiperight", function(e) {
|
hammer.on("swiperight", async function(e) {
|
||||||
$("body").css({"transition-timing-function": "ease", "transition-duration": "0.2s", "opacity": "0", "transform": "translateX(150%)"});
|
$("body").css({"transition-timing-function": "ease", "transition-duration": "0.2s", "opacity": "0", "transform": "translateX(150%)"});
|
||||||
$.timeout(200).done(function() {Post.swipe_prev(e)});
|
await Danbooru.Utility.delay(200);
|
||||||
|
Post.swipe_prev(e);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hasNext) {
|
if (hasNext) {
|
||||||
hammer.on("swipeleft", function(e) {
|
hammer.on("swipeleft", async function(e) {
|
||||||
$("body").css({"transition-timing-function": "ease", "transition-duration": "0.2s", "opacity": "0", "transform": "translateX(-150%)"});
|
$("body").css({"transition-timing-function": "ease", "transition-duration": "0.2s", "opacity": "0", "transform": "translateX(-150%)"});
|
||||||
$.timeout(200).done(function() {Post.swipe_next(e)});
|
await Danbooru.Utility.delay(200);
|
||||||
|
Post.swipe_next(e);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
let Utility = {};
|
let Utility = {};
|
||||||
|
|
||||||
|
Utility.delay = function(milliseconds) {
|
||||||
|
return new Promise(resolve => setTimeout(resolve, milliseconds));
|
||||||
|
}
|
||||||
|
|
||||||
Utility.meta = function(key) {
|
Utility.meta = function(key) {
|
||||||
return $("meta[name=" + key + "]").attr("content");
|
return $("meta[name=" + key + "]").attr("content");
|
||||||
}
|
}
|
||||||
|
|||||||
47
app/javascript/vendor/jquery-timeout.js
vendored
47
app/javascript/vendor/jquery-timeout.js
vendored
@@ -1,47 +0,0 @@
|
|||||||
/**
|
|
||||||
* jquery.timeout.js
|
|
||||||
*
|
|
||||||
* Copyright (c) 2011 Thomas Kemmer <tkemmer@computer.org>
|
|
||||||
*
|
|
||||||
* http://code.google.com/p/jquery-timeout/
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person
|
|
||||||
* obtaining a copy of this software and associated documentation
|
|
||||||
* files (the "Software"), to deal in the Software without
|
|
||||||
* restriction, including without limitation the rights to use, copy,
|
|
||||||
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be
|
|
||||||
* included in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
;(function($) {
|
|
||||||
$.timeout = function(delay) {
|
|
||||||
var deferred = $.Deferred(function(deferred) {
|
|
||||||
deferred.timeoutID = window.setTimeout(function() {
|
|
||||||
deferred.resolve();
|
|
||||||
}, delay);
|
|
||||||
|
|
||||||
deferred.fail(function() {
|
|
||||||
window.clearTimeout(deferred.timeoutID);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return $.extend(deferred.promise(), {
|
|
||||||
clear: function() {
|
|
||||||
deferred.reject();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
})(jQuery);
|
|
||||||
@@ -1,8 +1,5 @@
|
|||||||
$("#add-to-favorites, #add-fav-button, #remove-from-favorites, #remove-fav-button").toggle();
|
$("#add-to-favorites, #add-fav-button, #remove-from-favorites, #remove-fav-button").toggle();
|
||||||
$("#remove-fav-button").addClass("animate");
|
$("#remove-fav-button").addClass("animate");
|
||||||
$.timeout(30000, function() {
|
|
||||||
$("#remove-fav-button").removeClass("animate");
|
|
||||||
});
|
|
||||||
$("#score-for-post-<%= @post.id %>").text(<%= @post.score %>);
|
$("#score-for-post-<%= @post.id %>").text(<%= @post.score %>);
|
||||||
$("#favcount-for-post-<%= @post.id %>").text(<%= @post.fav_count %>);
|
$("#favcount-for-post-<%= @post.id %>").text(<%= @post.fav_count %>);
|
||||||
$(".fav-buttons").toggleClass("fav-buttons-false").toggleClass("fav-buttons-true");
|
$(".fav-buttons").toggleClass("fav-buttons-false").toggleClass("fav-buttons-true");
|
||||||
|
|||||||
Reference in New Issue
Block a user