test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multiple spaces between words in 'Label' trimmed to single space #PL-5024

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-03-17 08:49:58 +00:00
parent 5606c3812e
commit 875f08d45f
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/label/CubaLabelConnector.java
View File

@ -38,17 +38,7 @@ public class CubaLabelConnector extends LabelConnector {
break;
case TEXT:
// clear existing content
getWidget().setHTML("");
// set multiline text if needed
// Haulmont API
String text = getState().text;
if (text != null && text.contains("\n")) {
text = Util.escapeHTML(text).replace("\n", "<br/>");
getWidget().setHTML(text);
} else {
getWidget().setText(text);
}
getWidget().setText(getState().text);
break;
case HTML:

3
modules/web/src/com/haulmont/cuba/web/gui/components/WebLabel.java
View File

@ -47,6 +47,7 @@ public class WebLabel extends WebAbstractComponent<com.vaadin.ui.Label> implemen
public WebLabel() {
component = new CubaLabel();
component.setContentMode(ContentMode.PREFORMATTED);
component.setSizeUndefined();
}
@ -215,6 +216,6 @@ public class WebLabel extends WebAbstractComponent<com.vaadin.ui.Label> implemen
@Override
public void setHtmlEnabled(boolean htmlEnabled) {
component.setContentMode(htmlEnabled ? ContentMode.HTML : ContentMode.TEXT);
component.setContentMode(htmlEnabled ? ContentMode.HTML : ContentMode.PREFORMATTED);
}
}

3
modules/web6/src/com/haulmont/cuba/web/gui/components/WebLabel.java
View File

@ -42,6 +42,7 @@ public class WebLabel extends WebAbstractComponent<com.vaadin.ui.Label> implemen
public WebLabel() {
component = new com.vaadin.ui.Label();
component.setContentMode(com.vaadin.ui.Label.CONTENT_PREFORMATTED);
component.setSizeUndefined();
}
@ -182,6 +183,6 @@ public class WebLabel extends WebAbstractComponent<com.vaadin.ui.Label> implemen
@Override
public void setHtmlEnabled(boolean htmlEnabled) {
component.setContentMode(htmlEnabled ? com.vaadin.ui.Label.CONTENT_XHTML : com.vaadin.ui.Label.CONTENT_TEXT);
component.setContentMode(htmlEnabled ? com.vaadin.ui.Label.CONTENT_XHTML : com.vaadin.ui.Label.CONTENT_PREFORMATTED);
}
}