Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Include GameRunningModal in all pages supporting game launching #985

Merged
merged 1 commit into from
Feb 28, 2023
Merged

Include GameRunningModal in all pages supporting game launching #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/components/navigation/NavigationLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<div class="column">
<router-view @error="$emit('error', $event)" />
</div>
<GameRunningModal :activeGame="activeGame" />
</div>
</template>

Expand All @@ -14,10 +15,18 @@
import { Component, Vue } from 'vue-property-decorator';

import NavigationMenu from './NavigationMenu.vue';
import GameRunningModal from '../modals/GameRunningModal.vue';
import GameManager from '../../model/game/GameManager';

@Component({
components: {NavigationMenu}
components: {GameRunningModal, NavigationMenu}
})
export default class NavigationLayout extends Vue {}
export default class NavigationLayout extends Vue {
activeGame = GameManager.unsetGame();

created() {
this.activeGame = GameManager.activeGame;
}
}

</script>
3 changes: 0 additions & 3 deletions src/pages/Manager.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@
<CategoryFilterModal />
<LocalFileImportModal :visible="importingLocalMod" @close-modal="importingLocalMod = false" @error="showError($event)"/>
<DownloadModModal @error="showError($event)" />
<GameRunningModal :activeGame="activeGame" />

<router-view name="subview"
@error="showError"
Expand Down Expand Up @@ -176,14 +175,12 @@ import LocalFileImportModal from '../components/importing/LocalFileImportModal.v
import { PackageLoader } from '../model/installing/PackageLoader';
import GameInstructions from '../r2mm/launching/instructions/GameInstructions';
import CategoryFilterModal from '../components/modals/CategoryFilterModal.vue';
import GameRunningModal from '../components/modals/GameRunningModal.vue';

@Component({
components: {
LocalFileImportModal,
CategoryFilterModal,
DownloadModModal,
GameRunningModal,
'hero': Hero,
'progress-bar': Progress,
'ExpandableCard': ExpandableCard,
Expand Down