diff --git a/README.md b/README.md index 740b8d6ef..bf0d18c28 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,12 @@ This simple test HTML page can also be hosted on your environment to showcase ht - - - + + + - - + + @@ -135,7 +135,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.28.22/skin-plugin/skin.json", "inline": { "startScreen": {"showDescription": false, "playIconStyle": {"color": "blue"}} } diff --git a/amp_iframe.html b/amp_iframe.html index 5a07f3a97..dd6c7bcaa 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..b1551d671 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..53cc94adc 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 be7c423cf..a95b710f8 100644 --- a/js/controller.js +++ b/js/controller.js @@ -24,7 +24,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.28.22", "rev": ""}; } var Html5Skin = function(mb, id) { diff --git a/nvm.env b/nvm.env new file mode 100644 index 000000000..4fa67479d --- /dev/null +++ b/nvm.env @@ -0,0 +1,69 @@ +declare -x AWS_ACCESS_KEY_ID="AKIAIEOVHIBPLVRQPMXQ" +declare -x AWS_SECRET_ACCESS_KEY="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" +declare -x BUILD_CAUSE="MANUALTRIGGER" +declare -x BUILD_CAUSE_MANUALTRIGGER="true" +declare -x BUILD_DISPLAY_NAME="#135" +declare -x BUILD_ID="135" +declare -x BUILD_NUMBER="135" +declare -x BUILD_TAG="jenkins-v4-deploy-mother-repo-stable-135" +declare -x BUILD_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/135/" +declare -x DERBY_HOME="/usr/lib/jvm/java-8-oracle/db" +declare -x ENVIRONMENT="stable" +declare -x EXECUTOR_NUMBER="0" +declare -x GIT_AUTHOR_EMAIL="qa-tools-oncall@ooyala.com" +declare -x GIT_AUTHOR_NAME="QA Tools - Alfred Jenkins" +declare -x GIT_BRANCH="origin/master" +declare -x GIT_COMMIT="6b547cef4bf6bfcad9dcf905bb09fe3c66b3d77c" +declare -x GIT_COMMITTER_EMAIL="qa-tools-oncall@ooyala.com" +declare -x GIT_COMMITTER_NAME="QA Tools - Alfred Jenkins" +declare -x GIT_PREVIOUS_COMMIT="6b547cef4bf6bfcad9dcf905bb09fe3c66b3d77c" +declare -x GIT_PREVIOUS_SUCCESSFUL_COMMIT="6b547cef4bf6bfcad9dcf905bb09fe3c66b3d77c" +declare -x GIT_URL="ssh://git@git.corp.ooyala.com:7999/pbw/player-v4.git" +declare -x HOME="/mnt/role-jenkins-service" +declare -x HUDSON_COOKIE="31f7f065-dbfa-414d-be62-c620b84f40ab" +declare -x HUDSON_HOME="/mnt2/jenkins" +declare -x HUDSON_SERVER_COOKIE="6f8e664c79f90227" +declare -x HUDSON_URL="http://jenkins-master1.services.ooyala.net:8080/" +declare -x J2REDIR="/usr/lib/jvm/java-8-oracle/jre" +declare -x J2SDKDIR="/usr/lib/jvm/java-8-oracle" +declare -x JAVA_HOME="/usr/lib/jvm/java-8-oracle" +declare -x JENKINS_HOME="/mnt2/jenkins" +declare -x JENKINS_SERVER_COOKIE="6f8e664c79f90227" +declare -x JENKINS_URL="http://jenkins-master1.services.ooyala.net:8080/" +declare -x JOB_BASE_NAME="v4-deploy-mother-repo-stable" +declare -x JOB_DISPLAY_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/display/redirect" +declare -x JOB_NAME="v4-deploy-mother-repo-stable" +declare -x JOB_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/" +declare -x LANG="en_US.UTF-8" +declare -x LOGNAME="role-jenkins-service" +declare -x M2="/usr/share/maven3/bin" +declare -x M2_HOME="/usr/share/maven3" +declare -x MAIL="/var/mail/role-jenkins-service" +declare -x NODE_LABELS="14.04 Ubuntu Ubuntu-14.04 alfred7 alfreds amd64 amd64-Ubuntu amd64-Ubuntu-14.04 golang1.2 openstack" +declare -x NODE_NAME="alfred7" +declare -x NVM_BIN="/mnt/role-jenkins-service/.nvm/versions/node/v8.11.3/bin" +declare -x NVM_CD_FLAGS="" +declare -x NVM_DIR="/mnt/role-jenkins-service/.nvm" +declare -x OLDPWD="/data/role-jenkins-service/jenkins_slave_data_root/workspace/v4-deploy-mother-repo-stable" +declare -x PATH="/mnt/role-jenkins-service/.nvm/versions/node/v8.11.3/bin:/opt/vagrant/bin:/mnt/role-jenkins-service/.rbenv/shims:/mnt/role-jenkins-service/.rbenv/bin:/mnt/role-jenkins-service/bin:/usr/share/maven3/bin:/opt/vagrant/bin:/mnt/role-jenkins-service/.rbenv/shims:/mnt/role-jenkins-service/.rbenv/bin:/mnt/role-jenkins-service/bin:/usr/share/maven3/bin:/opt/vagrant/bin:/opt/vagrant/bin:/mnt/role-jenkins-service/.rbenv/shims:/mnt/role-jenkins-service/.rbenv/bin:/mnt/role-jenkins-service/bin:/usr/share/maven3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin" +declare -x PLAYER_V4_BRANCH="master" +declare -x PWD="/data/role-jenkins-service/jenkins_slave_data_root/workspace/v4-deploy-mother-repo-stable/html5-skin" +declare -x RBENV_SHELL="bash" +declare -x ROOT_BUILD_CAUSE="MANUALTRIGGER" +declare -x ROOT_BUILD_CAUSE_MANUALTRIGGER="true" +declare -x RUN_CHANGES_DISPLAY_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/135/display/redirect?page=changes" +declare -x RUN_DISPLAY_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/135/display/redirect" +declare -x SCALA_HOME="/usr/share/java" +declare -x SHELL="/bin/bash" +declare -x SHLVL="3" +declare -x SPARK_HOME="/mnt/role-jenkins-service/build_data/spark-1.6.1-bin-without-hadoop/" +declare -x SSH_CLIENT="10.203.1.179 39582 22" +declare -x SSH_CONNECTION="10.203.1.179 39582 10.203.1.49 22" +declare -x USER="role-jenkins-service" +declare -x WORKSPACE="/data/role-jenkins-service/jenkins_slave_data_root/workspace/v4-deploy-mother-repo-stable" +declare -x XDG_RUNTIME_DIR="/run/user/1001" +declare -x XDG_SESSION_ID="7" +declare -x aws_key_id="AKIAIEOVHIBPLVRQPMXQ" +declare -x aws_secret_access_key="oh/lm54rRhem+yS5fP2KRCi3PfZAnBYCUKlMYf3Y" +declare -x skin_node_version="8.11.3" +declare -x version="4.28.22" diff --git a/sample.html b/sample.html index 8cfff4b99..73316f8eb 100644 --- a/sample.html +++ b/sample.html @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/scss/components/_share-panel.scss b/scss/components/_share-panel.scss index 1d3ffe88d..835135b94 100644 --- a/scss/components/_share-panel.scss +++ b/scss/components/_share-panel.scss @@ -58,22 +58,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.28.22/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.28.22/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.28.22/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.28.22/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 d8039cfb7..01ac68377 100644 --- a/tests/components/controlBar-test.js +++ b/tests/components/controlBar-test.js @@ -1116,7 +1116,7 @@ describe('ControlBar', function() { baseMockProps.skinConfig.buttons.desktopContent = [ {'name':'logo', 'location':'controlBar', 'whenDoesNotFit':'keep', 'minWidth':130 } ]; - baseMockProps.skinConfig.controlBar.logo.imageResource.url = '//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/ooyala-logo.svg'; + baseMockProps.skinConfig.controlBar.logo.imageResource.url = '//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/assets/images/ooyala-logo.svg'; baseMockProps.skinConfig.controlBar.logo.clickUrl = 'http://www.ooyala.com'; var wrapper = Enzyme.mount(getControlBar(CONSTANTS.STATE.PLAYING, 100)); diff --git a/tests/components/utils-test.js b/tests/components/utils-test.js index a48b92a53..bffd5e241 100644 --- a/tests/components/utils-test.js +++ b/tests/components/utils-test.js @@ -500,19 +500,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.28.22/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.28.22/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.28.22/skin-plugin/zh.json', 'androidResource': 'skin-config/zh.json', 'iosResource': 'zh' }