From a4671ba05997cf19b2d424261639280610a07fb8 Mon Sep 17 00:00:00 2001 From: Aron Budea Date: Mon, 15 Apr 2024 00:15:14 +0200 Subject: [PATCH] browser: Convert MobileTopBar.js to TypeScript Signed-off-by: Aron Budea Change-Id: Ibced15ed3ebec2c7a7b07539f25270b19d615a1f --- browser/.beforeprettier | 2 +- browser/Makefile.am | 4 +-- ...obileTopBar.js => Control.MobileTopBar.ts} | 27 +++++++++---------- scripts/unocommands.py | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) rename browser/src/control/{Control.MobileTopBar.js => Control.MobileTopBar.ts} (89%) diff --git a/browser/.beforeprettier b/browser/.beforeprettier index 3836c07cad..d66701bbe1 100644 --- a/browser/.beforeprettier +++ b/browser/.beforeprettier @@ -25,7 +25,7 @@ /src/control/Control.Menubar.js /src/control/Control.MobileBottomBar.js /src/control/Control.MobileSlide.js -/src/control/Control.MobileTopBar.js +/src/control/Control.MobileTopBar.ts /src/control/Control.MobileWizard.js /src/control/Control.MobileWizardBuilder.js /src/control/Control.MobileWizardPopup.js diff --git a/browser/Makefile.am b/browser/Makefile.am index 26b3ff3247..58bdf7a679 100644 --- a/browser/Makefile.am +++ b/browser/Makefile.am @@ -364,7 +364,7 @@ COOL_JS_LST =\ src/control/Control.MobileSlide.js \ src/control/Control.StatusBar.js \ src/control/Control.MobileSearchBar.ts \ - src/control/Control.MobileTopBar.js \ + src/control/Control.MobileTopBar.ts \ src/control/Control.MobileBottomBar.js \ src/control/Control.UserList.ts \ src/control/Control.FormulaBarJSDialog.js \ @@ -763,7 +763,7 @@ pot: src/control/Control.LanguageDialog.js \ src/control/Control.Menubar.js \ src/control/Control.MobileBottomBar.js \ - src/control/Control.MobileTopBar.js \ + src/control/Control.MobileTopBar.ts \ src/control/Control.MobileWizardBuilder.js \ src/control/Control.MobileWizardWindow.js \ src/control/Control.MobileWizard.js \ diff --git a/browser/src/control/Control.MobileTopBar.js b/browser/src/control/Control.MobileTopBar.ts similarity index 89% rename from browser/src/control/Control.MobileTopBar.js rename to browser/src/control/Control.MobileTopBar.ts index ae6fa792cc..c3c19c7abd 100644 --- a/browser/src/control/Control.MobileTopBar.js +++ b/browser/src/control/Control.MobileTopBar.ts @@ -12,16 +12,15 @@ * JSDialog.MobileTopBar - component of top bar on mobile */ -/* global JSDialog $ _UNO _ app */ class MobileTopBar extends JSDialog.Toolbar { - constructor(map) { + constructor(map: any) { super(map, 'toolbar-up'); map.on('updatepermission', this.onUpdatePermission, this); map.on('commandstatechanged', this.onCommandStateChanged, this); } - getToolItems() { + private getToolItems() { if (this.docType == 'text') { return [ {type: 'toolitem', id: 'signstatus', command: '.uno:Signature', w2icon: '', text: _UNO('.uno:Signature'), visible: false}, @@ -81,12 +80,12 @@ class MobileTopBar extends JSDialog.Toolbar { } create() { - var items = this.getToolItems(); + const items = this.getToolItems(); this.builder.build(this.parentContainer, items); } - onUpdatePermission(e) { - var toolbarButtons = ['undo', 'redo', 'mobile_wizard', 'insertion_mobile_wizard', 'comment_wizard']; + onUpdatePermission(e: any) { + const toolbarButtons: string[] = ['undo', 'redo', 'mobile_wizard', 'insertion_mobile_wizard', 'comment_wizard']; if (e.perm === 'edit') { toolbarButtons.forEach((id) => { this.showItem(id, true); @@ -103,12 +102,12 @@ class MobileTopBar extends JSDialog.Toolbar { } } - onCommandStateChanged(e) { - var commandName = e.commandName; - var state = e.state; + onCommandStateChanged(e: any) { + const commandName: string = e.commandName; + const state: string = e.state; if (this.map.isEditMode() && (state === 'enabled' || state === 'disabled')) { - var id = window.unoCmdToToolbarId(commandName); + const id: string = (window as any).unoCmdToToolbarId(commandName); if (state === 'enabled') { this.enableItem(id, true); @@ -119,9 +118,9 @@ class MobileTopBar extends JSDialog.Toolbar { } } - _generateHtmlItem(id) { - var isReadOnlyMode = app.map ? app.isReadOnly() : true; - var canUserWrite = !app.isReadOnly(); + _generateHtmlItem(id: string) { + const isReadOnlyMode: boolean = app.map ? app.isReadOnly() : true; + const canUserWrite: boolean = !app.isReadOnly(); return { type: 'container', @@ -135,6 +134,6 @@ class MobileTopBar extends JSDialog.Toolbar { } } -JSDialog.MobileTopBar = function (map) { +JSDialog.MobileTopBar = function (map: any) { return new MobileTopBar(map); }; diff --git a/scripts/unocommands.py b/scripts/unocommands.py index eb8c916d84..95b24b2b9a 100755 --- a/scripts/unocommands.py +++ b/scripts/unocommands.py @@ -138,7 +138,7 @@ def extractToolbarCommands(path): if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.MobileTopBar.js', 'r', encoding='utf-8') + f = open(path + '/browser/src/control/Control.MobileTopBar.ts', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line)