Skip to content

Commit

Permalink
Merged in upstream changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-wu committed Jul 10, 2024
2 parents c9c982d + b15fca9 commit b9469ea
Show file tree
Hide file tree
Showing 10 changed files with 292 additions and 33 deletions.
200 changes: 177 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@abi-software/mapintegratedvuer",
"version": "1.2.1",
"version": "1.2.1-beta.4",
"license": "Apache-2.0",
"scripts": {
"serve": "vite --host --force",
Expand Down Expand Up @@ -50,11 +50,11 @@
"*.js"
],
"dependencies": {
"@abi-software/flatmapvuer": "^1.2.0",
"@abi-software/map-side-bar": "^2.2.1-alpha-3",
"@abi-software/flatmapvuer": "^1.3.1",
"@abi-software/map-side-bar": "^2.3.0",
"@abi-software/map-utilities": "^0.0.0-beta.6",
"@abi-software/plotvuer": "1.0.0",
"@abi-software/scaffoldvuer": "^1.2.1",
"@abi-software/scaffoldvuer": "^1.2.1-beta.0",
"@abi-software/simulationvuer": "1.0.0",
"@abi-software/svg-sprite": "1.0.0",
"@element-plus/icons-vue": "^2.3.1",
Expand Down
1 change: 1 addition & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
:state="state"
:shareLink="shareLink"
:useHelpModeDialog="true"
:connectivityInfoSidebar="true"
@updateShareLinkRequested="updateUUID"
@isReady="mapIsReady"
/>
Expand Down
1 change: 1 addition & 0 deletions src/components/ContentBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ export default {
target: value
});
this.$nextTick(() => {
EventBus.emit('connectivity-info-close');
setTimeout(() => {
this.$emit("chooser-changed");
}, 1200);
Expand Down
8 changes: 8 additions & 0 deletions src/components/MapContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ export default {
type: Boolean,
default: false,
},
/**
* The option to show connectivity info in sidebar.
*/
connectivityInfoSidebar: {
type: Boolean,
default: false,
},
},
data: function () {
return {
Expand Down Expand Up @@ -319,6 +326,7 @@ export default {
}
this.isReady = true;
this.settingsStore.updateUseHelpModeDialog(this.useHelpModeDialog);
this.settingsStore.updateConnectivityInfoSidebar(this.connectivityInfoSidebar);
}
}
Expand Down
Loading

0 comments on commit b9469ea

Please sign in to comment.