full screen context menu item added and fixed some context menu related tests #765

Jacky0299 · 2023-02-21T15:57:55Z

New "Exit Fullscreen" locale added to the mapml-extension here: Maps4HTML/mapml-extension@c446c54

solves issue #201

test/e2e/core/mapContextMenu.test.js

src/mapml-viewer.js

src/mapml/control/FullscreenButton.js

prushforth · 2023-02-24T16:28:22Z

A good place to start reading about the browsers' Fullscreen API is here; there are likely things in there that would be useful in the code for this PR.

AliyanH · 2023-02-27T18:16:07Z

Found a weird behavior when navigating the history using alt+Arrow keys, when I go back in history many times using the alt+back arrow key, the forward history seems to get deleted, as seen below:

Video.mp4

Probably because the alt+arrowkeys are still doing something when at the end of history, when they are at the end of history it should just prevent default and not be going forward/backwards - that might be the cause of this.

prushforth

A couple of small clarifying changes

src/mapml/handlers/ContextMenu.js

src/web-map.js

prushforth · 2023-02-27T18:35:03Z

Found a weird behavior when navigating the history using alt+Arrow keys, when I go back in history many times using the alt+back arrow key, the forward history seems to get deleted, as seen below:

Probably because the alt+arrowkeys are still doing something when at the end of history, when they are at the end of history it should just prevent default and not be going forward/backwards - that might be the cause of this.

Is this on web-map or mapml-viewer? Not sure if it makes a difference, but I noticed that alt+left-arrow is enabled on any div, not just the map div.

Jacky0299 · 2023-02-27T20:07:02Z

Found a weird behavior when navigating the history using alt+Arrow keys, when I go back in history many times using the alt+back arrow key, the forward history seems to get deleted, as seen below:

Probably because the alt+arrowkeys are still doing something when at the end of history, when they are at the end of history it should just prevent default and not be going forward/backwards - that might be the cause of this.

I think it is because pressing it too fast, if you press it once by once, it's working fine, I can try to put a timeout between each time back() and forward() triggers.

prushforth · 2023-02-27T20:33:01Z

I noticed that if you use "Alt+Left-Arrow" until there is no more history, the "Reload" button does not become disabled, until you actually reload / Ctrl-R. That is, when you pop the last history item, it should disable the reload button.

Jacky0299 · 2023-02-27T21:21:31Z

I noticed that if you use "Alt+Left-Arrow" until there is no more history, the "Reload" button does not become disabled, until you actually reload / Ctrl-R. That is, when you pop the last history item, it should disable the reload button.

I don't really see this problem at my side, when there's no more history, the reload is disabled. It should be the same as before since I did not really touch the functions.

AliyanH

code structure change

src/mapml-viewer.js

…m-Element into issue201

AliyanH · 2023-02-28T16:19:12Z

I think we can revert the settimeout change and look at async await if possible.

With the settimeout, we are only able to go back with intervals of 0.5 seconds. So If I were to go back twice within 0.5 secs, It would only go back once:

Video.mp4

prushforth

A few comments. Almost there!

src/mapml-viewer.js

prushforth · 2023-03-01T15:31:56Z

src/mapml-viewer.js

-      this._map.contextMenu._items[0].el.el.disabled = false; // back contextmenu item
-      this._map.contextMenu._items[2].el.el.disabled = false; // reload contextmenu item
+      this._map.contextMenu.toggleContextMenuItems("Back", "enabled"); // back contextmenu item
+      this._map.contextMenu.toggleContextMenuItems("Reload", "enabled"); // reload contextmenu item


Here is where you should also enable the reload button on the map.

prushforth · 2023-03-01T15:32:16Z

src/mapml-viewer.js

-    this._map.contextMenu._items[2].el.el.disabled = true; // reload contextmenu item
+    this._map.contextMenu.toggleContextMenuItems("Back", "disabled"); // back contextmenu item
+    this._map.contextMenu.toggleContextMenuItems("Forward", "disabled");// forward contextmenu item
+    this._map.contextMenu.toggleContextMenuItems("Reload", "disabled"); // reload contextmenu item


Here is where you should also disable the reload button on the map

src/mapml/handlers/ContextMenu.js

prushforth · 2023-03-01T18:50:49Z

@Jacky0299 I pushed some changes (pull them and have a look!) that maybe weren't clear; I left the comments above so you can compare what I did with what the comment asked for.

prushforth · 2023-03-01T18:57:15Z

@Jacky0299 Squash and merge when ready.

AliyanH · 2023-03-01T19:16:02Z

src/mapml/handlers/ContextMenu.js

+        text: M.options.locale.cmBack + " (<kbd>Alt+Left Arrow</kbd>)",
        callback:this._goBack
      },
      {
-        text: M.options.locale.cmForward + " (<kbd>F</kbd>)",
+        text: M.options.locale.cmForward + " (<kbd>Alt+Right Arrow</kbd>)",


Looks good, just dont forget to add localized versions of this in the extension, similar to what you did for "Exit Fullscreen". Create a PR for the extension.

Nice Work on this!

…ed tests (Maps4HTML#765) * full screen context menu item added and fixedtests * weird test: Checking Context Menu Fullscreen * ready for review * Fix fullscreen test and remove scrolling * minor changes * ready to merge * bug fix (esc button), Peter suggested functions * forward reload back fullscreen button changes * minor changes * Linting * Change "View fullscreen" to "View Fullscreen" * minor linting * Aliyan suggested styling changes * time out added between each time back is pressed * disabling reload button * bugs fix and new context menu functions * sync changes with web map * peter suggested changes * Tweak to mapml-viewer, web-map --------- Co-authored-by: AliyanH <aliyanulhaq@gmail.com> Co-authored-by: Peter Rushforth <peter.rushforth@gmail.com> Co-authored-by: prushfor <prushfor@L-BSC-A146390.nrn.nrcan.gc.ca>

Jacky0299 and others added 4 commits February 21, 2023 10:56

full screen context menu item added and fixedtests

900e5e3

weird test: Checking Context Menu Fullscreen

fed0583

ready for review

11c5ed8

Fix fullscreen test and remove scrolling

6cbd882

AliyanH reviewed Feb 22, 2023

View reviewed changes

test/e2e/core/mapContextMenu.test.js Show resolved Hide resolved

Jacky0299 and others added 2 commits February 22, 2023 12:51

Merge branch 'Maps4HTML:main' into issue201

4bf1a8f

minor changes

91a48cb

This comment was marked as resolved.

Sign in to view

ready to merge

fc898c8

Jacky0299 marked this pull request as ready for review February 22, 2023 21:14

AliyanH requested review from yhy0217 and AliyanH February 22, 2023 21:31

yhy0217 approved these changes Feb 24, 2023

View reviewed changes

This comment was marked as resolved.

Sign in to view

prushforth requested changes Feb 24, 2023

View reviewed changes

src/mapml-viewer.js Outdated Show resolved Hide resolved

src/mapml/control/FullscreenButton.js Outdated Show resolved Hide resolved

src/mapml/control/FullscreenButton.js Outdated Show resolved Hide resolved

Jacky0299 added 2 commits February 24, 2023 19:46

bug fix (esc button), Peter suggested functions

46d00bc

forward reload back fullscreen button changes

5cb8a9b

prushforth reviewed Feb 27, 2023

View reviewed changes

src/mapml/handlers/ContextMenu.js Outdated Show resolved Hide resolved

src/mapml/handlers/ContextMenu.js Outdated Show resolved Hide resolved

src/web-map.js Outdated Show resolved Hide resolved

Jacky0299 and others added 2 commits February 27, 2023 14:14

minor changes

d9edb58

Linting

945533a

Change "View fullscreen" to "View Fullscreen"

9826d93

minor linting

e2997c5

AliyanH reviewed Feb 27, 2023

View reviewed changes

src/mapml-viewer.js Outdated Show resolved Hide resolved

Aliyan suggested styling changes

5d4c25a

Jacky0299 added 2 commits February 27, 2023 17:42

Merge branch 'issue201' of https://github.com/Jacky0299/Web-Map-Custo…

a3a7a34

…m-Element into issue201

time out added between each time back is pressed

5f8ccbe

Jacky0299 added 3 commits February 28, 2023 13:45

disabling reload button

e59d71a

bugs fix and new context menu functions

8734d1e

sync changes with web map

febd74e

prushforth requested changes Mar 1, 2023

View reviewed changes

Jacky0299 and others added 2 commits March 1, 2023 11:50

peter suggested changes

195984f

Tweak to mapml-viewer, web-map

609b703

prushforth approved these changes Mar 1, 2023

View reviewed changes

AliyanH requested changes Mar 1, 2023

View reviewed changes

Jacky0299 merged commit d89e27b into Maps4HTML:main Mar 1, 2023

prushforth mentioned this pull request Mar 2, 2023

Change Back, Forward, and Reload Shortcuts #766

Closed

prushforth mentioned this pull request Mar 13, 2023

Keyboard shortcut & context menu item to toggle fullscreen mode #201

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

full screen context menu item added and fixed some context menu related tests #765

full screen context menu item added and fixed some context menu related tests #765

Jacky0299 commented Feb 21, 2023 •

edited by AliyanH

Loading

This comment was marked as resolved.

This comment was marked as resolved.

prushforth commented Feb 24, 2023

AliyanH commented Feb 27, 2023 •

edited

Loading

prushforth left a comment

prushforth commented Feb 27, 2023

Jacky0299 commented Feb 27, 2023

prushforth commented Feb 27, 2023 •

edited

Loading

Jacky0299 commented Feb 27, 2023

AliyanH left a comment

AliyanH commented Feb 28, 2023

prushforth left a comment

prushforth Mar 1, 2023

prushforth Mar 1, 2023

prushforth commented Mar 1, 2023

prushforth commented Mar 1, 2023

AliyanH Mar 1, 2023

full screen context menu item added and fixed some context menu related tests #765

full screen context menu item added and fixed some context menu related tests #765

Conversation

Jacky0299 commented Feb 21, 2023 • edited by AliyanH Loading

This comment was marked as resolved.

This comment was marked as resolved.

prushforth commented Feb 24, 2023

AliyanH commented Feb 27, 2023 • edited Loading

prushforth left a comment

Choose a reason for hiding this comment

prushforth commented Feb 27, 2023

Jacky0299 commented Feb 27, 2023

prushforth commented Feb 27, 2023 • edited Loading

Jacky0299 commented Feb 27, 2023

AliyanH left a comment

Choose a reason for hiding this comment

AliyanH commented Feb 28, 2023

prushforth left a comment

Choose a reason for hiding this comment

prushforth Mar 1, 2023

Choose a reason for hiding this comment

prushforth Mar 1, 2023

Choose a reason for hiding this comment

prushforth commented Mar 1, 2023

prushforth commented Mar 1, 2023

AliyanH Mar 1, 2023

Choose a reason for hiding this comment

Jacky0299 commented Feb 21, 2023 •

edited by AliyanH

Loading

AliyanH commented Feb 27, 2023 •

edited

Loading

prushforth commented Feb 27, 2023 •

edited

Loading