summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-04-24 13:41:05 +0000
committerLeif Åstrand <leif@vaadin.com>2012-04-24 13:41:05 +0000
commit032f760be4c0bb84ea35a3faabcac721a764a56f (patch)
treefce4aee2f0ef307dd0d8bfd5d9b08a166fe633be /src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
parent1b2117fcf2fe62c67f29a913c60d93c358f3198c (diff)
downloadvaadin-framework-032f760be4c0bb84ea35a3faabcac721a764a56f.tar.gz
vaadin-framework-032f760be4c0bb84ea35a3faabcac721a764a56f.zip
Wrap javascript callback entry points in $entry (#8699)
svn changeset:23623/svn branch:6.8
Diffstat (limited to 'src/com/vaadin/terminal/gwt/client/ApplicationConnection.java')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ApplicationConnection.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 4c6fc8462b..de7ad83b54 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -220,10 +220,10 @@ public class ApplicationConnection {
/*-{
var ap = this;
var client = {};
- client.isActive = function() {
+ client.isActive = $entry(function() {
return ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::hasActiveRequest()()
|| ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::isExecutingDeferredCommands()();
- }
+ });
var vi = ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::getVersionInfo()();
if (vi) {
@@ -232,21 +232,21 @@ public class ApplicationConnection {
}
}
- client.getProfilingData = function() {
+ client.getProfilingData = $entry(function() {
var pd = [
ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::lastProcessingTime,
ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::totalProcessingTime
];
pd = pd.concat(ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::testBenchServerStatus);
return pd;
- }
+ });
- client.getElementByPath = function(id) {
+ client.getElementByPath = $entry(function(id) {
return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getElementByPath(Ljava/lang/String;)(id);
- }
- client.getPathForElement = function(element) {
+ });
+ client.getPathForElement = $entry(function(element) {
return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getPathForElement(Lcom/google/gwt/user/client/Element;)(element);
- }
+ });
if (!$wnd.vaadin.clients) {
$wnd.vaadin.clients = {};
@@ -292,22 +292,22 @@ public class ApplicationConnection {
if ($wnd.vaadin.forceSync) {
oldSync = $wnd.vaadin.forceSync;
}
- $wnd.vaadin.forceSync = function() {
+ $wnd.vaadin.forceSync = $entry(function() {
if (oldSync) {
oldSync();
}
app.@com.vaadin.terminal.gwt.client.ApplicationConnection::sendPendingVariableChanges()();
- }
+ });
var oldForceLayout;
if ($wnd.vaadin.forceLayout) {
oldForceLayout = $wnd.vaadin.forceLayout;
}
- $wnd.vaadin.forceLayout = function() {
+ $wnd.vaadin.forceLayout = $entry(function() {
if (oldForceLayout) {
oldForceLayout();
}
app.@com.vaadin.terminal.gwt.client.ApplicationConnection::forceLayout()();
- }
+ });
}-*/;
/**