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

PL-7568 TabSheet drag drop disables Embedded content

Browse Source
This commit is contained in:
Yuriy Artamonov 2016-07-20 14:02:29 +04:00
parent e676411bfa
commit 4bcdc8dd14
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/EmbeddedLoader.java
View File

@ -45,23 +45,26 @@ public class EmbeddedLoader extends AbstractComponentLoader<Embedded> {
String typeAttribute = element.attributeValue("type");
if (StringUtils.isNotEmpty(typeAttribute)) {
Embedded.Type type = Embedded.Type.valueOf(typeAttribute);
if (type != null) {
resultComponent.setType(type);
}
resultComponent.setType(type);
}
String srcAttr = element.attributeValue("src");
if (srcAttr != null) {
if (srcAttr.startsWith(URL_PREFIX)) {
String src = srcAttr.substring(URL_PREFIX.length());
URL targetUrl;
try {
String src = srcAttr.substring(URL_PREFIX.length());
resultComponent.setType(Embedded.Type.BROWSER);
resultComponent.setSource(new URL(src));
targetUrl = new URL(src);
} catch (MalformedURLException e) {
throw new GuiDevelopmentException("Unable to instantiate component", context.getFullFrameId(),
throw new GuiDevelopmentException("Incorrect URL in Embedded src attribute", context.getFullFrameId(),
"src", srcAttr);
}
} if (srcAttr.startsWith(THEME_PREFIX)) {
resultComponent.setType(Embedded.Type.BROWSER);
resultComponent.setSource(targetUrl);
} else if (srcAttr.startsWith(THEME_PREFIX)) {
resultComponent.setSource(srcAttr);
} else if (srcAttr.startsWith(FILE_PREFIX)) {
String src = srcAttr.substring(FILE_PREFIX.length());
@ -74,6 +77,7 @@ public class EmbeddedLoader extends AbstractComponentLoader<Embedded> {
}
loadVisible(resultComponent, element);
loadEnable(resultComponent, element);
loadStyleName(resultComponent, element);
loadHeight(resultComponent, element);

2
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTabSheet.java
View File

@ -89,6 +89,8 @@ public class CubaTabSheet extends DDTabSheet implements Action.Container {
public CubaTabSheet() {
registerRpc(rpc);
setShim(false);
setCloseHandler(new CloseHandler() {
@Override
public void onTabClose(com.vaadin.ui.TabSheet tabsheet, Component tabContent) {