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/02/06 23:50:34 UTC
git commit: ISIS-692: removing flicker of choices drop-down
Updated Branches:
refs/heads/master 60e89ea52 -> 2f219a338
ISIS-692: removing flicker of choices drop-down
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2f219a33
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2f219a33
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2f219a33
Branch: refs/heads/master
Commit: 2f219a338d0ea73d265b1728eef6878feff611c9
Parents: 60e89ea
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Feb 6 18:42:58 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Feb 6 18:42:58 2014 +0000
----------------------------------------------------------------------
.../components/widgets/entitylink/EntityLinkSelect2Panel.css | 4 ++++
.../components/widgets/entitylink/EntityLinkSelect2Panel.html | 6 ++++--
.../widgets/valuechoices/ValueChoicesSelect2Panel.css | 5 +++++
.../widgets/valuechoices/ValueChoicesSelect2Panel.html | 4 +++-
4 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2f219a33/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
index 96be7fd..c118a6f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.css
@@ -37,3 +37,7 @@ div.entityLinkSelect2Panel > div {
font-size: smaller;
}
+.entityLinkSelect2Panel .autoCompletePlaceholder {
+ display: block;
+ height: 30px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/2f219a33/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.html
index fc8df46..08a2210 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2Panel.html
@@ -31,8 +31,10 @@
<wicket:panel>
<div class="entityLinkSelect2Panel entityLinkComponentType">
<div>
- <input wicket:id="autoComplete" type="hidden" class="autoComplete" />
- <span wicket:id="entityIconAndTitle">[icon and title]</span>
+ <span class="autoCompletePlaceholder">
+ <input wicket:id="autoComplete" type="hidden" class="autoComplete" />
+ <span wicket:id="entityIconAndTitle">[icon and title]</span>
+ </span>
<div class="clear"/>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/2f219a33/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
index eaeea17..a7f0ee1 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
@@ -16,3 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+.valueChoicesSelect2Panel .choicesPlaceholder {
+ display: block;
+ height: 30px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/2f219a33/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index c894934..81bacd6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@ -34,7 +34,9 @@
<span wicket:id="scalarName" class="scalarName">[Label text]</span>
<span class="scalarValue">
- <input wicket:id="valueId" type="hidden" class="choices" />
+ <span class="choicesPlaceholder">
+ <input wicket:id="valueId" type="hidden" class="choices" />
+ </span>
<span wicket:id="feedback"></span>
<span wicket:id="additionalLinks"/>
</span>