зеркало из https://github.com/mozilla/popcorn-js.git
[#246] fixed some camel notation references
This commit is contained in:
ScottDowne
Родитель
cf09c98ff7
Коммит
db05600a6a
|
|
@ -19,6 +19,7 @@
|
|||
<script src="../../plugins/tagThisPerson/popcorn.tagThisPerson.js"></script>
|
||||
<script src="../../plugins/wikipedia/popcorn.wikipedia.js"></script>
|
||||
<script src="../../plugins/flickr/popcorn.flickr.js"></script>
|
||||
<script src="../../plugins/attribution/popcorn.attribution.js"></script>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -91,37 +91,37 @@
|
|||
<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"/>
|
||||
<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"/>
|
||||
<googleNews in="00:00:05:02" out="00:00:10:07" target="googlenewsdiv" topic="Village Telco"/>
|
||||
<googlenews in="00:00:05:02" out="00:00:10:07" target="googlenewsdiv" topic="Village Telco"/>
|
||||
|
||||
<twitter in="00:00:10:07" out="00:00:18:04" title="Oil Spill" src="#oilspill" target="twitter" width="238" height="120"/>
|
||||
<googleNews in="00:00:10:07" out="00:00:18:04" target="googlenewsdiv" topic="Oil Spill"/>
|
||||
<googlenews in="00:00:10:07" out="00:00:18:04" target="googlenewsdiv" topic="Oil Spill"/>
|
||||
<!--<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>-->
|
||||
<googleNews in="00:00:18:04" out="00:00:25:02" target="googlenewsdiv" topic="Keyboard Cat"/>
|
||||
<googlenews in="00:00:18:04" out="00:00:25:02" target="googlenewsdiv" topic="Keyboard Cat"/>
|
||||
|
||||
<tagThisPerson target="inthisvideo" in="00:00:28:09" out="00:00:29:07" person="Jeffrey Warren" />
|
||||
<!--<attribution in="00:00:28:09" out="00:00:29:07" target="container5">Grassroots Mapping, Tungsten Monkey</attribution>-->
|
||||
<tagThisPerson target="inthisvideo" in="00:00:29:08" out="00:00:31:00" person="Village Telco Guy" />
|
||||
|
||||
<wikipedia in="00:00:32:00" out="00:00:41:00" resourceid="theinternet" numberOfWords="200" target="wikidiv"/>
|
||||
<googleNews in="00:00:32:00" out="00:00:41:00" target="googlenewsdiv" topic="the internet"/>
|
||||
<wikipedia in="00:00:32:00" out="00:00:41:00" resourceid="theinternet" numberofwords="200" target="wikidiv"/>
|
||||
<googlenews in="00:00:32:00" out="00:00:41:00" target="googlenewsdiv" topic="the internet"/>
|
||||
|
||||
<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"/>
|
||||
<googleNews in="00:00:41:00" out="00:01:07:09" target="googlenewsdiv" topic="Oil Spill"/>
|
||||
<!--<location resourceid="grandislewiki" in="00:00:41:00" out="00:01:07:09" lat="29.2720" long="-90.0233 " target="container2" zoom="8"/>-->
|
||||
<wikipedia in="00:00:41:00" out="00:01:07:09" resourceid="oilspill" numberOfWords="200" target="wikidiv"/>
|
||||
<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"/>
|
||||
<!--<location id="CapeTown" resourceid="capetownwiki" in="00:01:07:10" out="00:01:32:07" lat="-33.9238" long="18.4233" target="container2" zoom="8"/>-->
|
||||
<wikipedia in="00:01:07:10" out="00:01:32:07" resourceid="villagetelco" numberOfWords="200" target="wikidiv"/>
|
||||
<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" />
|
||||
|
|
@ -133,10 +133,10 @@
|
|||
<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" source="@zittrain" target="personaltwitter" width="238" height="120"/>
|
||||
<!--<location 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"/>
|
||||
<wikipedia in="00:02:20:01" out="00:02:23:00" resourceid="compuserve" numberOfWords="200" target="wikidiv"/>
|
||||
<wikipedia in="00:02:23:01" out="00:02:26:00" resourceid="aol" numberOfWords="200" target="wikidiv"/>
|
||||
<wikipedia in="00:02:26:01" out="00:02:33:00" resourceid="prodigy" numberOfWords="200" target="wikidiv"/>
|
||||
<wikipedia in="00:02:09:00" out="00:02:20:00" resourceid="zittrain" numberofwords="200" target="wikidiv"/>
|
||||
<wikipedia in="00:02:20:01" out="00:02:23:00" resourceid="compuserve" numberofwords="200" target="wikidiv"/>
|
||||
<wikipedia in="00:02:23:01" out="00:02:26:00" resourceid="aol" numberofwords="200" target="wikidiv"/>
|
||||
<wikipedia in="00:02:26:01" out="00:02:33:00" resourceid="prodigy" numberofwords="200" target="wikidiv"/>
|
||||
|
||||
<!--<attribution in="00:02:15:09" out="00:02:17:00" target="container5" resourceid="compuserveattrib"></attribution>
|
||||
<attribution in="00:02:17:01" out="00:02:20:00" target="container5" resourceid="aolattrib"></attribution>
|
||||
|
|
@ -147,19 +147,19 @@
|
|||
<attribution in="00:02:47:01" out="00:02:55:00" target="container5" resourceid="bankattrib"></attribution>
|
||||
<attribution in="00:03:07:10" out="00:03:29:00" target="container5" resourceid="bankattrib"></attribution>-->
|
||||
|
||||
<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"/>
|
||||
<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"/>
|
||||
|
||||
<googleNews in="00:02:57:01" out="00:03:03:00" target="googlenewsdiv" topic="Tim Berners-Lee"/>
|
||||
<googlenews in="00:02:57:01" out="00:03:03:00" target="googlenewsdiv" topic="Tim Berners-Lee"/>
|
||||
|
||||
<wikipedia in="00:03:03:01" out="00:03:28:00" resourceid="worldwideweb" numberOfWords="200" target="wikidiv"/>
|
||||
<googleNews in="00:03:03:01" out="00:03:28:00" target="googlenewsdiv" topic="World Wide Web"/>
|
||||
<wikipedia in="00:03:03:01" out="00:03:28:00" resourceid="worldwideweb" numberofwords="200" target="wikidiv"/>
|
||||
<googlenews in="00:03:03:01" out="00:03:28:00" target="googlenewsdiv" topic="World Wide Web"/>
|
||||
|
||||
<googleNews in="00:03:28:00" out="00:03:32:00" target="googlenewsdiv" topic="Wikipedia"/>
|
||||
<wikipedia in="00:03:28:01" out="00:03:32:00" resourceid="wikipedia" numberOfWords="200" target="wikidiv"/>
|
||||
<googlenews in="00:03:28:00" out="00:03:32:00" target="googlenewsdiv" topic="Wikipedia"/>
|
||||
<wikipedia in="00:03:28:01" out="00:03:32:00" resourceid="wikipedia" numberofwords="200" target="wikidiv"/>
|
||||
|
||||
<wikipedia in="00:03:36:00" out="00:03:43:00" resourceid="openstandards" numberOfWords="200" target="wikidiv"/>
|
||||
<wikipedia in="00:03:36:00" out="00:03:43:00" resourceid="openstandards" numberofwords="200" target="wikidiv"/>
|
||||
|
||||
<tagThisPerson target="inthisvideo" in="00:03:09:00" out="00:03:16:00" person="NCSA guy" />
|
||||
<tagThisPerson target="inthisvideo" in="00:03:16:01" out="00:03:18:05" person="Computer Chronicles guy #1" />
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
var p = Popcorn('#video')
|
||||
.volume(0)
|
||||
.play()
|
||||
.googleMap({
|
||||
.googlemap({
|
||||
start: 0, // seconds
|
||||
end: 20, // seconds
|
||||
type: 'ROADMAP',
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
long: -79.403323,
|
||||
zoom: 10
|
||||
} )
|
||||
.googleMap({
|
||||
.googlemap({
|
||||
start: 0, // seconds
|
||||
end: 30, // seconds
|
||||
type: 'ROADMAP',
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ var googleCallback;
|
|||
(function (Popcorn) {
|
||||
|
||||
/**
|
||||
* googleMap popcorn plug-in
|
||||
* googlemap popcorn plug-in
|
||||
* Adds a map to the target div centered on the location specified by the user
|
||||
* Options parameter will need a start, end, target, type, zoom, lat and long, and location
|
||||
* -Start is the time that you want this plug-in to execute
|
||||
|
|
@ -19,7 +19,7 @@ var googleCallback;
|
|||
*
|
||||
* Example:
|
||||
var p = Popcorn('#video')
|
||||
.googleMap({
|
||||
.googlemap({
|
||||
start: 5, // seconds
|
||||
end: 15, // seconds
|
||||
type: 'ROADMAP',
|
||||
|
|
@ -29,7 +29,7 @@ var googleCallback;
|
|||
} )
|
||||
*
|
||||
*/
|
||||
Popcorn.plugin( "googleMap" , (function(){
|
||||
Popcorn.plugin( "googlemap" , (function(){
|
||||
|
||||
var newdiv, i = 1, _mapFired = false, _mapLoaded = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
var p = Popcorn('#video')
|
||||
.volume(0)
|
||||
.play()
|
||||
.googleNews({
|
||||
.googlenews({
|
||||
start: 0, // seconds
|
||||
end: 20, // seconds
|
||||
topic: 'Oil Spill',
|
||||
target: 'newsdiv'
|
||||
} )
|
||||
.googleNews({
|
||||
.googlenews({
|
||||
start: 25, // seconds
|
||||
end: 30, // seconds
|
||||
topic: 'Village Telco',
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
/**
|
||||
*/
|
||||
Popcorn.plugin( "googleNews" , {
|
||||
Popcorn.plugin( "googlenews" , {
|
||||
|
||||
manifest: {
|
||||
about:{
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
},
|
||||
/**
|
||||
* @member googleNews
|
||||
* @member googlenews
|
||||
* The start function will be executed when the currentTime
|
||||
* of the video reaches the start time provided by the
|
||||
* options variable
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
options.container.setAttribute( 'style', 'display:inline' );
|
||||
},
|
||||
/**
|
||||
* @member googleNews
|
||||
* @member googlenews
|
||||
* The end function will be executed when the currentTime
|
||||
* of the video reaches the end time provided by the
|
||||
* options variable
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
document.addEventListener('DOMContentLoaded', function () {
|
||||
var p = Popcorn('#video')
|
||||
.play()
|
||||
.lowerThird({
|
||||
.lowerthird({
|
||||
start: 5, // seconds
|
||||
end: 15, // seconds
|
||||
salutation: 'Mr',
|
||||
name: 'Hyde',
|
||||
role: 'Monster'
|
||||
} )
|
||||
.lowerThird({
|
||||
.lowerthird({
|
||||
start: 20, // seconds
|
||||
end: 45, // seconds
|
||||
salutation: 'Dr',
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// PLUGIN: LowerThird
|
||||
// PLUGIN: lowerthird
|
||||
|
||||
(function (Popcorn) {
|
||||
|
||||
|
|
@ -21,11 +21,11 @@
|
|||
return { left: x, top: y };
|
||||
}
|
||||
|
||||
Popcorn.plugin( "lowerThird" , {
|
||||
Popcorn.plugin( "lowerthird" , {
|
||||
|
||||
manifest: {
|
||||
about:{
|
||||
name: "Popcorn LowerThird Plugin",
|
||||
name: "Popcorn lowerthird Plugin",
|
||||
version: "0.1",
|
||||
author: "Scott Downe",
|
||||
website: "http://scottdowne.wordpress.com/"
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
options:{
|
||||
start : {elem:'input', type:'text', label:'In'},
|
||||
end : {elem:'input', type:'text', label:'Out'},
|
||||
target : 'LowerThird-container',
|
||||
target : 'lowerthird-container',
|
||||
salutation : {elem:'input', type:'text', label:'Text'},
|
||||
name : {elem:'input', type:'text', label:'Text'},
|
||||
role : {elem:'input', type:'text', label:'Text'}
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
_setup: function( options ) {
|
||||
|
||||
// Creates a div for all LowerThirds to use
|
||||
// Creates a div for all Lower Thirds to use
|
||||
if ( !this.container ) {
|
||||
this.container = document.createElement('div');
|
||||
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
}
|
||||
|
||||
// if a target is specified, use that
|
||||
if ( options.target && options.target !== 'LowerThird-container' ) {
|
||||
if ( options.target && options.target !== 'lowerthird-container' ) {
|
||||
options.container = document.getElementById( options.target );
|
||||
} else { // use shared default container
|
||||
options.container = this.container;
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
},
|
||||
/**
|
||||
* @member lowerThird
|
||||
* @member lowerthird
|
||||
* The start function will be executed when the currentTime
|
||||
* of the video reaches the start time provided by the
|
||||
* options variable
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
this.container.style.top = offset( this.video ).top + this.video.offsetHeight - ( 40 + this.container.offsetHeight ) + "px";
|
||||
},
|
||||
/**
|
||||
* @member lowerThird
|
||||
* @member lowerthird
|
||||
* The end function will be executed when the currentTime
|
||||
* of the video reaches the end time provided by the
|
||||
* options variable
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ var wikiCallback;
|
|||
* Wikipedia popcorn plug-in
|
||||
* Displays a wikipedia aricle in the target specified by the user by using
|
||||
* new DOM element instead overwriting them
|
||||
* Options parameter will need a start, end, target, lang, src, title and numOfWords.
|
||||
* Options parameter will need a start, end, target, lang, src, title and numberofwords.
|
||||
* -Start is the time that you want this plug-in to execute
|
||||
* -End is the time that you want this plug-in to stop executing
|
||||
* -Target is the id of the document element that the text from the article needs to be
|
||||
|
|
@ -17,7 +17,7 @@ var wikiCallback;
|
|||
* -Lang (optional, defaults to english) is the language in which the article is in.
|
||||
* -Src is the url of the article
|
||||
* -Title (optional) is the title of the article
|
||||
* -NumOfWords (optional, defaults to 200) is the number of words you want displaid.
|
||||
* -numberofwords (optional, defaults to 200) is the number of words you want displaid.
|
||||
*
|
||||
* @param {Object} options
|
||||
*
|
||||
|
|
@ -41,13 +41,13 @@ var wikiCallback;
|
|||
website: "annasob.wordpress.com"
|
||||
},
|
||||
options:{
|
||||
start : {elem:'input', type:'text', label:'In'},
|
||||
end : {elem:'input', type:'text', label:'Out'},
|
||||
lang : {elem:'input', type:'text', label:'Language'},
|
||||
src : {elem:'input', type:'text', label:'Src'},
|
||||
title : {elem:'input', type:'text', label:'Title'},
|
||||
numOfWords : {elem:'input', type:'text', label:'Num Of Words'},
|
||||
target : 'wiki-container'
|
||||
start : {elem:'input', type:'text', label:'In'},
|
||||
end : {elem:'input', type:'text', label:'Out'},
|
||||
lang : {elem:'input', type:'text', label:'Language'},
|
||||
src : {elem:'input', type:'text', label:'Src'},
|
||||
title : {elem:'input', type:'text', label:'Title'},
|
||||
numberofwords : {elem:'input', type:'text', label:'Num Of Words'},
|
||||
target : 'wiki-container'
|
||||
}
|
||||
},
|
||||
/**
|
||||
|
|
@ -66,7 +66,7 @@ var wikiCallback;
|
|||
// if the user didn't specify a language default to english
|
||||
if (typeof options.lang === 'undefined') { options.lang ="en"; }
|
||||
// if the user didn't specify number of words to use default to 200
|
||||
options.numOfWords = options.numOfWords || 200;
|
||||
options.numberofwords = options.numberofwords || 200;
|
||||
// replace the user specified target with the actual DOM element
|
||||
options.target = document.getElementById( options.target );
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ var wikiCallback;
|
|||
// get the article text and remove any special characters
|
||||
_text = data.parse.text["*"].substr(data.parse.text["*"].indexOf('<p>'));
|
||||
_text = _text.replace(/((<(.|\n)+?>)|(\((.*?)\) )|(\[(.*?)\]))/g, "");
|
||||
options._desc.innerHTML = _text.substr(0, options.numOfWords ) + " ...";
|
||||
options._desc.innerHTML = _text.substr(0, options.numberofwords ) + " ...";
|
||||
|
||||
options._fired = true;
|
||||
};
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче