From 2e62dba127c623d0a10207b8cc77b46a734ab47c Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Wed, 4 Jan 2017 18:14:38 -0800 Subject: [PATCH 01/13] renamed tests -> test --- {tests => test}/google-youtube-basic.html | 0 {tests => test}/google-youtube-custom-thumbnail.html | 0 {tests => test}/index.html | 0 {tests => test}/tests.html | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {tests => test}/google-youtube-basic.html (100%) rename {tests => test}/google-youtube-custom-thumbnail.html (100%) rename {tests => test}/index.html (100%) rename {tests => test}/tests.html (100%) diff --git a/tests/google-youtube-basic.html b/test/google-youtube-basic.html similarity index 100% rename from tests/google-youtube-basic.html rename to test/google-youtube-basic.html diff --git a/tests/google-youtube-custom-thumbnail.html b/test/google-youtube-custom-thumbnail.html similarity index 100% rename from tests/google-youtube-custom-thumbnail.html rename to test/google-youtube-custom-thumbnail.html diff --git a/tests/index.html b/test/index.html similarity index 100% rename from tests/index.html rename to test/index.html diff --git a/tests/tests.html b/test/tests.html similarity index 100% rename from tests/tests.html rename to test/tests.html From e6b0e31c8112ae2fb12de596ba3976bb2fda2eaa Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Wed, 4 Jan 2017 18:14:45 -0800 Subject: [PATCH 02/13] bower update --- .gitignore | 2 +- bower.json | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8d4ae25..0e054a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -bower_components +bower_components* diff --git a/bower.json b/bower.json index b758143..4c972e5 100755 --- a/bower.json +++ b/bower.json @@ -20,12 +20,27 @@ "web-component" ], "dependencies": { - "polymer": "Polymer/polymer#^1.0.0", - "google-apis": "GoogleWebComponents/google-apis#^1.0.0", - "iron-localstorage": "PolymerElements/iron-localstorage#^1.0.0" + "polymer": "Polymer/polymer#2.0-preview", + "google-apis": "e111077/google-apis#2.0-preview", + "iron-localstorage": "PolymerElements/iron-localstorage#2.0-preview" }, "devDependencies": { "web-component-tester": "*", - "iron-component-page": "PolymerElements/iron-component-page#^1.0.0" + "iron-component-page": "PolymerElements/iron-component-page#2.0-preview", + "iron-test-helpers": "PolymerElements/iron-test-helpers#2.0-preview" + }, + "variants": { + "1.x": { + "dependencies": { + "polymer": "Polymer/polymer#^1.0.0", + "google-apis": "GoogleWebComponents/google-apis#^1.0.0", + "iron-localstorage": "PolymerElements/iron-localstorage#^1.0.0" + }, + "devDependencies": { + "web-component-tester": "*", + "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", + "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" + } + } } } From 19c7dc6697d24dc36b80b5eccf41de3507561dd0 Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Wed, 4 Jan 2017 18:15:16 -0800 Subject: [PATCH 03/13] 2.0 compat --- google-youtube.html | 1363 ++++++++++++++++++++++--------------------- 1 file changed, 683 insertions(+), 680 deletions(-) diff --git a/google-youtube.html b/google-youtube.html index 9d5dbd9..7c7062e 100755 --- a/google-youtube.html +++ b/google-youtube.html @@ -38,46 +38,45 @@ @demo --> - - - - + return currentTime / duration; + }, + computePlayDisabled: function(state, playSupported) { + return state == 1 || state == 3 || !playSupported; + }, + computePauseDisabled: function(state) { + return state != 1 && state != 3; + }, + handleStateChange: function(ev) { + this.events.push({data: ev.detail.data}); + }, + handleYouTubeError: function(ev) { + console.error('YouTube playback error', ev.detail); + }, + handlePlayVideo: function(ev) { + this.$.googleYouTube.play(); + }, + handlePauseVideo: function(ev) { + this.$.googleYouTube.pause(); + }, + handleCueVideo: function(ev) { + this.$.googleYouTube.videoId = this.$.videoId.value; + } + }); + + diff --git a/demo/index.html b/demo/index.html index be47bf3..99a9b73 100755 --- a/demo/index.html +++ b/demo/index.html @@ -5,8 +5,8 @@ <google-youtube> Demo - - + +