Created
June 1, 2022 02:16
-
-
Save lchanmann/f9fd067418585de01dacb7250a90152b to your computer and use it in GitHub Desktop.
This file contains hidden or 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
Index: src/foam/nanos/crunch/ui/UCJView.js | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/foam/nanos/crunch/ui/UCJView.js b/src/foam/nanos/crunch/ui/UCJView.js | |
--- a/src/foam/nanos/crunch/ui/UCJView.js (revision 3cd0783ae2b1bb4649d671479f07aea9112a9e66) | |
+++ b/src/foam/nanos/crunch/ui/UCJView.js (revision 7204d43446b32459e7d62a4c27a61d0bc24bf868) | |
@@ -122,7 +122,8 @@ | |
controllerMode: | |
this.mode == this.DisplayMode.RW | |
? this.ControllerMode.EDIT | |
- : this.ControllerMode.VIEW | |
+ : this.ControllerMode.VIEW, | |
+ disableRefreshWizardlet: true | |
}); | |
var sequence = undefined; | |
if ( this.isSettingCapabilities ) { | |
Index: src/foam/u2/wizard/agents/StepWizardAgent.js | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
diff --git a/src/foam/u2/wizard/agents/StepWizardAgent.js b/src/foam/u2/wizard/agents/StepWizardAgent.js | |
--- a/src/foam/u2/wizard/agents/StepWizardAgent.js (revision 3cd0783ae2b1bb4649d671479f07aea9112a9e66) | |
+++ b/src/foam/u2/wizard/agents/StepWizardAgent.js (revision 7204d43446b32459e7d62a4c27a61d0bc24bf868) | |
@@ -70,19 +70,27 @@ | |
const view = usingFormController ? { | |
// new approach | |
...this.config.controller, | |
- view: this.config.wizardView | |
+ view: this.config.wizardView | |
} : { | |
// deprecated | |
...this.config.wizardView | |
}; | |
view.data = this.wizardController; | |
- view.onClose = this.stack.back.bind(this.stack); | |
const wizardStackBlock = this.StackBlock.create({ | |
view, ...(this.popupMode ? { popup: this.config.popup || {} } : {}) | |
}); | |
+ view.onClose = function() { | |
+ if ( this.stack.BACK.isEnabled(this.stack.pos) ) | |
+ this.stack.back(); | |
+ else | |
+ // This is temporarily necessary to fake a StackBlock removal | |
+ // in case the stack is empty when the wizard is pushed. | |
+ wizardStackBlock.removed.pub(); | |
+ }; | |
+ | |
await new Promise(resolve => { | |
wizardStackBlock.removed.sub(() => { | |
resolve(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment