diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb index 78636f5bb..13f41a7c5 100644 --- a/app/javascript/src/javascripts/posts.js.erb +++ b/app/javascript/src/javascripts/posts.js.erb @@ -67,16 +67,18 @@ Post.initialize_gestures = function() { $body.data("hammer", hammer); 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%)"}); - $.timeout(200).done(function() {Post.swipe_prev(e)}); + await Danbooru.Utility.delay(200); + Post.swipe_prev(e); }); } 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%)"}); - $.timeout(200).done(function() {Post.swipe_next(e)}); + await Danbooru.Utility.delay(200); + Post.swipe_next(e); }); } } diff --git a/app/javascript/src/javascripts/utility.js b/app/javascript/src/javascripts/utility.js index 802855e17..cd1488e76 100644 --- a/app/javascript/src/javascripts/utility.js +++ b/app/javascript/src/javascripts/utility.js @@ -1,5 +1,9 @@ let Utility = {}; +Utility.delay = function(milliseconds) { + return new Promise(resolve => setTimeout(resolve, milliseconds)); +} + Utility.meta = function(key) { return $("meta[name=" + key + "]").attr("content"); } diff --git a/app/javascript/vendor/jquery-timeout.js b/app/javascript/vendor/jquery-timeout.js deleted file mode 100644 index 71fceca33..000000000 --- a/app/javascript/vendor/jquery-timeout.js +++ /dev/null @@ -1,47 +0,0 @@ -/** - * jquery.timeout.js - * - * Copyright (c) 2011 Thomas Kemmer - * - * 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); diff --git a/app/views/favorites/_update.js.erb b/app/views/favorites/_update.js.erb index 86f1c5bd1..5cf305e87 100644 --- a/app/views/favorites/_update.js.erb +++ b/app/views/favorites/_update.js.erb @@ -1,8 +1,5 @@ $("#add-to-favorites, #add-fav-button, #remove-from-favorites, #remove-fav-button").toggle(); $("#remove-fav-button").addClass("animate"); -$.timeout(30000, function() { - $("#remove-fav-button").removeClass("animate"); -}); $("#score-for-post-<%= @post.id %>").text(<%= @post.score %>); $("#favcount-for-post-<%= @post.id %>").text(<%= @post.fav_count %>); $(".fav-buttons").toggleClass("fav-buttons-false").toggleClass("fav-buttons-true");