diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-05-04 14:28:45 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-05-04 14:28:45 +0300 |
| commit | 2b4abbe715a278146d2d53f0d75b4ec1a47506dd (patch) | |
| tree | f05564921f49684ac6ae588c053dc51e55c7d439 | |
| parent | 1a7d62be9a4101bc4cf5982093486afa165ef486 (diff) | |
| download | vaadin-framework-2b4abbe715a278146d2d53f0d75b4ec1a47506dd.tar.gz vaadin-framework-2b4abbe715a278146d2d53f0d75b4ec1a47506dd.zip | |
Add $entry to code only present in Vaadin 7 (#8699)
3 files changed, 7 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 170e949116..ff77c5904a 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -69,6 +69,7 @@ public class ApplicationConfiguration implements EntryPoint { if (value === null || value === undefined) { return null; } else { + // $entry not needed as function is not exported return @java.lang.Boolean::valueOf(Z)(value); } }-*/; @@ -89,6 +90,7 @@ public class ApplicationConfiguration implements EntryPoint { if (value === null || value === undefined) { return null; } else { + // $entry not needed as function is not exported return @java.lang.Integer::valueOf(I)(value); } }-*/; @@ -589,7 +591,7 @@ public class ApplicationConfiguration implements EntryPoint { */ public native static void registerCallback(String widgetsetName) /*-{ - var callbackHandler = @com.vaadin.terminal.gwt.client.ApplicationConfiguration::startApplication(Ljava/lang/String;); + var callbackHandler = $entry(@com.vaadin.terminal.gwt.client.ApplicationConfiguration::startApplication(Ljava/lang/String;)); $wnd.vaadin.registerWidgetset(widgetsetName, callbackHandler); }-*/; diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java index 18cfc643d3..174a4b88ca 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java +++ b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java @@ -8,9 +8,9 @@ public class UploadIFrameOnloadStrategy { native void hookEvents(com.google.gwt.dom.client.Element iframe, VUpload upload) /*-{ - iframe.onload = function() { + iframe.onload = $entry(function() { upload.@com.vaadin.terminal.gwt.client.ui.upload.VUpload::onSubmitComplete()(); - }; + }); }-*/; /** diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java index 19d38a8a95..17a7e46bd5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java +++ b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java @@ -13,11 +13,11 @@ public class UploadIFrameOnloadStrategyIE extends UploadIFrameOnloadStrategy { @Override native void hookEvents(Element iframe, VUpload upload) /*-{ - iframe.onreadystatechange = function() { + iframe.onreadystatechange = $entry(function() { if (iframe.readyState == 'complete') { upload.@com.vaadin.terminal.gwt.client.ui.upload.VUpload::onSubmitComplete()(); } - }; + }); }-*/; @Override |