From 52e465b6c4effa6d28f546d747c196c6645b45b4 Mon Sep 17 00:00:00 2001 From: Dmytro Gokun Date: Sun, 10 Mar 2019 23:23:15 +0200 Subject: [PATCH 1/2] Add a tooltip to FullscreenControl and update it when the map enters/exits fullscreen mode --- src/ui/control/fullscreen_control.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ui/control/fullscreen_control.js b/src/ui/control/fullscreen_control.js index c5c6fbb3bb9..7e3a161ce4c 100644 --- a/src/ui/control/fullscreen_control.js +++ b/src/ui/control/fullscreen_control.js @@ -87,12 +87,18 @@ class FullscreenControl { _setupUI() { const button = this._fullscreenButton = DOM.create('button', (`${this._className}-icon ${this._className}-fullscreen`), this._controlContainer); - button.setAttribute("aria-label", "Toggle fullscreen"); button.type = 'button'; + this._updateTitle(); this._fullscreenButton.addEventListener('click', this._onClickFullscreen); window.document.addEventListener(this._fullscreenchange, this._changeIcon); } + _updateTitle() { + const title = this._isFullscreen() ? "Exit fullscreen mode" : "Enter fullscreen mode"; + this._fullscreenButton.setAttribute("aria-label", title); + this._fullscreenButton.title = title; + } + _isFullscreen() { return this._fullscreen; } @@ -108,6 +114,7 @@ class FullscreenControl { this._fullscreen = !this._fullscreen; this._fullscreenButton.classList.toggle(`${this._className}-shrink`); this._fullscreenButton.classList.toggle(`${this._className}-fullscreen`); + this._updateTitle(); } } From 18f7edf76d17ef999c3ee8728c0b7c828599e8dd Mon Sep 17 00:00:00 2001 From: Dmytro Gokun Date: Mon, 11 Mar 2019 09:34:21 +0200 Subject: [PATCH 2/2] Fix tooltip text for FullscreenControl --- src/ui/control/fullscreen_control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/control/fullscreen_control.js b/src/ui/control/fullscreen_control.js index 7e3a161ce4c..6ede36b8efa 100644 --- a/src/ui/control/fullscreen_control.js +++ b/src/ui/control/fullscreen_control.js @@ -94,7 +94,7 @@ class FullscreenControl { } _updateTitle() { - const title = this._isFullscreen() ? "Exit fullscreen mode" : "Enter fullscreen mode"; + const title = this._isFullscreen() ? "Exit fullscreen" : "Enter fullscreen"; this._fullscreenButton.setAttribute("aria-label", title); this._fullscreenButton.title = title; }