From 31658e4d305a0b59e0916ef1a4d94f6d7209a778 Mon Sep 17 00:00:00 2001 From: QA Tools - Alfred Jenkins Date: Wed, 13 Sep 2017 22:11:06 +0000 Subject: [PATCH] update stable route to stable/4.17.4 --- README.md | 14 +++++++------- amp_iframe.html | 12 ++++++------ assets/icons-reference.html | 2 +- iframe.html | 14 +++++++------- js/controller.js | 2 +- sample.html | 16 ++++++++-------- scss/components/_share-panel.scss | 8 ++++---- tests/components/controlBar-test.js | 2 +- tests/components/utils-test.js | 6 +++--- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index a6afb1c47..34e700bed 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,13 @@ This simple test HTML page can also be hosted on your environment to showcase ht - - - - + + + + - - + + @@ -136,7 +136,7 @@ Simple customization can be achieved by modifying `skin.json` settings. Furtherm ```javascript var playerParam = { "skin": { - "config": "//player.ooyala.com/static/v4/production/latest/skin-plugin/skin.json", + "config": "//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/skin.json", "inline": { "startScreen": {"showDescription": false, "playIconStyle": {"color": "blue"}} } diff --git a/amp_iframe.html b/amp_iframe.html index 5a07f3a97..0a2a91296 100644 --- a/amp_iframe.html +++ b/amp_iframe.html @@ -2,11 +2,11 @@ - - - - - + + + + + @@ -68,7 +68,7 @@ inline: { shareScreen: { embed: { - source: "" + source: "" } } } diff --git a/assets/icons-reference.html b/assets/icons-reference.html index 2760b3e8a..8a373f449 100644 --- a/assets/icons-reference.html +++ b/assets/icons-reference.html @@ -6,7 +6,7 @@ Font Reference - alice - + diff --git a/iframe.html b/iframe.html index 60c589ae6..389354c05 100644 --- a/iframe.html +++ b/iframe.html @@ -2,12 +2,12 @@ - - - - - - + + + + + + @@ -69,7 +69,7 @@ inline: { shareScreen: { embed: { - source: "" + source: "" } } } diff --git a/js/controller.js b/js/controller.js index c898ab3f3..905473813 100644 --- a/js/controller.js +++ b/js/controller.js @@ -22,7 +22,7 @@ OO.plugin("Html5Skin", function (OO, _, $, W) { if (OO.publicApi && OO.publicApi.VERSION) { // This variable gets filled in by the build script - OO.publicApi.VERSION.skin = {"releaseVersion": "", "rev": ""}; + OO.publicApi.VERSION.skin = {"releaseVersion": "4.17.4", "rev": ""}; } var Html5Skin = function (mb, id) { diff --git a/sample.html b/sample.html index 902da7af2..58f062d4f 100644 --- a/sample.html +++ b/sample.html @@ -2,13 +2,13 @@ - - - - - - - + + + + + + + @@ -20,7 +20,7 @@ 'debug':true, "skin": { "config": "", - "inline": {"shareScreen": {"embed": {"source": ""}}} + "inline": {"shareScreen": {"embed": {"source": ""}}} } }; OO.ready(function() { diff --git a/scss/components/_share-panel.scss b/scss/components/_share-panel.scss index 5a677083a..9ce107f2e 100644 --- a/scss/components/_share-panel.scss +++ b/scss/components/_share-panel.scss @@ -65,22 +65,22 @@ .oo-facebook { @extend .oo-social-icon; - background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-facebook.svg"); + background-image: url("//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/assets/images/social-facebook.svg"); } .oo-twitter { @extend .oo-social-icon; - background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-twitter.svg"); + background-image: url("//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/assets/images/social-twitter.svg"); } .oo-google-plus { @extend .oo-social-icon; - background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-google.svg"); + background-image: url("//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/assets/images/social-google.svg"); } .oo-email-share { @extend .oo-social-icon; - background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-email.svg"); + background-image: url("//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/assets/images/social-email.svg"); background-size: cover; } diff --git a/tests/components/controlBar-test.js b/tests/components/controlBar-test.js index 8e73407fb..d4ef3492b 100644 --- a/tests/components/controlBar-test.js +++ b/tests/components/controlBar-test.js @@ -1505,7 +1505,7 @@ describe('ControlBar', function () { oneButtonSkinConfig.buttons.desktopContent = [ {"name":"logo", "location":"controlBar", "whenDoesNotFit":"keep", "minWidth":130 } ]; - oneButtonSkinConfig.controlBar.logo.imageResource.url = "//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/ooyala-logo.svg"; + oneButtonSkinConfig.controlBar.logo.imageResource.url = "//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/assets/images/ooyala-logo.svg"; oneButtonSkinConfig.controlBar.logo.clickUrl = "http://www.ooyala.com"; var mockProps = { diff --git a/tests/components/utils-test.js b/tests/components/utils-test.js index 3eb620e93..69e9fee5b 100644 --- a/tests/components/utils-test.js +++ b/tests/components/utils-test.js @@ -165,19 +165,19 @@ describe('Utils', function () { availableLanguageFile: [ { "language": "en", - "languageFile": "//player.ooyala.com/static/v4/candidate/latest/skin-plugin/en.json", + "languageFile": "//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/en.json", "androidResource": "skin-config/en.json", "iosResource": "en" }, { "language": "es", - "languageFile": "//player.ooyala.com/static/v4/candidate/latest/skin-plugin/es.json", + "languageFile": "//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/es.json", "androidResource": "skin-config/es.json", "iosResource": "es" }, { "language": "zh", - "languageFile": "//player.ooyala.com/static/v4/candidate/latest/skin-plugin/zh.json", + "languageFile": "//player.ooyala.com/static/v4/stable/4.17.4/skin-plugin/zh.json", "androidResource": "skin-config/zh.json", "iosResource": "zh" }