diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /vendor/assets | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'vendor/assets')
-rw-r--r-- | vendor/assets/javascripts/jasmine-jquery.js | 5 | ||||
-rw-r--r-- | vendor/assets/javascripts/jquery.endless-scroll.js | 17 |
2 files changed, 6 insertions, 16 deletions
diff --git a/vendor/assets/javascripts/jasmine-jquery.js b/vendor/assets/javascripts/jasmine-jquery.js index 9b7b245009d..a1f1e892c57 100644 --- a/vendor/assets/javascripts/jasmine-jquery.js +++ b/vendor/assets/javascripts/jasmine-jquery.js @@ -33,7 +33,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. (function (root, factory) { if (typeof module !== 'undefined' && module.exports) { - factory(root, root.jasmine, require('jquery')); + // The line below is patched from jquery => jquery/dist/jquery + // in order to load a jQuery with ajax, so that this testing library + // doesn't break + factory(root, root.jasmine, require('jquery/dist/jquery')); } else { factory(root, root.jasmine, root.jQuery); } diff --git a/vendor/assets/javascripts/jquery.endless-scroll.js b/vendor/assets/javascripts/jquery.endless-scroll.js index f022d9a5d06..fe0fe5b5a8e 100644 --- a/vendor/assets/javascripts/jquery.endless-scroll.js +++ b/vendor/assets/javascripts/jquery.endless-scroll.js @@ -19,7 +19,6 @@ * // using some custom options * $(document).endlessScroll({ * fireOnce: false, - * fireDelay: false, * loader: "<div class=\"loading\"><div>", * callback: function(){ * alert("test"); @@ -30,7 +29,6 @@ * * bottomPixels integer the number of pixels from the bottom of the page that triggers the event * fireOnce boolean only fire once until the execution of the current event is completed - * fireDelay integer delay the subsequent firing, in milliseconds, 0 or false to disable delay * loader string the HTML to be displayed during loading * data string|function plain HTML data, can be either a string or a function that returns a string, * when passed as a function it accepts one argument: fire sequence (the number @@ -55,7 +53,6 @@ var defaults = { bottomPixels : 50, fireOnce : true, - fireDelay : 150, loader : "<br />Loading...<br />", data : "", insertAfter : "div:last", @@ -102,21 +99,11 @@ data = typeof options.data == 'function' ? options.data.apply(this, [fireSequence]) : options.data; if (data !== false) { - $(options.insertAfter).after("<div id=\"endless_scroll_data\">" + data + "</div>"); - $("#endless_scroll_data").hide().fadeIn(250, function() {$(this).removeAttr("id");}); + $(options.insertAfter).after("<div>" + data + "</div>"); options.callback.apply(this, [fireSequence]); - if (options.fireDelay !== false || options.fireDelay !== 0) { - $("body").after("<div id=\"endless_scroll_marker\"></div>"); - // slight delay for preventing event firing twice - $("#endless_scroll_marker").fadeTo(options.fireDelay, 1, function() { - $(this).remove(); - fired = false; - }); - } - else - fired = false; + fired = false; } $("#endless_scroll_loader").remove(); |