Skip to content

Commit

Permalink
update stable route to stable/4.20.8
Browse files Browse the repository at this point in the history
  • Loading branch information
QA Tools - Alfred Jenkins committed Jan 23, 2018
1 parent 60d4ca2 commit 33497a2
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 37 deletions.
14 changes: 7 additions & 7 deletions README.md
Expand Up @@ -17,13 +17,13 @@ This simple test HTML page can also be hosted on your environment to showcase ht
<head>
<meta charset="utf-8">
<!-- V4 JS core and at least one video plugin is required. Plugins such as skin, discovery and Advertising need to be loaded separately -->
<script src="//player.ooyala.com/static/v4/stable/4.20.7/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/bit_wrapper.min.js"></script>
<!-- Change these html5-skin.min.css and html5-skin.min.js to your local build if necessary -->
<script src="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.css"/>
</head>

<body>
Expand Down Expand Up @@ -138,7 +138,7 @@ Simple customization can be achieved by modifying `skin.json` settings. Furtherm
```javascript
var playerParam = {
"skin": {
"config": "//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/skin.json",
"config": "//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/skin.json",
"inline": {
"startScreen": {"showDescription": false, "playIconStyle": {"color": "blue"}}
}
Expand Down
12 changes: 6 additions & 6 deletions amp_iframe.html
Expand Up @@ -2,11 +2,11 @@
<html style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
<head>
<meta charset="utf-8">
<script src="//player.ooyala.com/static/v4/stable/4.20.7/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.css"/>
</head>

<body style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
Expand Down Expand Up @@ -68,7 +68,7 @@
inline: {
shareScreen: {
embed: {
source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/icons-reference.html
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>Font Reference - alice</title>
<link href="http://fonts.googleapis.com/css?family=Dosis:400,500,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.css">
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.css">
<style type="text/css">html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-family:inherit;font-size:100%;vertical-align:baseline}body{line-height:1;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:separate;border-spacing:0;vertical-align:middle}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}a img{border:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{font-family:'Dosis','Tahoma',sans-serif}.container{margin:15px auto;width:80%}h1{margin:40px 0 20px;font-weight:700;font-size:38px;line-height:32px;color:#fb565e}h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercase;font-weight:500}.small{font-size:14px;color:#a5adb4;}.small a{color:#a5adb4;}.small a:hover{color:#fb565e}.glyphs.character-mapping{margin:0 0 20px 0;padding:20px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.character-mapping li{margin:0 30px 20px 0;display:inline-block;width:90px}.glyphs.character-mapping .icon{margin:10px 0 10px 15px;padding:15px;position:relative;width:55px;height:55px;color:#162a36 !important;overflow:hidden;-webkit-border-radius:3px;border-radius:3px;font-size:32px;}.glyphs.character-mapping .icon svg{fill:#000}.glyphs.character-mapping input{margin:0;padding:5px 0;line-height:12px;font-size:12px;display:block;width:100%;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;text-align:center;outline:0;}.glyphs.character-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.character-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping{margin:0 0 60px 0;padding:30px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.css-mapping li{margin:0 30px 20px 0;padding:0;display:inline-block;overflow:hidden}.glyphs.css-mapping .icon{margin:0;margin-right:10px;padding:13px;height:50px;width:50px;color:#162a36 !important;overflow:hidden;float:left;font-size:24px}.glyphs.css-mapping input{margin:0;margin-top:5px;padding:8px;line-height:16px;font-size:16px;display:block;width:150px;height:40px;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;background:#fff;outline:0;float:right;}.glyphs.css-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}</style>
</head>
<body>
Expand Down
14 changes: 7 additions & 7 deletions iframe.html
Expand Up @@ -2,12 +2,12 @@
<html style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
<head>
<meta charset="utf-8">
<script src="//player.ooyala.com/static/v4/stable/4.20.7/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.css"/>
</head>

<body style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
Expand Down Expand Up @@ -69,7 +69,7 @@
inline: {
shareScreen: {
embed: {
source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions sample.html
Expand Up @@ -2,13 +2,13 @@
<html>
<head>
<meta charset="utf-8">
<script src="//player.ooyala.com/static/v4/stable/4.20.7/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/other-plugin/discovery_api.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/other-plugin/discovery_api.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/html5-skin.min.css"/>
</head>

<body>
Expand All @@ -20,7 +20,7 @@
'debug':true,
"skin": {
"config": "",
"inline": {"shareScreen": {"embed": {"source": "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"}}}
"inline": {"shareScreen": {"embed": {"source": "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"}}}
}
};
OO.ready(function() {
Expand Down
8 changes: 4 additions & 4 deletions scss/components/_share-panel.scss
Expand Up @@ -65,22 +65,22 @@

.oo-facebook {
@extend .oo-social-icon;
background-image: url("//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/assets/images/social-facebook.svg");
background-image: url("//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/assets/images/social-facebook.svg");
}

.oo-twitter {
@extend .oo-social-icon;
background-image: url("//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/assets/images/social-twitter.svg");
background-image: url("//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/assets/images/social-twitter.svg");
}

.oo-google-plus {
@extend .oo-social-icon;
background-image: url("//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/assets/images/social-google.svg");
background-image: url("//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/assets/images/social-google.svg");
}

.oo-email-share {
@extend .oo-social-icon;
background-image: url("//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/assets/images/social-email.svg");
background-image: url("//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/assets/images/social-email.svg");
background-size: cover;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/components/controlBar-test.js
Expand Up @@ -1806,7 +1806,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/stable/4.20.7/skin-plugin/assets/images/ooyala-logo.svg";
oneButtonSkinConfig.controlBar.logo.imageResource.url = "//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/assets/images/ooyala-logo.svg";
oneButtonSkinConfig.controlBar.logo.clickUrl = "http://www.ooyala.com";

var mockProps = {
Expand Down
6 changes: 3 additions & 3 deletions tests/components/utils-test.js
Expand Up @@ -275,19 +275,19 @@ describe('Utils', function () {
availableLanguageFile: [
{
"language": "en",
"languageFile": "//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/en.json",
"languageFile": "//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/en.json",
"androidResource": "skin-config/en.json",
"iosResource": "en"
},
{
"language": "es",
"languageFile": "//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/es.json",
"languageFile": "//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/es.json",
"androidResource": "skin-config/es.json",
"iosResource": "es"
},
{
"language": "zh",
"languageFile": "//player.ooyala.com/static/v4/stable/4.20.7/skin-plugin/zh.json",
"languageFile": "//player.ooyala.com/static/v4/stable/4.20.8/skin-plugin/zh.json",
"androidResource": "skin-config/zh.json",
"iosResource": "zh"
}
Expand Down

0 comments on commit 33497a2

Please sign in to comment.