aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-01-14 13:11:28 +0200
committerArtur Signell <artur@vaadin.com>2015-01-14 13:11:28 +0200
commitab167b9f0acc6144aedc24e23bfc47781c41fbc0 (patch)
treeb57eb19eaffffc7f5f3808bec4863b61e6a6fdd3
parentb594fce7c22a0aace59e8074ee39784371752910 (diff)
parentdcfebeb46143d8e9c21424c572c48d2217c80477 (diff)
downloadvaadin-framework-ab167b9f0acc6144aedc24e23bfc47781c41fbc0.tar.gz
vaadin-framework-ab167b9f0acc6144aedc24e23bfc47781c41fbc0.zip
Merge commit 'origin/grid' into 7.4
-rw-r--r--WebContent/VAADIN/themes/base/grid/grid.scss6
-rw-r--r--client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java12
-rw-r--r--client/src/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java2
3 files changed, 13 insertions, 7 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index f1889286b7..0792566c5d 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -260,4 +260,10 @@ $v-grid-editor-background-color: $v-grid-row-background-color !default;
width: auto !important;
height: auto !important;
}
+
+ // Renderers
+
+ .#{$primaryStyleName}-cell > .v-progressbar {
+ width: 100%;
+ }
}
diff --git a/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java b/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
index 16f21d5d66..517d979c8e 100644
--- a/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
+++ b/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
@@ -455,7 +455,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
if (basePath == null) {
return null;
}
- String simpleName = w.getClass().getSimpleName();
+ String simpleName = Util.getSimpleName(w);
/*
* Check if the parent implements Iterable. At least VPopupView does not
@@ -475,7 +475,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
return basePath + PARENTCHILD_SEPARATOR + simpleName + "["
+ pos + "]";
}
- String simpleName2 = child.getClass().getSimpleName();
+ String simpleName2 = Util.getSimpleName(child);
if (simpleName.equals(simpleName2)) {
pos++;
}
@@ -606,8 +606,8 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
// the same type before it
int nextIndex = 0;
for (Widget child : layout) {
- boolean matchingType = nextWidgetClassName.equals(child
- .getClass().getSimpleName());
+ boolean matchingType = nextWidgetClassName.equals(Util
+ .getSimpleName(child));
if (matchingType && widgetPosition == 0) {
// This is the n:th child that we looked for
break;
@@ -661,7 +661,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
while (iterator.hasNext()) {
Widget child = iterator.next();
- String simpleName2 = child.getClass().getSimpleName();
+ String simpleName2 = Util.getSimpleName(child);
if (!widgetClassName.equals(simpleName2)
&& child instanceof Slot) {
@@ -671,7 +671,7 @@ public class LegacyLocatorStrategy implements LocatorStrategy {
* directly checking the stuff inside the slot
*/
child = ((Slot) child).getWidget();
- simpleName2 = child.getClass().getSimpleName();
+ simpleName2 = Util.getSimpleName(child);
}
if (widgetClassName.equals(simpleName2)) {
diff --git a/client/src/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java b/client/src/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
index ea0fd2042e..44bdeddff3 100644
--- a/client/src/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
+++ b/client/src/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
@@ -644,7 +644,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
// If the server-side class name didn't match, fall back to testing for
// the explicit widget name
- String widget = connector.getWidget().getClass().getSimpleName();
+ String widget = Util.getSimpleName(connector.getWidget());
return widgetName.equals(widget)
|| widgetName.equals(widget + ".class");