From c688a41de941211be13fea54a9e6073b5367b03a Mon Sep 17 00:00:00 2001
From: Manolo Carrasco <manolo@apache.org>
Date: Fri, 9 Aug 2019 21:39:40 +0200
Subject: [PATCH] CCDM: small refactor to fix odd JS error

---
 .../client/communication/XhrConnection.java   | 31 +++++++------------
 .../binding/SimpleElementBindingStrategy.java |  1 +
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/flow-client/src/main/java/com/vaadin/client/communication/XhrConnection.java b/flow-client/src/main/java/com/vaadin/client/communication/XhrConnection.java
index 5f07c8f8d3f..1159e6ccc82 100644
--- a/flow-client/src/main/java/com/vaadin/client/communication/XhrConnection.java
+++ b/flow-client/src/main/java/com/vaadin/client/communication/XhrConnection.java
@@ -158,7 +158,17 @@ public void send(JsonObject payload) {
         responseHandler.setRequestStartTime(Profiler.getRelativeTimeMillis());
 
         String payloadJson = WidgetUtil.stringify(payload);
-        XMLHttpRequest xhr = Xhr.post(getUri(), payloadJson,
+
+        String uri = registry.getApplicationConfiguration().getServiceUrl();
+        uri = SharedUtil.addGetParameter(uri,
+                ApplicationConstants.REQUEST_TYPE_PARAMETER,
+                ApplicationConstants.REQUEST_TYPE_UIDL);
+
+        uri = SharedUtil.addGetParameter(uri,
+                ApplicationConstants.UI_ID_PARAMETER,
+                registry.getApplicationConfiguration().getUIId());
+
+        XMLHttpRequest xhr = Xhr.post(uri, payloadJson,
                 JsonConstants.JSON_CONTENT_TYPE, responseHandler);
 
         Console.log("Sending xhr message to server: " + payloadJson);
@@ -178,25 +188,6 @@ public void run() {
         }
     }
 
-    /**
-     * Retrieves the URI to use when sending RPCs to the server
-     *
-     * @return The URI to use for server messages.
-     */
-    protected String getUri() {
-        String uri = registry.getApplicationConfiguration().getServiceUrl();
-        uri = SharedUtil.addGetParameter(uri,
-                ApplicationConstants.REQUEST_TYPE_PARAMETER,
-                ApplicationConstants.REQUEST_TYPE_UIDL);
-
-        uri = SharedUtil.addGetParameter(uri,
-                ApplicationConstants.UI_ID_PARAMETER,
-                registry.getApplicationConfiguration().getUIId());
-
-        return uri;
-
-    }
-
     private static native boolean resendRequest(XMLHttpRequest xhr)
     /*-{
         if (xhr.readyState != 1) {
diff --git a/flow-client/src/main/java/com/vaadin/client/flow/binding/SimpleElementBindingStrategy.java b/flow-client/src/main/java/com/vaadin/client/flow/binding/SimpleElementBindingStrategy.java
index 06de0201c3d..776a42ec72b 100644
--- a/flow-client/src/main/java/com/vaadin/client/flow/binding/SimpleElementBindingStrategy.java
+++ b/flow-client/src/main/java/com/vaadin/client/flow/binding/SimpleElementBindingStrategy.java
@@ -335,6 +335,7 @@ private native void hookUpPolymerElement(StateNode node, Element element)
     
                         var props = Object.getOwnPropertyNames(changedProps);
                         var items = "items.";
+                        var i;
                         for(i=0; i<props.length; i++){
                             // There should be a property which starts with "items."
                             // and the next token is the index of changed item