From 14c36bc8ec5b17f60defe9c2aafc1a7e4270c91a Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Tue, 14 Feb 2023 07:40:19 +0100 Subject: [PATCH] maint(cleanup): Replace deprecated API calls. --- src/pat/autotoc/autotoc.test.js | 2 +- .../contentrules--implementation.js | 2 +- ...dexterity-types-listing--implementation.js | 6 +- .../discussion-moderation--implementation.js | 12 +-- src/pat/livesearch/livesearch.js | 6 +- src/pat/manageportlets/manageportlets.js | 10 +-- src/pat/modal/modal.test.js | 52 +++++------ .../preventdoublesubmit.js | 2 +- src/pat/querystring/querystring.js | 18 ++-- src/pat/relateditems/relateditems.test.js | 90 +++++++++---------- src/pat/search/search.js | 10 +-- src/pat/select2/select2.test.js | 12 +-- src/pat/structure/js/views/table.js | 2 +- src/pat/tinymce/js/links.js | 8 +- src/pat/tinymce/tinymce.test.js | 14 +-- src/pat/upload/upload.js | 4 +- 16 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/pat/autotoc/autotoc.test.js b/src/pat/autotoc/autotoc.test.js index c01ea1a53..558a86f21 100644 --- a/src/pat/autotoc/autotoc.test.js +++ b/src/pat/autotoc/autotoc.test.js @@ -135,6 +135,6 @@ describe("AutoTOC", function () { // expect(documentOffset).toEqual(headingOffset); // done(); // }) - // .click(); + // .trigger("click"); // }); }); diff --git a/src/pat/controlpanels/contentrules--implementation.js b/src/pat/controlpanels/contentrules--implementation.js index d8404e920..702f8b17a 100644 --- a/src/pat/controlpanels/contentrules--implementation.js +++ b/src/pat/controlpanels/contentrules--implementation.js @@ -149,7 +149,7 @@ export default class Contentrules { self.updatezebra($table); }); - $("#rules_disable_globally").change(function () { + $("#rules_disable_globally").on("change", function () { var form = $("#fieldset-global form"); var disabled = ""; if ($("#rules_disable_globally")[0].checked) { diff --git a/src/pat/controlpanels/dexterity-types-listing--implementation.js b/src/pat/controlpanels/dexterity-types-listing--implementation.js index b1f4ee121..5e5171221 100644 --- a/src/pat/controlpanels/dexterity-types-listing--implementation.js +++ b/src/pat/controlpanels/dexterity-types-listing--implementation.js @@ -10,7 +10,7 @@ export default class DexterityTypesListing { import("./schemaeditor--implementation"); // register plone_schemaeditor_normalize_string method. // Button Clone - $("#crud-edit-form-buttons-clone", this.el).click(function (e) { + $("#crud-edit-form-buttons-clone", this.el).on("click", function (e) { var selected = $("input[id$=-widgets-select-0]:checked", this.el); if (selected.length === 1) { e.preventDefault(); @@ -24,12 +24,12 @@ export default class DexterityTypesListing { displayInModal: false, }, }); - $el.click(); + $el.trigger("click"); } }); // Button delete - $("#crud-edit-form-buttons-delete", this.el).click(function (e) { + $("#crud-edit-form-buttons-delete", this.el).on("click", function (e) { var items = 0, msg; $("td.count", this.el) diff --git a/src/pat/controlpanels/discussion-moderation--implementation.js b/src/pat/controlpanels/discussion-moderation--implementation.js index 44374fbf8..bfd11944a 100644 --- a/src/pat/controlpanels/discussion-moderation--implementation.js +++ b/src/pat/controlpanels/discussion-moderation--implementation.js @@ -12,7 +12,7 @@ export default class Contentrules { * Delete a single comment. **********************************************************************/ // eslint-disable-next-line no-unused-vars - $("button[name='form.button.moderation.DeleteComment']").click(function (e) { + $("button[name='form.button.moderation.DeleteComment']").on("click", function (e) { e.preventDefault(); var row = $(this).closest("tr"); var path = row.find("[name='selected_obj_paths:list']").attr("value"); @@ -42,7 +42,7 @@ export default class Contentrules { /********************************************************************** * Transmit a single comment. **********************************************************************/ - $('button[name="form.button.moderation.TransmitComment"]').click(function (e) { + $('button[name="form.button.moderation.TransmitComment"]').on("click", function (e) { e.preventDefault(); var row = $(this).closest("tr"); var path = $(row).find("[name='selected_obj_paths:list']").attr("value"); @@ -89,7 +89,7 @@ export default class Contentrules { /********************************************************************** * Bulk actions for comments (delete, publish) **********************************************************************/ - $("button[name='form.button.BulkAction']").click(function (e) { + $("button[name='form.button.BulkAction']").on("click", function (e) { e.preventDefault(); var form = $(this).closest("form"); var target = $(form).attr("action"); @@ -126,7 +126,7 @@ export default class Contentrules { /********************************************************************** * Check or uncheck all checkboxes from the batch moderation page. **********************************************************************/ - $("input[name='check_all']").click(function () { + $("input[name='check_all']").on("click", function () { if ($(this).val() === "0") { $(this).parents("table").find("input:checkbox").prop("checked", true); $(this).val("1"); @@ -140,7 +140,7 @@ export default class Contentrules { * select comments with review_state **********************************************************************/ - $("input[name='review_state']").click(function () { + $("input[name='review_state']").on("click", function () { let review_state = $(this).val(); let url = location.href; if (location.search) { @@ -165,7 +165,7 @@ export default class Contentrules { /********************************************************************** * Show full text of a comment in the batch moderation page. **********************************************************************/ - $(".show-full-comment-text").click(function (e) { + $(".show-full-comment-text").on("click", function (e) { e.preventDefault(); var target = $(this).attr("href"); var parent = $(this).parent(); diff --git a/src/pat/livesearch/livesearch.js b/src/pat/livesearch/livesearch.js index be1ef989e..ef01d399b 100644 --- a/src/pat/livesearch/livesearch.js +++ b/src/pat/livesearch/livesearch.js @@ -173,7 +173,7 @@ export default Base.extend({ _t("Previous") + "" ); - $prev.click(function (e) { + $prev.on("click", function (e) { self.disableHiding = true; e.preventDefault(); self.doSearch(self.page - 1); @@ -186,7 +186,7 @@ export default Base.extend({ _t("Next") + "" ); - $next.click(function (e) { + $next.on("click", function (e) { self.disableHiding = true; e.preventDefault(); self.doSearch(self.page + 1); @@ -314,7 +314,7 @@ export default Base.extend({ self.render(); } }); - $("#sorting-options a").click(function (e) { + $("#sorting-options a").on("click", function (e) { e.preventDefault(); self.onceFocused = false; }); diff --git a/src/pat/manageportlets/manageportlets.js b/src/pat/manageportlets/manageportlets.js index 370cee674..d15d36070 100644 --- a/src/pat/manageportlets/manageportlets.js +++ b/src/pat/manageportlets/manageportlets.js @@ -46,7 +46,7 @@ export default Base.extend({ parent case, bind the link so we can reload modal */ $(".portlets-link-to-parent") .off("click") - .click(function (e) { + .on("click", function (e) { that.loading.show(); var $el = $(this); e.preventDefault(); @@ -148,14 +148,14 @@ export default Base.extend({ }, setupPortletEdit: function () { var that = this; - $(".managedPortlet .portletHeader > a", that.$el).click(function (e) { + $(".managedPortlet .portletHeader > a", that.$el).on("click", function (e) { e.preventDefault(); that.showEditPortlet($(this).attr("href")); }); }, setupAddDropdown: function () { var that = this; - $(".add-portlet", that.$el).change(function (e) { + $(".add-portlet", that.$el).on("change", function (e) { e.preventDefault(); var $select = $(this); var $form = $select.parents("form"); @@ -184,11 +184,11 @@ export default Base.extend({ }, }); // Block/unblock inherited portlets (parent, group and content type portlets) - $(".portlets-settings select", that.$el).change(function () { + $(".portlets-settings select", that.$el).on("change", function () { log.info("select change"); clearTimeout(that.submitTimeout); that.submitTimeout = window.setTimeout(function () { - $(".portlets-settings", that.$el).submit(); + $(".portlets-settings", that.$el).trigger("submit"); }, 100); }); }, diff --git a/src/pat/modal/modal.test.js b/src/pat/modal/modal.test.js index 8ace95ade..9f43fbc61 100644 --- a/src/pat/modal/modal.test.js +++ b/src/pat/modal/modal.test.js @@ -243,7 +243,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.3 - position: right middle, margin: 0, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -270,7 +270,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); it("7.4 - position: center top, margin: 0, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -288,7 +288,7 @@ describe("Modal", function () { expect(pos.left).toEqual("30px"); done(); }) - .click(); + .trigger("click"); }); it("7.5 - position: center bottom, margin: 0, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -315,7 +315,7 @@ describe("Modal", function () { expect(pos.left).toEqual("30px"); done(); }) - .click(); + .trigger("click"); }); it("7.6 - position: left top, margin: 0, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -331,7 +331,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.7 - position: left bottom, margin: 0, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -356,7 +356,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.8 - position: right top, margin: 0, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -373,7 +373,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); it("7.9 - position: right bottom, margin: 0, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -399,7 +399,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); // @@ -431,7 +431,7 @@ describe("Modal", function () { expect(pos.left).toEqual("25px"); done(); }) - .click(); + .trigger("click"); }); it("7.11 - position: left middle, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -457,7 +457,7 @@ describe("Modal", function () { expect(pos.left).toEqual("5px"); done(); }) - .click(); + .trigger("click"); }); it("7.12 - position: right middle, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -484,7 +484,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); it("7.13 - position: center top, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -502,7 +502,7 @@ describe("Modal", function () { expect(pos.left).toEqual("25px"); done(); }) - .click(); + .trigger("click"); }); it("7.14 - position: center bottom, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -529,7 +529,7 @@ describe("Modal", function () { expect(pos.left).toEqual("25px"); done(); }) - .click(); + .trigger("click"); }); it("7.15 - position: left top, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -545,7 +545,7 @@ describe("Modal", function () { expect(pos.left).toEqual("5px"); done(); }) - .click(); + .trigger("click"); }); it("7.16 - position: left bottom, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -570,7 +570,7 @@ describe("Modal", function () { expect(pos.left).toEqual("5px"); done(); }) - .click(); + .trigger("click"); }); it("7.17 - position: right top, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -587,7 +587,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); it("7.18 - position: right bottom, margin: 5, modal: 340x280, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -613,7 +613,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); // @@ -641,7 +641,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.20 - position: left middle, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -665,7 +665,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.21 - position: right middle, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -690,7 +690,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); it("7.22 - position: center top, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -706,7 +706,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.23 - position: center bottom, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -731,7 +731,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.24 - position: left top, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -747,7 +747,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.25 - position: left bottom, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -772,7 +772,7 @@ describe("Modal", function () { expect(pos.left).toEqual("0px"); done(); }) - .click(); + .trigger("click"); }); it("7.26 - position: right top, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -789,7 +789,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); it("7.27 - position: right bottom, margin: 0, modal: 450x350, wrapper: 400x300", function (done) { $("#body2 a.pat-plone-modal") @@ -815,7 +815,7 @@ describe("Modal", function () { expect(pos.left).toEqual("auto"); done(); }) - .click(); + .trigger("click"); }); }); }); diff --git a/src/pat/preventdoublesubmit/preventdoublesubmit.js b/src/pat/preventdoublesubmit/preventdoublesubmit.js index b7343ef73..700d87a2f 100644 --- a/src/pat/preventdoublesubmit/preventdoublesubmit.js +++ b/src/pat/preventdoublesubmit/preventdoublesubmit.js @@ -19,7 +19,7 @@ export default Base.extend({ return; } - $(":submit", self.$el).click(function () { + $(":submit", self.$el).on("click", function () { // mark the button as clicked $(":submit").removeAttr("clicked"); $(this).attr("clicked", "clicked"); diff --git a/src/pat/querystring/querystring.js b/src/pat/querystring/querystring.js index d81ecdd8b..0871a34e7 100644 --- a/src/pat/querystring/querystring.js +++ b/src/pat/querystring/querystring.js @@ -270,7 +270,7 @@ Criteria.prototype = { } select += "" + ""; - return $(select).change(function () { + return $(select).on("change", function () { self.trigger("depth-changed"); }); }; @@ -280,7 +280,7 @@ Criteria.prototype = { .addClass(self.options.classValueName + "-" + widget) .val(value) .appendTo($wrapper) - .change(function () { + .on("change", function () { self.trigger("value-changed"); }); } else if (widget === "DateWidget") { @@ -328,7 +328,7 @@ Criteria.prototype = { .addClass(self.options.classValueName + "-" + widget) .val(value) .appendTo($wrapper) - .change(function () { + .on("change", function () { self.trigger("value-changed"); }); } else if (widget === "AdvancedPathWidget") { @@ -347,7 +347,7 @@ Criteria.prototype = { .addClass(self.options.classValueName + "-" + widget) .appendTo($wrapper) .val(value) - .change(function () { + .on("change", function () { self.trigger("value-changed"); }); } else { @@ -383,7 +383,7 @@ Criteria.prototype = { .addClass(self.options.classValueName + "-" + widget) .val(value) .appendTo($wrapper) - .change(function () { + .on("change", function () { self.trigger("value-changed"); }); } else { @@ -396,7 +396,7 @@ Criteria.prototype = { .appendTo($wrapper) .val(pathAndDepth[0]) .patternRelateditems(self.patternRelateditemsOptions) - .change(function () { + .on("change", function () { self.trigger("value-changed"); }); $wrapper.addClass("break-line"); @@ -407,7 +407,7 @@ Criteria.prototype = { .prop("multiple", true) .addClass(self.options.classValueName + "-" + widget) .appendTo($wrapper) - .change(function () { + .on("change", function () { self.trigger("value-changed"); }); if (self.indexes[index]) { @@ -800,7 +800,7 @@ export default Base.extend({ self.$sortOn = $("') .attr("name", "sort_reversed:boolean") - .change(function () { + .on("change", function () { self.refreshPreviewEvent.call(self); if ($(this).prop("checked")) { $('input[type="checkbox"]', existingSortOrder).prop("checked", true); diff --git a/src/pat/relateditems/relateditems.test.js b/src/pat/relateditems/relateditems.test.js index 0fec85965..a2ba13bbe 100644 --- a/src/pat/relateditems/relateditems.test.js +++ b/src/pat/relateditems/relateditems.test.js @@ -355,18 +355,18 @@ describe("Related Items", function () { ).toHaveLength(5); // Select first folder - $('a.pat-relateditems-result-select[data-path="/folder1"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder1"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID6"); // Still, this folder should be shown in the result list - only not selectable. - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); expect( $(".pat-relateditems-result-select .pat-relateditems-result-info") ).toHaveLength(5); // Browse into second folder which contains images - $('.pat-relateditems-result-browse[data-path="/folder2"]').click(); + $('.pat-relateditems-result-browse[data-path="/folder2"]').trigger("click"); await utils.timeout(SELECT2_TIMEOUT); // 1 "One level up" and 2 images @@ -376,11 +376,11 @@ describe("Related Items", function () { expect($(".pat-relateditems-result")[0].textContent).toContain("One level up"); // Select first image - $('a.pat-relateditems-result-select[data-path="/folder2/image17"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder2/image17"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID6,UID17"); // Browse one level up - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); await utils.timeout(SELECT2_TIMEOUT); @@ -396,7 +396,7 @@ describe("Related Items", function () { // Input a search term and enter search mode $input = $(".select2-search-field input.select2-input"); - $input.click().val("folder2"); + $input.trigger("click").val("folder2"); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); @@ -407,7 +407,7 @@ describe("Related Items", function () { ).toHaveLength(2); // We can even browse into folders in search mode - $('.pat-relateditems-result-browse[data-path="/folder2"]').click(); + $('.pat-relateditems-result-browse[data-path="/folder2"]').trigger("click"); await utils.timeout(SELECT2_TIMEOUT); // Being in folder 2, we see again one item... @@ -417,7 +417,7 @@ describe("Related Items", function () { expect($(".pat-relateditems-result")[0].textContent).toContain("One level up"); // Selecting the image will add it to the selected items. - $('a.pat-relateditems-result-select[data-path="/folder2/image18"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder2/image18"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID6,UID17,UID18"); }); @@ -430,7 +430,7 @@ describe("Related Items", function () { var $input; // open up result list by clicking on "browse" - $(".mode.browse", $container).click(); + $(".mode.browse", $container).trigger("click"); await utils.timeout(SELECT2_TIMEOUT); // result list must have expected length @@ -442,13 +442,13 @@ describe("Related Items", function () { // PT 2 // select one element - $('a.pat-relateditems-result-select[data-path="/image1"]').click(); + $('a.pat-relateditems-result-select[data-path="/image1"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID8"); // PT 3 // click again on browse, should open up result list again, this time without 'UID1' - $(".mode.browse", $container).click(); + $(".mode.browse", $container).trigger("click"); await utils.timeout(SELECT2_TIMEOUT); // result list must have expected length @@ -457,16 +457,16 @@ describe("Related Items", function () { ).toHaveLength(2); // add another one - $('a.pat-relateditems-result-select[data-path="/image2"]').click(); + $('a.pat-relateditems-result-select[data-path="/image2"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID8,UID9"); // remove first one - $($("a.select2-search-choice-close")[0]).click(); + $($("a.select2-search-choice-close")[0]).trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID9"); // search for... $input = $(".select2-search-field input.select2-input"); - $input.click().val("Ima"); + $input.trigger("click").val("Ima"); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); @@ -475,7 +475,7 @@ describe("Related Items", function () { ).toHaveLength(2); // add first from result - $('a.pat-relateditems-result-select[data-path="/image3"]').click(); + $('a.pat-relateditems-result-select[data-path="/image3"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID9,UID10"); }); @@ -488,7 +488,7 @@ describe("Related Items", function () { var $input; // open up result list by clicking on "browse" - $(".mode.search", $container).click(); + $(".mode.search", $container).trigger("click"); await utils.timeout(SELECT2_TIMEOUT); // result list must have expected length @@ -499,13 +499,13 @@ describe("Related Items", function () { // // PT 2 // // select one element - $('a.pat-relateditems-result-select[data-path="/document1"]').click(); + $('a.pat-relateditems-result-select[data-path="/document1"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID1"); // // PT 3 // // click again on browse, should open up result list again, this time without 'UID1' - $(".mode.search", $container).click(); + $(".mode.search", $container).trigger("click"); await utils.timeout(SELECT2_TIMEOUT); // // result list must have expected length @@ -514,16 +514,16 @@ describe("Related Items", function () { ).toHaveLength(10); // // add another one - $('a.pat-relateditems-result-select[data-path="/document2"]').click(); + $('a.pat-relateditems-result-select[data-path="/document2"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID1,UID2"); // // remove first one - $($("a.select2-search-choice-close")[0]).click(); + $($("a.select2-search-choice-close")[0]).trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID2"); // // search for... $input = $(".select2-search-field input.select2-input"); - $input.click().val("document15"); + $input.trigger("click").val("document15"); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); @@ -532,7 +532,7 @@ describe("Related Items", function () { ).toHaveLength(1); // // add first from result - $('a.pat-relateditems-result-select[data-path="/folder2/document15"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder2/document15"]').trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID2,UID15"); }); @@ -550,11 +550,11 @@ describe("Related Items", function () { }); // open up result list by clicking on "browse" - $("button.favorites", $container).click(); + $("button.favorites", $container).trigger("click"); await utils.timeout(SELECT2_TIMEOUT); // click "folder1" - $($(".favorites li a")[1]).click(); + $($(".favorites li a")[1]).trigger("click"); await utils.timeout(SELECT2_TIMEOUT); expect( @@ -579,13 +579,13 @@ describe("Related Items", function () { // Select some items // folder 1 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder1"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder1"]').trigger("click"); // folder 2 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder2"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder2"]').trigger("click"); // check, if items are selected expect($("input.pat-relateditems").val()).toEqual("UID6,UID7"); @@ -611,7 +611,7 @@ describe("Related Items", function () { ); // Klicking on last used item should add it to the selection. - $($(".pat-relateditems-recentlyused-select")[0]).click(); + $($(".pat-relateditems-recentlyused-select")[0]).trigger("click"); expect($("input.pat-relateditems").val()).toEqual("UID7"); // done. @@ -630,13 +630,13 @@ describe("Related Items", function () { // Select some items // folder 1 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder1"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder1"]').trigger("click"); // folder 2 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder2"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder2"]').trigger("click"); // check, if items are selected expect($("input.pat-relateditems").val()).toEqual("UID6,UID7"); @@ -666,21 +666,21 @@ describe("Related Items", function () { // Select some items // folder 1 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder1"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder1"]').trigger("click"); // folder 2 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder2"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder2"]').trigger("click"); // image 1 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/image1"]').click(); + $('a.pat-relateditems-result-select[data-path="/image1"]').trigger("click"); // image 2 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/image2"]').click(); + $('a.pat-relateditems-result-select[data-path="/image2"]').trigger("click"); // check, if items are selected expect($("input.pat-relateditems").val()).toEqual("UID6,UID7,UID8,UID9"); @@ -723,13 +723,13 @@ describe("Related Items", function () { // Select some items // folder 1 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder1"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder1"]').trigger("click"); // folder 2 - $(".select2-search-field input.select2-input").click(); + $(".select2-search-field input.select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); - $('a.pat-relateditems-result-select[data-path="/folder2"]').click(); + $('a.pat-relateditems-result-select[data-path="/folder2"]').trigger("click"); var items = JSON.parse(localStorage[key]); expect(items.length).toEqual(2); diff --git a/src/pat/search/search.js b/src/pat/search/search.js index 4dcc2b48f..f9684e22a 100644 --- a/src/pat/search/search.js +++ b/src/pat/search/search.js @@ -70,7 +70,7 @@ export default Base.extend({ updateSortingState($("a[data-sort=" + default_sort + "]")); /* sorting */ - $("a", $sortingContainer).click(function (e) { + $("a", $sortingContainer).on("click", function (e) { e.preventDefault(); updateSortingState($(this)); var sort = $(this).attr("data-sort"); @@ -90,14 +90,14 @@ export default Base.extend({ }); /* form submission */ - $(".searchPage").submit(function (e) { + $(".searchPage").on("submit", function (e) { e.preventDefault(); setBatchStart("0"); search(); }); /* filters */ - $filterBtn.click(function (e) { + $filterBtn.on("click", function (e) { e.preventDefault(); $filter.toggleClass("activated"); if ($filter.hasClass("activated")) { @@ -107,7 +107,7 @@ export default Base.extend({ } }); - $ctSelectAll.change(function () { + $ctSelectAll.on("change", function () { if ($ctSelectAll[0].checked) { $("input", $selectAllContainer).each(function () { this.checked = true; @@ -119,7 +119,7 @@ export default Base.extend({ } }); - $("input", $filter).change(function () { + $("input", $filter).on("change", function () { setBatchStart("0"); searchDelayed(); }); diff --git a/src/pat/select2/select2.test.js b/src/pat/select2/select2.test.js index e6a031cde..346536c98 100644 --- a/src/pat/select2/select2.test.js +++ b/src/pat/select2/select2.test.js @@ -116,7 +116,7 @@ describe("Select2", function () { var $results = $("li.select2-result-selectable"); expect($results.length).toEqual(0); - $(".select2-input").click(); + $(".select2-input").trigger("click"); await utils.timeout(SELECT2_TIMEOUT); $results = $("li.select2-result-selectable"); @@ -139,7 +139,7 @@ describe("Select2", function () { await utils.timeout(1); var $input = $(".select2-input"); - $input.click().val("AAA"); + $input.trigger("click").val("AAA"); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); @@ -163,7 +163,7 @@ describe("Select2", function () { await utils.timeout(1); var $input = $(".select2-input"); - $input.click().val('Evil logo'); + $input.trigger("click").val('Evil logo'); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); @@ -188,7 +188,7 @@ describe("Select2", function () { await utils.timeout(1); var $input = $(".select2-input"); - $input.click().val("this < that & those"); + $input.trigger("click").val("this < that & those"); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); @@ -270,7 +270,7 @@ describe("Select2", function () { await utils.timeout(1); var $input = $(".select2-input"); - $input.click().val("AAA"); + $input.trigger("click").val("AAA"); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); @@ -295,7 +295,7 @@ describe("Select2", function () { await utils.timeout(1); var $input = $(".select2-input"); - $input.click().val("AAA"); + $input.trigger("click").val("AAA"); var keyup = $.Event("keyup-change"); $input.trigger(keyup); await utils.timeout(SELECT2_TIMEOUT); diff --git a/src/pat/structure/js/views/table.js b/src/pat/structure/js/views/table.js index b887d093a..c5eb44d80 100644 --- a/src/pat/structure/js/views/table.js +++ b/src/pat/structure/js/views/table.js @@ -232,7 +232,7 @@ export default BaseView.extend({ selectAll: function (e) { if ($(e.target).is(":checked")) { - $('input[type="checkbox"]', this.$("tbody")).prop("checked", true).change(); + $('input[type="checkbox"]', this.$("tbody")).prop("checked", true).trigger("change"); } else { /* delaying the re-rendering is much faster in this case */ this.selectedCollection.remove(this.collection.models, { diff --git a/src/pat/tinymce/js/links.js b/src/pat/tinymce/js/links.js index 2059ca1c8..85ccb9c4d 100644 --- a/src/pat/tinymce/js/links.js +++ b/src/pat/tinymce/js/links.js @@ -30,7 +30,7 @@ var LinkType = Base.extend({ }, value: function () { - return $.trim(this.getEl().val()); + return this.getEl().val().trim(); }, toUrl: function () { @@ -562,7 +562,7 @@ export default Base.extend({ } }); - $(".autotoc-nav a", self.modal.$modal).click(function () { + $(".autotoc-nav a", self.modal.$modal).on("click", function () { var $fieldset = $("fieldset.linkType", self.modal.$modal).eq( $(this).index() ); @@ -574,7 +574,7 @@ export default Base.extend({ }); }); - self.$captionFromDescription.change(function () { + self.$captionFromDescription.on("change", function () { if (this.checked) { self.$caption.prop("disabled", true); } else { @@ -806,7 +806,7 @@ export default Base.extend({ } self.hide(); }); - $('.modal-footer input[name="cancel"]', self.modal.$modal).click(function (e) { + $('.modal-footer input[name="cancel"]', self.modal.$modal).on("click", function (e) { e.preventDefault(); self.hide(); }); diff --git a/src/pat/tinymce/tinymce.test.js b/src/pat/tinymce/tinymce.test.js index 55bde02de..c139e8ad4 100644 --- a/src/pat/tinymce/tinymce.test.js +++ b/src/pat/tinymce/tinymce.test.js @@ -159,7 +159,7 @@ describe("TinyMCE", function () { tinymce.tiny.initialized = true; tinymce.tiny.setContent("

foobar

"); - $container.submit(function (e) { + $container.on("submit", function (e) { e.preventDefault(); }); $container.trigger("submit"); @@ -325,7 +325,7 @@ describe("TinyMCE", function () { // this.clock.tick(1000); // var pattern = $el.data().patternTinymce; // pattern.addImageClicked(); - // $("#" + $("#tinylink-uploadImage").data().navref).click(); + // $("#" + $("#tinylink-uploadImage").data().navref).trigger("click"); // expect($("#tinylink-uploadImage").parent().hasClass("active")).to.equal(true); // var blob; // try { @@ -342,7 +342,7 @@ describe("TinyMCE", function () { // } // blob.name = "blah.png"; // pattern.imageModal.$upload.data().patternUpload.dropzone.addFile(blob); - // $(".upload-all", pattern.imageModal.$upload).click(); + // $(".upload-all", pattern.imageModal.$upload).trigger("click"); // this.clock.tick(1000); // expect($("#tinylink-image").parent().hasClass("active")).to.equal(true); @@ -389,7 +389,7 @@ describe("TinyMCE", function () { // path: "/foobar", // }); // pattern.imageModal.$caption.val("hello."); - // pattern.imageModal.$button.click(); + // pattern.imageModal.$button.trigger("click"); // var content = pattern.tiny.getContent(); // expect(content).to.contain("
"); @@ -422,7 +422,7 @@ describe("TinyMCE", function () { // path: "/foobar", // }); // pattern.imageModal.$captionFromDescription.prop("checked", true); - // pattern.imageModal.$button.click(); + // pattern.imageModal.$button.trigger("click"); // content = pattern.tiny.getContent(); // expect(content).to.not.contain("
"); @@ -660,7 +660,7 @@ describe("TinyMCE", function () { $editable.html(changed_txt); // Avoid error when running tests: "Some of your tests did a full page reload!" - $container.submit(function (e) { + $container.on("submit", function (e) { e.preventDefault(); }); $container.trigger("submit"); diff --git a/src/pat/upload/upload.js b/src/pat/upload/upload.js index 1fcabaaa6..3993a7414 100644 --- a/src/pat/upload/upload.js +++ b/src/pat/upload/upload.js @@ -123,7 +123,7 @@ export default Base.extend({ self.$dropzone = $(".upload-area", self.$el); - $("div.browse-select button.browse", self.$el).click(function (e) { + $("div.browse-select button.browse", self.$el).on("click", function (e) { e.preventDefault(); e.stopPropagation(); if ( @@ -214,7 +214,7 @@ export default Base.extend({ self.$progress.attr("aria-valuenow", pct).css("width", pct + "%"); }); - $(".upload-all", self.$el).click(function (e) { + $(".upload-all", self.$el).on("click", function (e) { e.preventDefault(); e.stopPropagation(); self.processUpload({