Merge pull request GoogleWebComponents#198 from GoogleWebComponents/2.0-preview

e111077 · web-flow · commit 420bd9b543fa · 2017-09-01T15:43:28.000-07:00
2.0-preview
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
-bower_components
+bower_components*
 node_modules
+bower-*
diff --git a/bower.json b/bower.json
@@ -23,13 +23,27 @@
     "google"
   ],
   "dependencies": {
-    "google-apis": "GoogleWebComponents/google-apis#^1.0.0",
-    "iron-ajax": "PolymerElements/iron-ajax#^1.0.0",
-    "polymer": "Polymer/polymer#^1.0.0",
-    "promise-polyfill": "PolymerLabs/promise-polyfill#^1.0.0"
+    "google-apis": "GoogleWebComponents/google-apis#1 - 2",
+    "iron-ajax": "PolymerElements/iron-ajax#1 - 2",
+    "polymer": "Polymer/polymer#1.9 - 2"
   },
   "devDependencies": {
-    "iron-component-page": "PolymerElements/iron-component-page#^1.0.2",
-    "web-component-tester": "*"
+    "iron-component-page": "PolymerElements/iron-component-page#1 - 2",
+    "promise-polyfill": "PolymerLabs/promise-polyfill#1 - 2",
+    "web-component-tester": "^6.0.0"
+  },
+  "variants": {
+    "1.x": {
+      "dependencies": {
+        "google-apis": "GoogleWebComponents/google-apis#^1.0.0",
+        "iron-ajax": "PolymerElements/iron-ajax#^1.0.0",
+        "polymer": "Polymer/polymer#^1.0.0",
+        "promise-polyfill": "PolymerLabs/promise-polyfill#^1.0.0"
+      },
+      "devDependencies": {
+        "iron-component-page": "PolymerElements/iron-component-page#^1.0.2",
+        "web-component-tester": "*"
+      }
+    }
   }
 }
diff --git a/demo/index.html b/demo/index.html
@@ -6,6 +6,7 @@
   <title>google-chart Demo</title>
 
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
+  <link rel="import" href="../../promise-polyfill/promise-polyfill-lite.html">
   <link rel="import" href="../google-chart.html">
   <style>
     code {
@@ -336,7 +337,7 @@ <h2>Chart gallery</h2>
   </google-chart>
 
   <p>Here's a organization chart:</p>
-  
+
   <google-chart
     id="org-chart",
     type="org",
diff --git a/google-chart-loader.html b/google-chart-loader.html
@@ -1,5 +1,4 @@
 <link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../promise-polyfill/promise-polyfill.html">
 <link rel="import" href="charts-loader.html">
 
 <script>
diff --git a/google-chart.html b/google-chart.html
@@ -1,6 +1,5 @@
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../iron-ajax/iron-request.html">
-<link rel="import" href="../promise-polyfill/promise-polyfill-lite.html">
 <link rel="import" href="google-chart-loader.html">
 <link rel="import" href="google-chart-styles.html">
 
@@ -233,7 +232,7 @@
        *        undefined}
        */
       data: {
-        type: Object,
+        type: String,
         observer: '_dataChanged'
       },
 
@@ -433,12 +432,25 @@
     _dataChanged: function(data) {
       var dataPromise;
       if (!data) { return; }
-      if (typeof data == 'string' || data instanceof String) {
+
+      var isString = false;
+
+      // Polymer 2 will not call observer if type:Object is set and fails, so
+      // we must parse the string ourselves.
+      try {
+        data = JSON.parse(data);
+      } catch (e) {
+        isString = typeof data == 'string' || data instanceof String;
+      }
+
+      if (isString) {
         // Load data asynchronously, from external URL.
         var request = /** @type {!IronRequestElement} */ (document.createElement('iron-request'));
         dataPromise = request.send({
           url: /** @type string */(data), handleAs: 'json'
-        }).then(function(xhr) { return xhr.response; });
+        }).then(function(xhr) {
+          return xhr.response;
+        });
       } else {
         // Data is all ready to be processed.
         dataPromise = Promise.resolve(data);
diff --git a/test/basic-tests.html b/test/basic-tests.html
@@ -10,9 +10,10 @@
 <!doctype html>
 <html>
 <head>
-  <script src="../../webcomponentsjs/webcomponents.min.js"></script>
+  <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
 
+  <link rel="import" href="../../promise-polyfill/promise-polyfill-lite.html">
   <link rel="import" href="../google-chart.html">
 </head>
 
diff --git a/test/index.html b/test/index.html
@@ -14,15 +14,16 @@
     <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
     <title>Tests</title>
 
-    <script src="../../webcomponentsjs/webcomponents.min.js"></script>
+    <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
     <script src="../../web-component-tester/browser.js"></script>
   </head>
 
   <body>
     <script>
       // Load and run all tests (.html, .js) as one suite:
       WCT.loadSuites([
-        'basic-tests.html'
+        'basic-tests.html?wc-shadydom=true&wc-ce=true',
+        'basic-tests.html?dom=shadow'
       ]);
     </script>
   </body>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<link rel="import" href="../polymer/polymer.html">`
`2`		`-<link rel="import" href="../promise-polyfill/promise-polyfill.html">`
`3`	`2`	`<link rel="import" href="charts-loader.html">`
`4`	`3`
`5`	`4`	`<script>`