From ee88e054061bebb14b9f63dec7be66fdd284f3c2 Mon Sep 17 00:00:00 2001 From: Oliver Bartsch Date: Tue, 27 Oct 2020 20:59:51 +0100 Subject: [PATCH] [BUGFIX] Remove event listener from Topbar Closing a sub menu in the mobile view of the topbar resulted in closing the whole overlay. This was already fixed in master with #91642, but not backported. Therefore, this patch now fixes this for 10.4, regardless of the actual master patch that has taken care of various issues. Resolves: #89635 Relates: #91642 Releases: 10.4 Change-Id: Ie5fb90bc2175fc4bc9f12e6f80cbe4d43ab7283d Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66325 Tested-by: TYPO3com Tested-by: Christian Kuhn Reviewed-by: Christian Kuhn --- .../backend/Resources/Public/TypeScript/Toolbar.ts | 5 ----- typo3/sysext/backend/Resources/Public/JavaScript/Toolbar.js | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Build/Sources/TypeScript/backend/Resources/Public/TypeScript/Toolbar.ts b/Build/Sources/TypeScript/backend/Resources/Public/TypeScript/Toolbar.ts index 19d80cbdedd1..173417f0febb 100644 --- a/Build/Sources/TypeScript/backend/Resources/Public/TypeScript/Toolbar.ts +++ b/Build/Sources/TypeScript/backend/Resources/Public/TypeScript/Toolbar.ts @@ -25,11 +25,6 @@ class Toolbar { } private static initializeEvents(): void { - $('.t3js-toolbar-item').parent().on('hidden.bs.dropdown', (): void => { - $('.scaffold') - .removeClass('scaffold-toolbar-expanded') - .removeClass('scaffold-search-expanded'); - }); $(document).on('click', '.toolbar-item [data-modulename]', (evt: JQueryEventObject): void => { evt.preventDefault(); const moduleName = $(evt.target).closest('[data-modulename]').data('modulename'); diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/Toolbar.js b/typo3/sysext/backend/Resources/Public/JavaScript/Toolbar.js index 59f733a8fbb8..a2143e9417d9 100644 --- a/typo3/sysext/backend/Resources/Public/JavaScript/Toolbar.js +++ b/typo3/sysext/backend/Resources/Public/JavaScript/Toolbar.js @@ -10,4 +10,4 @@ * * The TYPO3 project - inspiring people to share! */ -var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};define(["require","exports","jquery","./ModuleMenu"],(function(e,a,t,o){"use strict";Object.defineProperty(a,"__esModule",{value:!0}),t=__importDefault(t);class l{static initialize(){l.initializeEvents()}static initializeEvents(){t.default(".t3js-toolbar-item").parent().on("hidden.bs.dropdown",()=>{t.default(".scaffold").removeClass("scaffold-toolbar-expanded").removeClass("scaffold-search-expanded")}),t.default(document).on("click",".toolbar-item [data-modulename]",e=>{e.preventDefault();const a=t.default(e.target).closest("[data-modulename]").data("modulename");o.App.showModule(a)}),t.default(document).on("click",".t3js-topbar-button-toolbar",()=>{t.default(".scaffold").removeClass("scaffold-modulemenu-expanded").removeClass("scaffold-search-expanded").toggleClass("scaffold-toolbar-expanded")}),t.default(document).on("click",".t3js-topbar-button-search",()=>{t.default(".scaffold").removeClass("scaffold-modulemenu-expanded").removeClass("scaffold-toolbar-expanded").toggleClass("scaffold-search-expanded")})}}t.default(()=>{l.initialize()})})); \ No newline at end of file +var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};define(["require","exports","jquery","./ModuleMenu"],(function(e,t,a,l){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),a=__importDefault(a);class o{static initialize(){o.initializeEvents()}static initializeEvents(){a.default(document).on("click",".toolbar-item [data-modulename]",e=>{e.preventDefault();const t=a.default(e.target).closest("[data-modulename]").data("modulename");l.App.showModule(t)}),a.default(document).on("click",".t3js-topbar-button-toolbar",()=>{a.default(".scaffold").removeClass("scaffold-modulemenu-expanded").removeClass("scaffold-search-expanded").toggleClass("scaffold-toolbar-expanded")}),a.default(document).on("click",".t3js-topbar-button-search",()=>{a.default(".scaffold").removeClass("scaffold-modulemenu-expanded").removeClass("scaffold-toolbar-expanded").toggleClass("scaffold-search-expanded")})}}a.default(()=>{o.initialize()})})); \ No newline at end of file