Merge pull request #87 from vegegoku/master

undefined

Author: manolo

lib/com/vaadin/polymer/Polymer.java

@@ -2,7 +2,7 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
-import elemental2.core.Array;
+import elemental2.core.JsArray;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.DOM;
@@ -61,11 +61,11 @@ public interface DomApi {
 
         <T extends HTMLElement> T querySelector(String selector);
 
-        Array querySelectorAll(String selector);
+        JsArray querySelectorAll(String selector);
 
         void appendChild(Object el);
 
-        Array children();
+        JsArray children();
     }
 
     @JsType(isNative=true, namespace=GLOBAL)
@@ -427,7 +427,7 @@ function done() {
         function loadPolyfill() {
             var s = $doc.createElement('script');
             s.src = @com.vaadin.polymer.Polymer::absoluteHref(*)
-                        ('webcomponentsjs/webcomponents-lite.min.js');
+                        ('webcomponentsjs/webcomponents-lite.js');
             s.onreadystatechange = s.onload = done;
             $doc.head.appendChild(s);
         }
@@ -530,7 +530,7 @@ public static native <T> List<T> asList(JavaScriptObject o)
      * penalty because we directly take the native array of the super ArrayList
      * implementation.
      */
-    public static native <T extends JavaScriptObject> Array<T> asJsArray(List<?> l)
+    public static native <T extends JavaScriptObject> JsArray<T> asJsArray(List<?> l)
     /*-{
         return l.@java.util.ArrayList::array;
     }-*/;

lib/com/vaadin/polymer/PolymerTemplate.java

@@ -5,7 +5,7 @@
 import jsinterop.annotations.JsType;
 import elemental2.dom.HTMLElement;
 
-import elemental2.core.Array;
+import elemental2.core.JsArray;
 
 @JsType(isNative=true, namespace=GLOBAL, name="HTMLElement")
 public class PolymerTemplate extends HTMLElement {
@@ -18,8 +18,8 @@ public class PolymerTemplate extends HTMLElement {
     @JsProperty public native String getIdexAs();
     @JsProperty public native void setIndexAs(String value);
 
-    @JsProperty public native Array<?> getItems();
-    @JsProperty public native void setItems(Array<?> items);
+    @JsProperty public native JsArray<?> getItems();
+    @JsProperty public native void setItems(JsArray<?> items);
 
     @JsProperty public native void setFilter(PolymerFunction<Boolean, ?> items);
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "gwt-api-generator",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "",
   "author": "Vaadin Ltd",
   "license": "Apache License 2.0",

package.json

@@ -3,7 +3,7 @@ package <%= ns %>;
 
 import elemental2.dom.*;
 import com.google.gwt.core.client.JavaScriptObject;
-import elemental2.core.Array;
+import elemental2.core.JsArray;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;

template/Behavior.template

@@ -4,7 +4,7 @@ package <%= ns %>;
 import elemental2.dom.HTMLElement;
 import elemental2.dom.Element;
 import com.google.gwt.core.client.JavaScriptObject;
-import elemental2.core.Array;
+import elemental2.core.JsArray;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsPackage;
 import jsinterop.annotations.JsProperty;

template/Element.template

@@ -1,7 +1,7 @@
 <%= disclaimer() %>
 package <%= ns %>.event;
 
-import elemental2.core.Array;
+import elemental2.core.JsArray;
 import com.google.gwt.core.client.JavaScriptObject;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsProperty;

template/ElementEvent.template

@@ -8,7 +8,7 @@ import <%= event.ns %>.widget.event.<%= camelCase(event.name) %>EventHandler;
 <% }); %>
 import com.vaadin.polymer.*;
 import com.vaadin.polymer.PolymerWidget;
-import elemental2.core.Array;
+import elemental2.core.JsArray;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.vaadin.polymer.PolymerFunction;

template/Widget.template

@@ -2,7 +2,7 @@
 package <%= ns %>.widget.event;
 
 import com.google.gwt.event.dom.client.DomEvent;
-import elemental2.core.Array;
+import elemental2.core.JsArray;
 import com.google.gwt.core.client.JavaScriptObject;
 import jsinterop.base.Js;
 

template/WidgetEvent.template

@@ -109,7 +109,7 @@ module.exports = {
     if (/.*\|.*/.test(t)) return 'Object';
     if (/^string|^computed/i.test(t)) return 'String';
     if (/^boolean/i.test(t)) return 'boolean';
-    if (/^array/i.test(t)) return 'Array<E>';
+    if (/^array/i.test(t)) return 'JsArray<E>';
     if (/^element/i.test(t)) return 'Element';
     if (/^htmlelement/i.test(t)) return 'HTMLElement';
     if (/^number/i.test(t)) return 'double';