Skip to content

Commit

Permalink
Update stable route to stable/4.13.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@dchauOoyala
dchauOoyala committed Apr 25, 2017
1 parent 160c6c1 commit fbc76ef
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 39 deletions.
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
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/latest/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/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/latest/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/latest/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.13.4/skin-plugin/html5-skin.min.css"/>
</head>

<body>
Expand Down Expand Up @@ -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/stable/latest/skin-plugin/skin.json",
"config": "//player.ooyala.com/static/v4/stable/4.13.4/skin-plugin/skin.json",
"inline": {
"startScreen": {"showDescription": false, "playIconStyle": {"color": "blue"}}
}
Expand Down Expand Up @@ -165,4 +165,4 @@ Before submitting a pull request, please make sure the following is done:
3. Ensure the test suite passes (`npm test`).

###Style Guide
We *mostly* follow [Airbnb's Style Guide](https://github.com/airbnb/javascript).
We *mostly* follow [Airbnb's Style Guide](https://github.com/airbnb/javascript).
12 changes: 6 additions & 6 deletions amp_iframe.html
View file
Original file line number Diff line number Diff line change
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/latest/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/latest/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.13.4/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/latest/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.13.4/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions iframe.html
View file
Original file line number Diff line number Diff line change
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/latest/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/latest/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.13.4/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/latest/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.13.4/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions sample.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<html>
<head>
<meta charset="utf-8">
<script src="//player.ooyala.com/static/v4/stable/latest/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/other-plugin/discovery_api.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/latest/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/latest/skin-plugin/html5-skin.min.css"/>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/core.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/main_html5.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/osmf_flash.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/video-plugin/bit_wrapper.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/other-plugin/discovery_api.min.js"></script>
<script src="//player.ooyala.com/static/v4/stable/4.13.4/skin-plugin/html5-skin.min.js"></script>
<link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.13.4/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/latest/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.13.4/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"}}}
}
};
OO.ready(function() {
Expand All @@ -29,4 +29,4 @@
</script>

</body>
</html>
</html>
8 changes: 4 additions & 4 deletions scss/components/_share-panel.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.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.13.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.13.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.13.4/skin-plugin/assets/images/social-email.svg");
background-size: cover;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/components/controlBar-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,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.13.4/skin-plugin/assets/images/ooyala-logo.svg";
oneButtonSkinConfig.controlBar.logo.clickUrl = "http://www.ooyala.com";

var mockProps = {
Expand Down
8 changes: 4 additions & 4 deletions tests/components/utils-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,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.13.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.13.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.13.4/skin-plugin/zh.json",
"androidResource": "skin-config/zh.json",
"iosResource": "zh"
}
Expand Down Expand Up @@ -329,4 +329,4 @@ describe('Utils', function () {
expect(finalConfig.buttons.desktopContent[6].name).toBe("alice");
expect(finalConfig.buttons.desktopContent[10].alice).toBe("video");
});
});
});

0 comments on commit fbc76ef

Please sign in to comment.