-
Notifications
You must be signed in to change notification settings - Fork 704
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Detach navigator from sidebar #9933
Draft
NickWingate
wants to merge
4
commits into
master
Choose a base branch
from
private/nickwingate/2408/detach-navigator
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| /* -*- js-indent-level: 8 -*- */ | ||
| /* | ||
| * Copyright the Collabora Online contributors. | ||
| * | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| * | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
| /* | ||
| * JSDialog.NavigatorPanel | ||
| */ | ||
|
|
||
| /* global app */ | ||
| class NavigatorPanel { | ||
| map: any; | ||
| container: HTMLDivElement; | ||
| builder: any; | ||
|
|
||
| constructor(map: any) { | ||
| this.onAdd(map); | ||
| } | ||
|
|
||
| onAdd(map: ReturnType<typeof L.map>) { | ||
| this.map = map; | ||
|
|
||
| app.events.on('resize', this.onResize.bind(this)); | ||
|
|
||
| this.builder = new L.control.jsDialogBuilder({ | ||
| mobileWizard: this, | ||
| map: map, | ||
| cssClass: 'jsdialog sidebar', // keep sidebar styling for now, change later | ||
| }); | ||
| this.container = L.DomUtil.create( | ||
| 'div', | ||
| 'navigator-container', | ||
| $('#navigator-panel').get(0), | ||
| ); | ||
|
|
||
| this.map.on('navigator', this.onNavigator, this); | ||
| this.map.on('jsdialogupdate', this.onJSUpdate, this); | ||
| this.map.on('jsdialogaction', this.onJSAction, this); | ||
| } | ||
|
|
||
| onRemove() { | ||
| this.map.off('navigator'); | ||
| this.map.off('jsdialogupdate', this.onJSUpdate, this); | ||
| this.map.off('jsdialogaction', this.onJSAction, this); | ||
| } | ||
|
|
||
| isVisible(): boolean { | ||
| return $('#navigator-dock-wrapper').is(':visible'); | ||
| } | ||
|
|
||
| onJSUpdate(e: FireEvent) { | ||
| var data = e.data; | ||
|
|
||
| if (data.jsontype !== 'navigator') return; | ||
|
|
||
| if (!this.container) return; | ||
|
|
||
| if (!this.builder) return; | ||
|
|
||
| // reduce unwanted warnings in console | ||
| if (data.control.id === 'addonimage') { | ||
| window.app.console.log('Ignored update for control: ' + data.control.id); | ||
| return; | ||
| } | ||
|
|
||
| this.builder.updateWidget(this.container, data.control); | ||
| } | ||
|
|
||
| onJSAction(e: FireEvent) { | ||
| var data = e.data; | ||
|
|
||
| if (data.jsontype !== 'navigator') return; | ||
|
|
||
| if (!this.builder) return; | ||
|
|
||
| if (!this.container) return; | ||
|
|
||
| var innerData = data.data; | ||
| if (!innerData) return; | ||
|
|
||
| var controlId = innerData.control_id; | ||
|
|
||
| // Panels share the same name for main containers, do not execute actions for them | ||
| // if panel has to be shown or hidden, full update will appear | ||
| if ( | ||
| controlId === 'contents' || | ||
| controlId === 'Panel' || | ||
| controlId === 'titlebar' || | ||
| controlId === 'addonimage' | ||
| ) { | ||
| window.app.console.log( | ||
| 'Ignored action: ' + | ||
| innerData.action_type + | ||
| ' for control: ' + | ||
| controlId, | ||
| ); | ||
| return; | ||
| } | ||
|
|
||
| this.builder.executeAction(this.container, innerData); | ||
| } | ||
|
|
||
| onResize() { | ||
| var wrapper = document.getElementById('navigator-dock-wrapper'); | ||
| wrapper.style.maxHeight = | ||
| document.getElementById('document-container').getBoundingClientRect() | ||
| .height + 'px'; | ||
| } | ||
|
|
||
| closeNavigator() { | ||
| $('#navigator-dock-wrapper').hide(); | ||
| this.map._onResize(); | ||
|
|
||
| if (!this.map.editorHasFocus()) { | ||
| this.map.fire('editorgotfocus'); | ||
| this.map.focus(); | ||
| } | ||
|
|
||
| //this.map.uiManager.setDocTypePref('ShowSidebar', false); | ||
| } | ||
|
|
||
| onNavigator(data: FireEvent) { | ||
| var navigatorData = data.data; | ||
| this.builder.setWindowId(navigatorData.id); | ||
| $(this.container).empty(); | ||
|
|
||
| if ( | ||
| navigatorData.action === 'close' || // todo: i dont know if we ever actually get this call | ||
| window.app.file.disableSidebar || | ||
| this.map.isReadOnlyMode() | ||
| ) { | ||
| this.closeNavigator(); | ||
| } else if (navigatorData.children) { | ||
| // for (var i = navigatorData.children.length - 1; i >= 0; i--) { | ||
| // if ( | ||
| // navigatorData.children[i].type !== 'deck' || | ||
| // navigatorData.children[i].visible === false | ||
| // ) | ||
| // navigatorData.children.splice(i, 1); | ||
| // } | ||
|
|
||
| if (navigatorData.children.length) { | ||
| this.onResize(); | ||
|
|
||
| // if ( | ||
| // navigatorData.children && | ||
| // navigatorData.children[0] && | ||
| // navigatorData.children[0].id | ||
| // ) { | ||
| // this.unsetSelectedSidebar(); | ||
| // var currentDeck = sidebarData.children[0].id; | ||
| // this.map.uiManager.setDocTypePref(currentDeck, true); | ||
| // if (this.targetDeckCommand) { | ||
| // var stateHandler = this.map['stateChangeHandler']; | ||
| // var isCurrent = stateHandler | ||
| // ? stateHandler.getItemValue(this.targetDeckCommand) | ||
| // : false; | ||
| // // just to be sure chack with other method | ||
| // if (isCurrent === 'false' || !isCurrent) | ||
| // isCurrent = | ||
| // this.targetDeckCommand === this.commandForDeck(currentDeck); | ||
| // if (this.targetDeckCommand && (isCurrent === 'false' || !isCurrent)) | ||
| // this.changeDeck(this.targetDeckCommand); | ||
| // } else { | ||
| // this.changeDeck(this.targetDeckCommand); | ||
| // } | ||
| } | ||
|
|
||
| this.builder.build(this.container, [navigatorData]); | ||
| if (!this.isVisible()) $('#sidebar-dock-wrapper').show(200); | ||
|
|
||
| //this.map.uiManager.setDocTypePref('ShowSidebar', true); | ||
| } else { | ||
| this.closeNavigator(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| JSDialog.NavigatorPanel = function (map: any) { | ||
| return new NavigatorPanel(map); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we now create base class:
SidebarBasewhich will be parent of Sidebar and Navigator.We can then share almost all of the
onAdd,onRemove,isVisible,onJSUpdate,onJSAction.We only need to define strings which are different:
why do not concatenate even more:
TYPE + '-dock-wrapper'? because it's then easier togit grepif id is fully present in the code and css to find related code :)