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

Fix issues with unchangeable page after cancelled dirty warning #2401

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix issues with unchangeable page after cancelled dirty warning #2401

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
8 changes: 4 additions & 4 deletions bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
'Changes have not been saved',
function () { resolve() },
function () {
const { pushStateRoot = '', pushStateSeparator } = router.params
let url = routeFrom.url
history.pushState({ 'view_main': { 'url': url } }, '', pushStateRoot + pushStateSeparator + url)
//const { pushStateRoot = '', pushStateSeparator } = router.params

Check failure on line 15 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
//let url = routeFrom.url

Check failure on line 16 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
//history.pushState({ 'view_main': { 'url': url } }, '', pushStateRoot + pushStateSeparator + url)

Check failure on line 17 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
reject()
router.allowPageChange = true
//router.allowPageChange = true

Check failure on line 19 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
}
)

Check failure on line 21 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
} else {

Check failure on line 22 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
resolve()

Check failure on line 23 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
}
},

Check failure on line 25 in bundles/org.openhab.ui/web/src/pages/settings/dirty-mixin.js

View workflow job for this annotation

GitHub Actions / checks 

Expected space or tab after '//' in comment
switchTab (tab, onSuccessCallback) {
if (this.currentTab !== tab) {
this.currentTab = tab
Expand Down
Loading