Skip to content

Commit ed360c8

Browse files
author
Laszlo Moczo
committed
Protocol independent embed urls
1 parent 87a4199 commit ed360c8

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

‎examples/dynamic-frame-insert.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h1>Ustream EmbedAPI <small>dynamically inserted iframes</small></h1>
4242
</div>
4343

4444
<div class="well" >
45-
<iframe src="http://www.ustream.tv/embed/1524" id="FrameAlpha" width="320" height="213" style="border: 0 transparent none;"></iframe>
45+
<iframe src="//www.ustream.tv/embed/1524" id="FrameAlpha" width="320" height="213" style="border: 0 transparent none;"></iframe>
4646
</div>
4747

4848
<form class="form-inline" action="#">
@@ -109,7 +109,7 @@ <h1>Ustream EmbedAPI <small>dynamically inserted iframes</small></h1>
109109

110110

111111

112-
$('#Beta').html('<iframe src="http://www.ustream.tv/embed/6540154" ' +
112+
$('#Beta').html('<iframe src="//www.ustream.tv/embed/6540154" ' +
113113
'id="FrameBeta" ' +
114114
'width="320" ' +
115115
'height="213" ' +
@@ -186,7 +186,7 @@ <h1>Ustream EmbedAPI <small>dynamically inserted iframes</small></h1>
186186

187187
gammaHolder.innerHTML = '';
188188

189-
gammaFrame.src = "http://www.ustream.tv/embed/recorded/24364591";
189+
gammaFrame.src = "//www.ustream.tv/embed/recorded/24364591";
190190
gammaFrame.width = 320;
191191
gammaFrame.height = 213;
192192
gammaHolder.appendChild(gammaFrame);

‎examples/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1>Ustream EmbedAPI <small>basic example</small></h1>
4040

4141
<div style="width: 680px; float: left; margin-bottom: 100px;">
4242
<div class="well " >
43-
<iframe src="http://www.ustream.tv/embed/1524" id="UstreamFrame" width="640" height="392" style="border: 0 transparent none;"></iframe>
43+
<iframe src="//www.ustream.tv/embed/1524" id="UstreamFrame" width="640" height="392" style="border: 0 transparent none;"></iframe>
4444
</div>
4545

4646
<div class="input-group">
@@ -56,7 +56,7 @@ <h3>Example media</h3>
5656

5757
<div class="media" data-media="4307895" data-type="channel">
5858
<a class="pull-left" href="#">
59-
<img class="media-object" src="http://static-cdn2.ustream.tv/i/channel/picture/4/3/0/7/4307895/4307895_4307895_creativelive-u_1322590439,66x66,r:1.jpg">
59+
<img class="media-object" src="//static-cdn2.ustream.tv/i/channel/picture/4/3/0/7/4307895/4307895_4307895_creativelive-u_1322590439,66x66,r:1.jpg">
6060
</a>
6161
<div class="media-body">
6262
<h4 class="media-heading">creativeLIVE <span class="label label-info">channel</span></h4>
@@ -66,7 +66,7 @@ <h4 class="media-heading">creativeLIVE <span class="label label-info">channel</s
6666
<hr />
6767
<div class="media" data-media="1524" data-type="channel">
6868
<a class="pull-left" href="#">
69-
<img class="media-object" src="http://static-cdn1.ustream.tv/i/channel/picture/1/5/2/4/1524/1524_screenshot2013-01-03at6.4_1357331443,66x66,r:1.jpg">
69+
<img class="media-object" src="//static-cdn1.ustream.tv/i/channel/picture/1/5/2/4/1524/1524_screenshot2013-01-03at6.4_1357331443,66x66,r:1.jpg">
7070
</a>
7171
<div class="media-body">
7272
<h4 class="media-heading">TWiT Live <span class="label label-info">channel</span></h4>
@@ -76,7 +76,7 @@ <h4 class="media-heading">TWiT Live <span class="label label-info">channel</span
7676
<hr />
7777
<div class="media" data-media="6540154" data-type="channel">
7878
<a class="pull-left" href="#">
79-
<img class="media-object" src="http://static-cdn1.ustream.tv/i/channel/picture/6/5/4/0/6540154/6540154_nasatv_public_hr_1330361732,66x66,r:1.jpg">
79+
<img class="media-object" src="//static-cdn1.ustream.tv/i/channel/picture/6/5/4/0/6540154/6540154_nasatv_public_hr_1330361732,66x66,r:1.jpg">
8080
</a>
8181
<div class="media-body">
8282
<h4 class="media-heading">NASA Public <span class="label label-info">channel</span></h4>
@@ -86,7 +86,7 @@ <h4 class="media-heading">NASA Public <span class="label label-info">channel</sp
8686
<hr />
8787
<div class="media" data-media="24364591" data-type="video">
8888
<a class="pull-left" href="#">
89-
<img class="media-object" src="http://static-cdn2.ustream.tv/i/channel/picture/4/9/8/6/498663/498663_msl_cam_100x75_1286920251,66x66,r:1.jpg">
89+
<img class="media-object" src="//static-cdn2.ustream.tv/i/channel/picture/4/9/8/6/498663/498663_msl_cam_100x75_1286920251,66x66,r:1.jpg">
9090
</a>
9191
<div class="media-body">
9292
<h4 class="media-heading">Curiosity's Seven Minutes of Terror <span class="label label-info">recorded</span></h4>
@@ -96,7 +96,7 @@ <h4 class="media-heading">Curiosity's Seven Minutes of Terror <span class="label
9696
<hr />
9797
<div class="media" data-media="25728478" data-type="video">
9898
<a class="pull-left" href="#">
99-
<img class="media-object" src="http://static-cdn1.ustream.tv/i/channel/picture/6/0/2/9/6029144/6029144_youtube_beatport_1312827936,66x66,r:1.jpg">
99+
<img class="media-object" src="//static-cdn1.ustream.tv/i/channel/picture/6/0/2/9/6029144/6029144_youtube_beatport_1312827936,66x66,r:1.jpg">
100100
</a>
101101
<div class="media-body">
102102
<h4 class="media-heading">Paul van Dyk Beatport Live <span class="label label-info">recorded</span></h4>

‎examples/multiple-instances.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1>Ustream EmbedAPI <small>multiple API instances</small></h1>
4040
</div>
4141

4242
<div class="well " >
43-
<iframe src="http://www.ustream.tv/embed/1524" id="FrameAlpha" width="320" height="213" style="border: 0 transparent none;"></iframe>
43+
<iframe src="//www.ustream.tv/embed/1524" id="FrameAlpha" width="320" height="213" style="border: 0 transparent none;"></iframe>
4444
</div>
4545

4646
<form class="form-inline" action="#">
@@ -62,7 +62,7 @@ <h1>Ustream EmbedAPI <small>multiple API instances</small></h1>
6262
<span style="display: none;" class="st-ended label label-success">ENDED</span>
6363
</div>
6464
<div class="well " >
65-
<iframe src="http://www.ustream.tv/embed/6540154" id="FrameBeta" width="320" height="213" style="border: 0 transparent none;"></iframe>
65+
<iframe src="//www.ustream.tv/embed/6540154" id="FrameBeta" width="320" height="213" style="border: 0 transparent none;"></iframe>
6666
</div>
6767
<form class="form-inline" action="#">
6868
<fieldset style="margin: 0 20px; float: left; width: 200px;">
@@ -84,7 +84,7 @@ <h1>Ustream EmbedAPI <small>multiple API instances</small></h1>
8484
<span style="display: none;" class="st-ended label label-success">ENDED</span>
8585
</div>
8686
<div class="well " >
87-
<iframe src="http://www.ustream.tv/embed/recorded/24364591" id="FrameGamma" width="320" height="213" style="border: 0 transparent none;"></iframe>
87+
<iframe src="//www.ustream.tv/embed/recorded/24364591" id="FrameGamma" width="320" height="213" style="border: 0 transparent none;"></iframe>
8888
</div>
8989
<form class="form-inline" action="#">
9090
<fieldset style="margin: 0 20px; float: left; width: 200px;">

‎examples/multiview.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ <h1>Ustream EmbedAPI <small>multiview example</small></h1>
117117

118118
function createPlayer ($container, id, content) {
119119
var $player = $('<iframe/>'),
120-
url = 'http://www.ustream.tv/embed/%content%?html5ui',
120+
url = '//www.ustream.tv/embed/%content%?html5ui',
121121
contentUrlPart = '';
122122

123123
$container = $('<div/>')
@@ -146,10 +146,10 @@ <h1>Ustream EmbedAPI <small>multiview example</small></h1>
146146
}
147147

148148
var contents = [
149-
{ app: 'channel', id: 12762028, title: 'Animal Planet L!VE', img: 'http://static.ddmcdn.com/gif/apl-tvhighlights-pbpaplthumbnail.png' },
150-
{ app: 'channel', id: 13628077, title: 'APL!VE Pacific Reef', img: 'http://static.ddmcdn.com/gif/pacific-reef-270x152.jpg' },
151-
{ app: 'channel', id: 14812707, title: 'APL!VE Reef Sharks', img: 'http://static.ddmcdn.com/gif/apl_live_sharks_270x152.jpg' },
152-
{ app: 'channel', id: 14225913, title: 'APL!VE Tanked', img: 'http://static.ddmcdn.com/gif/apl-tanked-clownfish.png' }
149+
{ app: 'channel', id: 12762028, title: 'Animal Planet L!VE', img: '//static.ddmcdn.com/gif/apl-tvhighlights-pbpaplthumbnail.png' },
150+
{ app: 'channel', id: 13628077, title: 'APL!VE Pacific Reef', img: '//static.ddmcdn.com/gif/pacific-reef-270x152.jpg' },
151+
{ app: 'channel', id: 14812707, title: 'APL!VE Reef Sharks', img: '//static.ddmcdn.com/gif/apl_live_sharks_270x152.jpg' },
152+
{ app: 'channel', id: 14225913, title: 'APL!VE Tanked', img: '//static.ddmcdn.com/gif/apl-tanked-clownfish.png' }
153153
],
154154
viewerId = 'UstreamPlayer',
155155
$container = $('.container'),

0 commit comments

Comments
 (0)