You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/04/08 17:24:56 UTC
[royale-asjs] branch develop updated: jewel-wizard: fixes when
steps use bindings
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new f0ef569 jewel-wizard: fixes when steps use bindings
f0ef569 is described below
commit f0ef56992b7da120e094fde1c9075028b866c890
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Apr 8 19:24:49 2019 +0200
jewel-wizard: fixes when steps use bindings
---
.../Jewel/src/main/royale/org/apache/royale/jewel/WizardPage.as | 3 +--
.../org/apache/royale/jewel/beads/controllers/WizardController.as | 7 +++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardPage.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardPage.as
index bec33b6..d3c85bf 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardPage.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardPage.as
@@ -289,8 +289,7 @@ package org.apache.royale.jewel
{
switch (event.type){
case WizardEvent.REQUEST_NAVIGATE_TO_STEP:
- var step:WizardStep = wizard.findStepByName(event.stepName);
- model.currentStep = step;
+ wizard.showPage(event.stepName);
break;
case WizardEvent.REQUEST_NAVIGATE_PREVIOUS_STEP:
wizard.dispatchEvent(new Event("goToPreviousStep"));
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/WizardController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/WizardController.as
index 75c8deb..a45991b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/WizardController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/WizardController.as
@@ -181,8 +181,12 @@ package org.apache.royale.jewel.beads.controllers
model.currentStep.page.removeClass(WizardPage.RIGHT_EFFECT);
var previous:WizardStep = findStep(model.currentStep, true);
+
while(previous != null)
{
+ // this prevents bindings not done
+ if(previous != null && !previous.name)
+ break;
previous.page.removeClass(WizardPage.RIGHT_EFFECT);
previous.page.addClass(WizardPage.LEFT_EFFECT);
previous = findStep(previous, true);
@@ -191,6 +195,9 @@ package org.apache.royale.jewel.beads.controllers
var next:WizardStep = findStep(model.currentStep, false);
while(next != null)
{
+ // this prevents bindings not done
+ if(next != null && !next.name)
+ break;
next.page.removeClass(WizardPage.LEFT_EFFECT);
next.page.addClass(WizardPage.RIGHT_EFFECT);
next = findStep(next, false);