You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/08/27 19:00:17 UTC
[1/3] git commit: WICKET-5683 PreviousButton isEnabled() should bo
logical conjunction of getWizardModel().isPreviousAvailable() and
super.isEnabled()
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x a59548233 -> 594d36ec8
WICKET-5683 PreviousButton isEnabled() should bo logical conjunction of
getWizardModel().isPreviousAvailable() and super.isEnabled()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/783c3be4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/783c3be4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/783c3be4
Branch: refs/heads/wicket-6.x
Commit: 783c3be4327375e4ff4278879743592e7f267bec
Parents: a595482
Author: adelbene <an...@gmail.com>
Authored: Wed Aug 27 14:03:38 2014 +0200
Committer: adelbene <an...@gmail.com>
Committed: Wed Aug 27 18:39:21 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/extensions/wizard/PreviousButton.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/783c3be4/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
index 0e07a6c..cf801f2 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/PreviousButton.java
@@ -46,7 +46,7 @@ public class PreviousButton extends WizardButton
@Override
public boolean isEnabled()
{
- return getWizardModel().isPreviousAvailable();
+ return getWizardModel().isPreviousAvailable() && super.isEnabled();
}
/**
[2/3] git commit: WICKET-5683 PreviousButton isEnabled() should bo
logical conjunction of getWizardModel().isPreviousAvailable() and
super.isEnabled()
Posted by ad...@apache.org.
WICKET-5683 PreviousButton isEnabled() should bo logical conjunction of
getWizardModel().isPreviousAvailable() and super.isEnabled()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/47561dd9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/47561dd9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/47561dd9
Branch: refs/heads/wicket-6.x
Commit: 47561dd9ed0eaf5cbe19cba33988366301579f82
Parents: 783c3be
Author: adelbene <an...@gmail.com>
Authored: Wed Aug 27 18:27:37 2014 +0200
Committer: adelbene <an...@gmail.com>
Committed: Wed Aug 27 18:39:48 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/extensions/wizard/CancelButton.java | 2 +-
.../java/org/apache/wicket/extensions/wizard/FinishButton.java | 3 ++-
.../java/org/apache/wicket/extensions/wizard/LastButton.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/47561dd9/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
index d288379..7830190 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/CancelButton.java
@@ -55,7 +55,7 @@ public class CancelButton extends WizardButton
@Override
public final boolean isVisible()
{
- return getWizardModel().isCancelVisible();
+ return getWizardModel().isCancelVisible() && super.isVisible();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/47561dd9/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
index ae157d4..be62df0 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/FinishButton.java
@@ -46,7 +46,8 @@ public class FinishButton extends WizardButton
public boolean isEnabled()
{
IWizardStep activeStep = getWizardModel().getActiveStep();
- return ((activeStep != null) && getWizardModel().isLastStep(activeStep));
+ return (activeStep != null) && getWizardModel().isLastStep(activeStep)
+ && super.isEnabled();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/47561dd9/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
index 5c47e18..5fad4d4 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/LastButton.java
@@ -46,7 +46,7 @@ public class LastButton extends WizardButton
@Override
public boolean isEnabled()
{
- return getWizardModel().isLastAvailable();
+ return getWizardModel().isLastAvailable() && super.isEnabled();
}
/**
@@ -55,7 +55,7 @@ public class LastButton extends WizardButton
@Override
public boolean isVisible()
{
- return getWizardModel().isLastVisible();
+ return getWizardModel().isLastVisible() && super.isVisible();
}
/**
[3/3] git commit: WICKET-5684 Autocomplete example renders the search
term
Posted by ad...@apache.org.
WICKET-5684 Autocomplete example renders the search term
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/594d36ec
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/594d36ec
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/594d36ec
Branch: refs/heads/wicket-6.x
Commit: 594d36ec8ccec75b0a88ab4d9d967db5c8a05ecd
Parents: 47561dd
Author: adelbene <an...@gmail.com>
Authored: Wed Aug 27 14:04:13 2014 +0200
Committer: adelbene <an...@gmail.com>
Committed: Wed Aug 27 18:57:44 2014 +0200
----------------------------------------------------------------------
.../ajax/markup/html/autocomplete/wicket-autocomplete.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/594d36ec/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
index f2c4062..ba66221 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/wicket-autocomplete.js
@@ -53,7 +53,7 @@
var ignoreKeyEnter = false; // ignore key ENTER because is already hid the autocomplete list
var ignoreOneFocusGain = false; // on FF, clicking an option in the pop-up would make field loose focus; focus() call only has effect in FF after popup is hidden, so the re-focusing must not show popup again in this case
- var ignoreChange = false; // ignore change event because TAB or ENTER event already triggered a change
+ var ignoreChange = true; // ignore change event because TAB or ENTER event already triggered a change
var initialElement;
@@ -94,6 +94,7 @@
initialElement = obj;
Wicket.Event.add(obj, 'blur', function (jqEvent) {
+ jqEvent.stopPropagation();
window.setTimeout(hideAutoComplete, 500);
});
@@ -634,6 +635,7 @@
if (value) {
input.value = value;
jQuery(input).triggerHandler('change');
+ ignoreChange = true;
}
if (document.activeElement !== input) {
ignoreOneFocusGain = true;