You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/10/24 18:03:20 UTC
[06/15] git commit: ISIS-537 Disable links/buttons with Bootstrap
facilities
ISIS-537 Disable links/buttons with Bootstrap facilities
https://trello.com/c/nzuiKnRf/76-some-fine-tuning-required
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/189c0aca
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/189c0aca
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/189c0aca
Branch: refs/heads/master
Commit: 189c0acaf67ef0d6601e82f2e927129fe8649302
Parents: f42a3cf
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 15:36:15 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 24 15:36:15 2014 +0300
----------------------------------------------------------------------
.../widgets/cssmenu/ActionLinkFactoryAbstract.java | 10 ++++++++++
.../entitysimplelink/EntityLinkSimplePanelFactory.java | 1 -
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/189c0aca/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
index 6655669..c8b3aa3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ActionLinkFactoryAbstract.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -27,6 +29,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.model.Model;
@@ -154,6 +157,13 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
// allow the event to bubble so the menu is hidden after click on an item
attributes.setEventPropagation(AjaxRequestAttributes.EventPropagation.BUBBLE);
}
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ Buttons.fixDisabledState(this, tag);
+ }
};
if(ajaxDeferredBehaviour != null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/189c0aca/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
index 02afd2a..f7c731d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
@@ -25,7 +25,6 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import org.apache.isis.viewer.wicket.ui.ComponentType;