Permalink
Browse files

Fix bug 891168 - Remove Twitter plugin

  • Loading branch information...
1 parent 7dbe8f8 commit 2bbdece76e1a127cdf8b6e6f3a936912e0e8a357 @jbuck jbuck committed Jul 9, 2013
@@ -10,7 +10,6 @@
<script src="../../plugins/webpage/popcorn.webpage.js"></script>
<script src="../../plugins/googlemap/popcorn.googlemap.js"></script>
<script src="../../plugins/footnote/popcorn.footnote.js"></script>
- <script src="../../plugins/twitter/popcorn.twitter.js"></script>
<script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
<script src="../../plugins/tagthisperson/popcorn.tagthisperson.js"></script>
<script src="../../plugins/wikipedia/popcorn.wikipedia.js"></script>
@@ -153,30 +152,20 @@
<!-- End Video Info -->
</div>
<!-- End Video Div -->
-
+
<div>
<section>
<a href="#" class="collapse"><span>Collapse</span></a>
<div id="iframes" class="content"><div class="overlay"></div><div class="inactive"></div></div>
</section>
</div>
-
+
<h1>
<span>In this video: <strong id="inthisvideo"></strong></span>
</h1>
- <!-- Start Column A -->
- <div class="columna">
- <section>
- <h3><img src="images/logo_twitter.png" alt="Twitter Updates" width="80" height="19" />
- <span>&nbsp;</span></h3>
- <a href="#" class="collapse"><span>Collapse</span></a>
- <div id="personaltwitter" class="content"><div class="overlay"></div><div class="inactive"></div></div>
- </section>
- </div>
- <!-- End Column A -->
<!-- Start Column B -->
- <div class="columnb">
+ <div class="columna">
<section>
<h3><img src="images/logo_flickr.png" alt="Flickr Images" width="53" height="16" />
<span>&nbsp;</span></h3>
@@ -201,12 +190,6 @@
<div id="container2" class="google-map"></div>
</section>
- <section>
- <h3><img src="images/logo_twitter.png" alt="Twitter" width="80" height="19" /></h3>
- <a href="#" class="collapse"><span>Collapse</span></a>
- <div id="twitter" class="content"><div class="overlay"></div><div class="inactive"></div></div>
- </section>
-
</div>
<!-- End Column A -->
<!-- Start Column B -->
@@ -90,15 +90,12 @@
<footnote in="00:00:00" out="00:15:00" target="footnotediv">This video made exclusively for drumbeat.org </footnote>
<tagthisperson target="inthisvideo" in="00:00:05:02" out="00:00:10:07" person="Steve Song" />
<attribution in="00:00:05:02" out="00:00:10:07" target="container5" resourceid="villagetelcoattrib"></attribution>
- <twitter in="00:00:05:02" out="00:00:10:07" title="Steve Song" src="@stevesong" target="personaltwitter" width="238" height="120"/>
<wikipedia in="00:00:05:02" out="00:00:10:07" resourceid="villagetelco" numberofwords="200" lang="en" target="wikidiv"/>
<flickr in="00:00:05:02" out="00:00:10:07" target="personalflickr" userid="78868639@N00" numberofimages="8" padding="4px"/>
- <twitter in="00:00:10:07" out="00:00:18:04" title="Oil Spill" src="#oilspill" target="twitter" width="238" height="120"/>
<attribution in="00:00:10:07" out="00:00:18:04" target="container5">Grassroots Mapping, Tungsten Monkey</attribution>
<tagthisperson target="inthisvideo" in="00:00:18:04" out="00:00:25:02" person="Keyboard Cat"/>
- <twitter in="00:00:18:04" out="00:00:25:02" title="Keyboard Cat" src="#keyboardcat" target="twitter" width="238" height="120"/>
<attribution in="00:00:18:04" out="00:00:25:02" target="container5">KeyBoard Cat, Charlie Schmidt</attribution>
<tagthisperson target="inthisvideo" in="00:00:28:09" out="00:00:29:07" person="Jeffrey Warren" />
@@ -109,25 +106,21 @@
<tagthisperson target="inthisvideo" in="00:00:41:00" out="00:01:07:09" person="Jeffrey Warren" />
<flickr in="00:00:41:00" out="00:01:07:09" target="personalflickr" userid="35034346917@N01" numberofimages="8" padding="4px"/>
- <twitter in="00:00:41:00" out="00:01:07:09" title="Oil Spill" src="#oilspill" target="twitter" width="238" height="120"/>
<googlemap resourceid="grandislewiki" in="00:00:41:00" out="00:01:07:09" lat="29.2720" lng="-90.0233 " target="container2" zoom="8"/>
<wikipedia in="00:00:41:00" out="00:01:07:09" resourceid="oilspill" numberofwords="200" target="wikidiv"/>
<footnote in="00:00:41:00" out="00:01:07:09" target="footnotediv">Learn more about Grass Roots mapping at www.grassrootsmapping.org</footnote>
- <twitter in="00:01:07:10" out="00:01:25:07" title="Steve Song" src="@stevesong" target="personaltwitter" width="238" height="120"/>
<flickr in="00:01:07:10" out="00:01:25:07" target="personalflickr" userid="78868639@N00" numberofimages="8" padding="4px"/>
<googlemap id="CapeTown" resourceid="capetownwiki" in="00:01:07:10" out="00:01:32:07" lat="-33.9238" lng="18.4233" target="container2" zoom="8"/>
<wikipedia in="00:01:07:10" out="00:01:32:07" resourceid="villagetelco" numberofwords="200" target="wikidiv"/>
<tagthisperson target="inthisvideo" in="00:01:25:08" out="00:01:32:07" person="Michael Adeyeye" />
<tagthisperson target="inthisvideo" in="00:01:32:08" out="00:01:38:02" person="Charlie Schmidt" />
- <twitter in="00:01:32:08" out="00:01:57:11" title="Charlie Schmidt" src="@chuckieart" target="personaltwitter" width="238" height="120"/>
<googlemap id="MITMediaLab" resourceid="mitmedialabhome" in="00:01:32:08" out="00:01:57:11" lat="42.3613" lng="-71.0863" target="container2" zoom="12"/>
<tagthisperson target="inthisvideo" in="00:01:38:02" out="00:01:41:10" person="Keyboard Cat" />
<tagthisperson target="inthisvideo" in="00:01:41:11" out="00:01:57:11" person="Charlie Schmidt" />
<tagthisperson target="inthisvideo" in="00:02:09:00" out="00:03:07:05" person="Jonathan Zittrain" />
- <twitter in="00:02:09:00" out="00:03:07:05" title="Jonathan Zittrain" src="@zittrain" target="personaltwitter" width="238" height="120"/>
<googlemap resourceid="harvardlawhome" in="00:02:09:00" out="00:03:07:05" lat="42.4222" long="-88.6137" target="container2" zoom="12"/>
<wikipedia in="00:02:09:00" out="00:02:20:00" resourceid="zittrain" numberofwords="200" target="wikidiv"/>
@@ -146,7 +139,6 @@
<wikipedia in="00:02:41:00" out="00:02:57:00" resourceid="internetprotocol" numberofwords="200" target="wikidiv"/>
<wikipedia in="00:02:57:01" out="00:03:03:00" resourceid="timbernerslee" numberofwords="200" target="wikidiv"/>
- <twitter in="00:02:57:01" out="00:03:03:00" title="Tim Berners-Lee" src="@timberners_lee" target="twitter" width="238" height="120"/>
<wikipedia in="00:03:03:01" out="00:03:28:00" resourceid="worldwideweb" numberofwords="200" target="wikidiv"/>
@@ -160,20 +152,17 @@
<tagthisperson target="inthisvideo" in="00:03:21:01" out="00:03:28:06" person="Computer Chronicles guy #3" />
<tagthisperson target="inthisvideo" in="00:03:43:00" out="00:03:56:00" person="Jonathan Zittrain" />
- <twitter in="00:03:43:00" out="00:03:56:00" title="Jonathan Zittrain" src="@zittrain" target="personaltwitter" width="238" height="120"/>
<footnote in="00:03:43:00" out="00:03:57:00" target="footnotediv">Read Zittrain's book 'The Future of the Internet — And How to Stop It'</footnote>
<tagthisperson target="inthisvideo" in="00:03:59:00" out="00:04:03:05" person="Mona Kasra" />
<tagthisperson target="inthisvideo" in="00:04:03:06" out="00:04:07:00" person="Noah Workman" />
- <twitter in="00:04:03:06" out="00:04:07:00" title="Noah Workman" src="@noahworkman" target="personaltwitter" width="238" height="120"/>
<tagthisperson target="inthisvideo" in="00:04:03:06" out="00:04:13:01" person="Wilken Sanches" />
<attribution in="00:04:10:00" out="00:04:13:00" target="container5" resourceid="attrib"></attribution>
<tagthisperson target="inthisvideo" in="00:04:13:02" out="00:04:19:05" person="Keechang Kim" />
- <twitter in="00:04:19:06" out="00:04:24:01" title="Celine Celines" src="from:celinecelines" target="personaltwitter" width="238" height="120"/>
<tagthisperson target="inthisvideo" in="00:04:19:06" out="00:04:24:01" person="Celine Celines" />
<flickr in="00:04:19:06" out="00:04:24:01" target="personalflickr" userid="13072070@N00" numberofimages="8" padding="4px"/>
<lastfm in="00:40:00" out="01:24:00" artist="yacht" target="lastfmdiv" apikey="30ac38340e8be75f9268727cb4526b3d"/>
-
+
</resources>
<map>
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<!---
- To be able to use the demo effectively, the user must create the following:
- 1. Two input fields/a method to select data of some sort (drop down list, check box, ect)
- for the user to be able to select a video and a hashtag that will be used in the demo
- 2. A method of some sort (button, listeners, ect) for the user to submit the data that they
- entered in the input fields in step 1.
- 3. Once the above have been added, a listener will listen for a button click on
- the submit button, and will call a function to create a popcorn object
- and begin running the twitter plugin and begin the video
---->
-<html>
- <head>
- <title>Popcorn Twitter Video Demo</title>
- <script src="../../popcorn.js"></script>
- <script src="../../players/youtube/popcorn.youtube.js"></script>
- <script src="../../players/vimeo/popcorn.vimeo.js"></script>
- <script src="../../plugins/twitter/popcorn.twitter.js"></script>
- <script>
- document.addEventListener( "DOMContentLoaded", function() {
-
- var srtBtn = document.getElementById( "srtBtn" );
-
- // Add an event listener to the start button to know when it is clicked
- srtBtn.addEventListener( "click", btnClick, false );
-
- }, false );
-
- var count = 0;
- function btnClick(){
- var popcorn, ok = false;
-
- // Anytime after the first click, remove the current video and
- // wipe the current twitter feed
- if(count != 0){
- popcorn = "";
- document.getElementById('twitterdiv').innerHTML = "";
- }
-
- count++;
-
- // If statements parsing URL entered in the textbox, checking for keywords
- // and displaying the video accordingly, displays error message if the
- // video type is incompatable
- if( document.getElementById( 'vidUrl' ).value.search( "youtube" ) != -1 ){
- popcorn = Popcorn.youtube( '#video', document.getElementById( 'vidUrl' ).value );
- ok = true;
- }
- else if( document.getElementById( 'vidUrl' ).value.search( "vimeo" ) != -1 ){
- popcorn = Popcorn.vimeo( '#video', document.getElementById( 'vidUrl' ).value );
- ok = true;
- }
- else if( document.getElementById( 'vidUrl' ).value.search( "ogv" ) != -1 ){
- document.getElementById( 'video' ).innerHTML =
- "<video id='video2'" +
- "controls autoplay" +
- "width= '250px'>" +
-
- "<source id='ogv'" +
- "type='video/ogg; codecs=\"theora, vorbis\"'>" +
-
- "</video>";
- document.getElementById( 'ogv' ).src = document.getElementById( 'vidUrl' ).value;
- popcorn = Popcorn( '#video2' );
- ok = true;
- }
- else if(document.getElementById( 'vidUrl' ).value.search( "mp4" ) != -1){
- document.getElementById( 'video' ).innerHTML =
- "<video id='video2'" +
- "controls autoplay" +
- "width= '250px'>" +
-
- "<source id='mp4'" +
- "type='video/mp4; codecs=\"avc1, mp4a\"'>" +
-
- "</video>";
- document.getElementById( 'mp4' ).src = document.getElementById( 'vidUrl' ).value;
- popcorn = Popcorn( '#video2' );
- ok = true;
- }
- else{
- document.getElementById( 'video' ).innerHTML = "</br><b>The link is not a supported video type</b>";
- }
-
- if(ok){
- // Add twitter widget with associated parameters
- popcorn
- .twitter({
- start: 0, // seconds
- end: 45, // seconds
- src: document.getElementById( 'hashtag' ).value,
- target: 'twitterdiv'
- })
- .volume(0)
- .play();
- }
- }
- </script>
- </head>
- <body>
- <!-- Setup html divs and other tags, as well as input fields and buttons -->
- <h3>Twitter Hashtag video demo</h3>
- <p>Insert a link to a video(youtube,vimeo,.ogv,or.mp4) and supply a hashtag</p>
- <div>
- <p>Video URL:</p>
- <input id="vidUrl" size="50" value="http://www.youtube.com/watch?v=9oar9glUCL0"/><br />
- <p>Twitter Hashtag:</p>
- <input id="hashtag" size="20" value="#seneca"/>
- <button class="start" id="srtBtn">Play</button><br />
- <div id="video" style="width: 360px; height: 300px;" ></div><br />
- <div id="twitterdiv" style="position:relative;float:left;width:400px;height:600px"></div>
- </div>
- </body>
-</html>
-
View
@@ -13,7 +13,6 @@
<script src="../plugins/googlefeed/popcorn.googlefeed.js"></script>
<script src="../plugins/image/popcorn.image.js"></script>
<script src="../plugins/subtitle/popcorn.subtitle.js"></script>
- <script src="../plugins/twitter/popcorn.twitter.js"></script>
<script>
var attachEvent = function( element, event, callBack ) {
@@ -34,16 +33,16 @@
}
var done = false;
-
+
attachEvent( document, "DOMContentLoaded", function( e ) {
if ( done ) {
-
+
return;
}
done = true;
-
+
var paused = true,
popcorn;
@@ -63,13 +62,6 @@
numberofimages: "8",
target: "flickrdiv"
})
- .twitter({
- start: 20, // seconds
- end: 45, // seconds
- title: "Oil Spill",
- src: "#oilspill",
- target: "twitterdiv"
- })
.attribution({
start: 5, // seconds
end: 60, // seconds
@@ -88,7 +80,7 @@
language: "en"
})
.webpage({
- id: "webpages-a",
+ id: "webpages-a",
start: 0, // seconds
end: 15, // seconds
src: "http://webmademovies.org/",
@@ -153,7 +145,7 @@
var volume = ( popcorn.volume() === 1 ) ? 0.5 : 1;
popcorn.volume( volume );
}, false);
-
+
attachEvent( element( "btn-mute" ), "click", function() {
popcorn.mute( !popcorn.media.muted );
}, false );
@@ -193,7 +185,6 @@
<ul>
<li>From 5 to 40 seconds, the footnote 'The video is "RiP: A Remix Manifesto", by Brett Gaylor' will appear below 'Footnote Area'.</li>
<li>From 20 to 40 seconds, the a flickr stream of 8 images tagged 'georgia' will appear below 'Flickr Area'.</li>
- <li>From 20 to 45 seconds, tweets tagged #oilspill will appear below 'Twitter Area'.</li>
<li>From 5 to 60 seconds, the Creative Commons license will appear below 'Attributions Area'.</li>
<li>From 5 to 15 seconds, the Mozilla Drumbeat logo will appear below 'Image Area'.</li>
<li>From 5 to 15 seconds, the subtitle 'This is overlaid on top of the video. You can hightlight it!' will appear in front of the video.</li>
@@ -210,9 +201,6 @@
<div id="flickrdiv" width="50%" height="50%">
<strong>Flickr Area</strong><br />
</div>
- <div id="twitterdiv" width="50%" height="50%">
- <strong>Twitter Area</strong><br />
- </div>
<div id="imagediv" width="50%" height="50%">
<strong>Image Area</strong><br />
</div>
@@ -11,7 +11,6 @@
<script src="../../plugins/googlefeed/popcorn.googlefeed.js"></script>
<script src="../../plugins/image/popcorn.image.js"></script>
<script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
- <script src="../../plugins/twitter/popcorn.twitter.js"></script>
<script>
// Helper function to get elements
function element(id) {
@@ -39,13 +38,6 @@
numberofimages: '8',
target: 'flickrdiv'
})
- .twitter({
- start: 20,
- end: 45,
- title: 'Oil Spill',
- src: '#oilspill',
- target: 'twitterdiv'
- })
.subtitle({
start: 5,
end: 15,
@@ -54,7 +46,7 @@
language: "en"
})
.webpage({
- id: "webpages-a",
+ id: "webpages-a",
start: 0,
end: 15,
src: 'http://webmademovies.org/',
@@ -117,7 +109,7 @@
var volume = (popcorn.volume() === 1) ? 0.5 : 1;
popcorn.volume(volume);
}, false);
-
+
element('btn-mute').addEventListener('click', function() {
popcorn.mute( !popcorn.media.muted );
}, false);
@@ -157,7 +149,6 @@
<ul>
<li>From 5 to 40 seconds, the footnote 'The video is "RiP: A Remix Manifesto", by Brett Gaylor' will appear below 'Footnote Area'.</li>
<li>From 20 to 40 seconds, the a flickr stream of 8 images tagged 'georgia' will appear below 'Flickr Area'.</li>
- <li>From 20 to 45 seconds, tweets tagged #oilspill will appear below 'Twitter Area'.</li>
<li>From 5 to 15 seconds, the Mozilla Drumbeat logo will appear below 'Image Area'.</li>
<li>From 5 to 15 seconds, the subtitle 'This is overlaid on top of the video. You can hightlight it!' will appear in front of the video.</li>
<li>From 0 to 20 seconds, blogs from 'http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml' will appear below 'Google Feed Area'.</li>
@@ -170,9 +161,6 @@
<div id="flickrdiv" width="50%" height="50%">
<strong>Flickr Area</strong><br />
</div>
- <div id="twitterdiv" width="50%" height="50%">
- <strong>Twitter Area</strong><br />
- </div>
<div id="imagediv" width="50%" height="50%">
<strong>Image Area</strong><br />
</div>
Oops, something went wrong.

0 comments on commit 2bbdece

Please sign in to comment.