Merge branch 'master' into JS_RC

Author: manolo

lib/com/vaadin/polymer/elemental/Promise.java

@@ -0,0 +1,50 @@
+/*
+ * This code was generated with Vaadin Web Component GWT API Generator, 
+ * from vaadin-pouchdb project by Manolo Carrasco Moñino
+ * that is licensed with Apache license.
+ */
+package com.vaadin.polymer.elemental;
+
+import com.vaadin.polymer.elemental.*;
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.JsArray;
+import jsinterop.annotations.JsOverlay;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
+
+
+/**
+ * 
+ */
+@JsType(isNative=true)
+@com.google.gwt.core.client.js.JsType
+public interface Promise {
+
+    @JsOverlay public static final String NAME = "Promise";
+    @JsOverlay public static final String SRC = "vaadin-pouchdb/sample.html";
+
+
+
+    /**
+     * 
+     *
+     * JavaScript Info:
+     * @method on
+     * @param {Function} func  
+     * 
+     * 
+     */
+    void on(Function func);
+
+    /**
+     * 
+     *
+     * JavaScript Info:
+     * @method then
+     * @param {Function} func  
+     * 
+     * 
+     */
+    void then(Function func);
+
+}

template/helpers.js

@@ -13,7 +13,16 @@ module.exports = {
   javaKeywords: ['for', 'switch'], // TODO: if it's necessary add other keywords as well
   findBehavior: function(name) {
     for (var i = 0; name && i < global.parsed.length; i++) {
-      if (this.className(global.parsed[i].is) == this.className(name)) {
+      var item = global.parsed[i];
+      if (this.isBehavior(item) && this.className(item.is) == this.className(name)) {
+        return global.parsed[i];
+      }
+    }
+  },
+  findElement: function(name) {
+    for (var i = 0; name && i < global.parsed.length; i++) {
+      var item = global.parsed[i];
+      if (!this.isBehavior(item) && this.className(item.is) == this.className(name)) {
         return global.parsed[i];
       }
     }
@@ -104,10 +113,11 @@ module.exports = {
     if (/^element/i.test(t)) return 'Element';
     if (/^number/i.test(t)) return 'double';
     if (/^function/i.test(t)) return 'Function';
-    var b = this.findBehavior(t);
-    if (b) {
-      var c = this.camelCase(t);
-      return c != t ? c + 'Element' : c;
+    if (this.findBehavior(t)) {
+      return this.camelCase(t);
+    }
+    if (this.findElement(t)) {
+      return this.camelCase(t) + 'Element';
     }
 
     return "JavaScriptObject";