Merge remote-tracking branch 'dseif/t534b' into develop

plugins/attribution/popcorn.attribution.unit.js

@@ -25,7 +25,7 @@ test("Popcorn attribution Plugin", function () {
   
   popped.attribution({
       start: 0, // seconds
-      end: 0.5, // seconds
+      end: 2, // seconds
       nameofwork: "A Shared Culture",
       copyrightholder:"Jesse Dylan",
       license: "CC-BY-N6",
@@ -33,8 +33,8 @@ test("Popcorn attribution Plugin", function () {
       target: 'attribdiv'
     } )
     .attribution({
-      start: 0.5, // seconds
+      start: 2, // seconds
-      end: 1, // seconds
+      end: 4, // seconds
       nameofwork: "Internet",
       nameofworkurl:"http://www.archive.org/details/CC1232_internet",
       copyrightholder:"The Computer Chronicles",
@@ -53,12 +53,12 @@ test("Popcorn attribution Plugin", function () {
     plus();
   });
   
-  popped.exec( 0.5, function() {
+  popped.exec( 2, function() {
     equals (attributiondiv.children[1].style.display , "inline", "second attribution is visible on the page" );
     plus();
   });
   
-  popped.exec( 1, function() {
+  popped.exec( 4, function() {
     equals(attributiondiv.children[1].style.display , "none", "second attribution is no longer visible on the page" );
     plus();
     equals(attributiondiv.children[0].style.display , "none", "first attribution is no longer visible on the page" );

plugins/code/popcorn.code.unit.js

@@ -23,8 +23,8 @@ test('Popcorn Code Plugin', function () {
   plus();
 
   popped.code({
-    start: 1,
+    start: 0,
-    end: 3,
+    end: 2,
     onStart: function( options ) {
       codeDiv.innerHTML = 'Test 1 - onStart (no onEnd)';
       ok(true, 'Test 1 onStart was run.');
@@ -33,8 +33,8 @@ test('Popcorn Code Plugin', function () {
   });
 
   popped.code({
-    start: 5,
+    start: 2,
-    end: 8,
+    end: 4,
     onStart: function( options ) {
       codeDiv.innerHTML = 'Test 2 - onStart';
       ok(true, 'Test 2 onStart was run.');
@@ -48,8 +48,8 @@ test('Popcorn Code Plugin', function () {
   });
 
   popped.code({
-    start: 10,
+    start: 4,
-    end: 14,
+    end: 6,
     onStart: function( options ) {
       codeDiv.innerHTML = 'Test 3 - onStart [Frames: ';
       ok(true, 'Test 3 onStart was run.');

plugins/facebook/popcorn.facebook.unit.js

@@ -25,28 +25,28 @@ test("Popcorn Facebook Plugin", function () {
   popped.facebook({
         target: "likediv",
         start : 1,
-        end   : 7
+        end   : 6
       } )
       .facebook({
         href  : "http://www.facebook.com/senecacollege",
         type  : "LIKE_BOX",
         target: "likeboxdiv",
         start : 2,
-        end   : 7
+        end   : 6
       } )
       .facebook({
         site   : "http://popcornjs.org/",
         type   : "ACTIVITY",
         target : "activitydiv",
         start  : 3,
-        end    : 7
+        end    : 6
       } )
       .facebook({
         href   : "http://www.facebook.com/senecacollege",
         type   : "FACEPILE",
         target : "facepilediv",
         start  : 4,
-        end    : 7,
+        end    : 6,
         width  : 300
       } )
     .volume(0)

plugins/flickr/popcorn.flickr.unit.js

@@ -24,14 +24,14 @@ test("Popcorn Flickr Plugin", function () {
   
   popped.flickr({
     start: 0, // seconds
-    end: 1,   // seconds
+    end: 2,   // seconds
     userid: '35034346917@N01',
     numberofimages: '1',
     target: 'flickrdiv'
   } )
   .flickr({
-    start: 1, // seconds
+    start: 2, // seconds
-    end: 2,   // seconds
+    end: 4,   // seconds
     username: 'AniaSob',
     apikey: 'd1d249260dd1673ec8810c8ce5150ae1',
     numberofimages: '1',
@@ -40,21 +40,21 @@ test("Popcorn Flickr Plugin", function () {
 
   setupId = popped.getLastTrackEventId();
 
-  popped.exec( 0.5, function() {
+  popped.exec( 1, function() {
     ok( /display: inline;/.test( flickrdiv.innerHTML ), "Div contents are displayed" );
     plus();
     ok( /img/.test( flickrdiv.innerHTML ), "An image exists" );
     plus();
   });
   
-  popped.exec( 1.5, function() {
+  popped.exec( 3, function() {
     ok( /display: inline;/.test( flickrdiv.innerHTML ), "Div contents are displayed" );
     plus();
     ok( /img/.test( flickrdiv.innerHTML ), "An image exists" );
     plus();
   });
 
-  popped.exec( 2, function() {
+  popped.exec( 4, function() {
     ok( /display: none;/.test( flickrdiv.innerHTML ), "Div contents are hidden again" );
     plus();
 

plugins/footnote/popcorn.footnote.unit.js

@@ -24,13 +24,13 @@ test("Popcorn Footnote Plugin", function () {
   
   popped.footnote({
     start: 0, // seconds
-    end: 1, // seconds
+    end: 2, // seconds
     text: 'This video made exclusively for drumbeat.org',
     target: 'footnotediv'
   })
   .footnote({
-    start: 1, // seconds
+    start: 2, // seconds
-    end: 2, // seconds
+    end: 4, // seconds
     text: 'Visit webmademovies.org for more details',
     target: 'footnotediv'
   });
@@ -46,12 +46,12 @@ test("Popcorn Footnote Plugin", function () {
     plus();
   });
 
-  popped.exec( 1, function() {
+  popped.exec( 3, function() {
     equals (footnotediv.children[1].style.display , "inline", "second footnote is visible on the page" );
     plus();
   });
 
-  popped.exec( 2, function() {
+  popped.exec( 4, function() {
     ok (footnotediv.children[1].style.display === 'none' &&  footnotediv.children[0].style.display === 'none', "footnote are no longer vidible on the page" );
     plus();
 

plugins/gml/popcorn.gml.unit.js

@@ -24,13 +24,13 @@ test("Popcorn GML Plugin", function () {
   
   popped.gml({
     start: 0, // seconds
-    end: 1, // seconds
+    end: 2, // seconds
     gmltag: '29582',
     target: 'gmldiv'
   })
   .gml({
-    start: 1, // seconds
+    start: 2, // seconds
-    end: 2, // seconds
+    end: 4, // seconds
     gmltag: '155',
     target: 'gmldiv'
   }).volume( 0 );
@@ -42,12 +42,12 @@ test("Popcorn GML Plugin", function () {
     plus();
   });
   
-  popped.exec( 1, function() {
+  popped.exec( 3, function() {
     equals( gmldiv.children[1].style.display , "block", "second GML is visible on the page" );
     plus();
   });
   
-  popped.exec( 2, function() {
+  popped.exec( 4, function() {
     equals( gmldiv.children[1].style.display , "none", "second GML is no longer visible on the page" );
     plus();
     equals( gmldiv.children[0].style.display , "none", "first GML is no longer visible on the page" );

plugins/googlefeed/popcorn.googlefeed.unit.js

@@ -24,7 +24,7 @@ test("Popcorn Google Feed Plugin", function () {
   
   popped.googlefeed({
     start: 0, // seconds
-    end: 1, // seconds
+    end: 2, // seconds
     target: "feed",
     url: "http://zenit.senecac.on.ca/~chris.tyler/planet/rss20.xml",
     title: "Planet Feed",
@@ -32,7 +32,7 @@ test("Popcorn Google Feed Plugin", function () {
 	})
 	.googlefeed({
     start: 0, // seconds
-    end: 2, // seconds
+    end: 4, // seconds
     target: "feed1",
     url: "http://blog.pikimal.com/geek/feed/",
     title: "pikiGeek",
@@ -52,13 +52,13 @@ test("Popcorn Google Feed Plugin", function () {
     equals (document.getElementById('_feed1').offsetParent.id, "feed", "First feed is inside the 'feed' div" );
     plus();
   });
-  popped.exec( 1, function() {
+  popped.exec( 3, function() {
     ok (document.getElementById('_feed2'), "Second feed is on the page" );
     plus();
     equals (document.getElementById('_feed2').offsetParent.id, "feed1", "Second feed is inside the 'feed2' div" );
     plus();
   });
-  popped.exec( 2, function() {
+  popped.exec( 4, function() {
     ok (document.getElementById('_feed2').style.display === "none" && 
         document.getElementById('_feed1').style.display === "none", "Both feeds are no lnger visible" );
 	  plus();

plugins/googlemap/popcorn.googlemap.unit.js

@@ -29,7 +29,7 @@ test("Popcorn Google Map Plugin", function () {
   
   popped.googlemap({
     start: 0, // seconds
-    end: 5, // seconds
+    end: 2, // seconds
     type: 'ROADMAP',
     target: 'map',
     lat: 43.665429,
@@ -38,15 +38,15 @@ test("Popcorn Google Map Plugin", function () {
   })
   .googlemap({
       start: 0, // seconds
-      end: 10, // seconds
+      end: 2, // seconds
       type: 'SATELLITE',
       target: 'map2',
       location:'toronto',
       zoom: 15
   });
   var mapz = popped.googlemap({
-    start: 0, // seconds
+    start: 2, // seconds
-    end: 10, // seconds
+    end: 4, // seconds
     type: "STREETVIEW",
     target: "map3",
     location: "6th Line, Oakville, Ontario",
@@ -60,7 +60,7 @@ test("Popcorn Google Map Plugin", function () {
 
   setupId = popped.getLastTrackEventId();
 
-  popped.exec( 4, function() {
+  popped.exec( 1, function() {
     ok(google.maps, "Google maps is available");
     plus();
     ok(google.maps.Geocoder, "Google maps Geocoder is available");
@@ -71,19 +71,19 @@ test("Popcorn Google Map Plugin", function () {
     plus();
   });
 
-  popped.exec( 4, function() {
+  popped.exec( 1, function() {
     ok (document.getElementById('actualmap2'), "Second map is on the page" );
     plus();
     equals (document.getElementById('actualmap2').offsetParent.id, "map2", "Second map is inside the 'map2' div" );
     plus();
   });
 
-  popped.exec( 4, function() {
+  popped.exec( 3, function() {
     equals (document.getElementById('actualmap3').offsetParent.id, "map3", "Tweening map is inside the 'map3' div" );
     plus();
   });
 
-  popped.exec( 11, function() {
+  popped.exec( 5, function() {
     ok (document.getElementById('actualmap2').style.display === "none" && 
         document.getElementById('actualmap1').style.display === "none" &&
         document.getElementById('actualmap3').style.display === "none", "All maps are no longer visible" );

plugins/googlenews/popcorn.googlenews.unit.js

@@ -24,13 +24,13 @@ test( "Popcorn google news Plugin", function () {
   
   popped.googlenews({
     start: 0, // seconds
-    end: 1, // seconds
+    end: 2, // seconds
     topic: "Oil Spill",
     target: "googlenewsdiv"
   })
   .googlenews({
-    start: 1, // seconds
+    start: 2, // seconds
-    end: 2, // seconds
+    end: 4, // seconds
     topic: "Village Telco",
     target: "googlenewsdiv"
   })
@@ -45,12 +45,12 @@ test( "Popcorn google news Plugin", function () {
     plus();
   });
   
-  popped.exec( 1, function() {
+  popped.exec( 3, function() {
     equals( googlenewsdiv.children[1].style.display , "inline", "second googlenews is visible on the page" );
     plus();
   });
   
-  popped.exec( 2, function() {
+  popped.exec( 4, function() {
     equals( googlenewsdiv.children[1].style.display , "none", "second googlenews is no longer visible on the page" );
     plus();
     equals( googlenewsdiv.children[0].style.display , "none", "first googlenews is no longer visible on the page" );

plugins/image/popcorn.image.unit.js

@@ -39,9 +39,9 @@ test("Popcorn Image Plugin", function () {
   })
   .image({
     // seconds
-    start: 5,
+    start: 4,
     // seconds
-    end: 7,
+    end: 6,
     // no href
     src: sources[1],
     target: "imagediv"
@@ -50,7 +50,7 @@ test("Popcorn Image Plugin", function () {
     // seconds
     start: 5,
     // seconds
-    end: 7,
+    end: 6,
     // no href
     src: sources[2],
     target: "imagediv"  
@@ -65,19 +65,19 @@ test("Popcorn Image Plugin", function () {
     plus();
   });
   
-  popped.exec( 4, function() {
+  popped.exec( 3, function() {
     ok( /display: none;/.test( imagediv.innerHTML ), "Div contents are hidden again" );
     plus();
   });
   
-  popped.exec( 6, function() {
+  popped.exec( 5, function() {
     [].forEach.call( document.querySelectorAll( "#imagediv a img" ), function( img, idx ) {
       ok( img.src === sources[ idx ], "Image " + idx + " is in the right order" );
       plus();
     });
   });
   
-  popped.exec( 8, function() {
+  popped.exec( 7, function() {
     popped.pause().removeTrackEvent( setupId );
     ok( !imagediv.children[2], "removed image was properly destroyed" );
     plus();

plugins/linkedin/popcorn.linkedin.unit.js

@@ -66,11 +66,11 @@ test("Popcorn LinkedIn Plugin", function () {
       companyid: "LinkedIn",
       productid: "201714",
       apikey: "ZOLRI2rzQS_oaXELpPF0aksxwFFEvoxAFZRLfHjaAhcGPfOX0Ds4snkJpWwKs8gk",
-      start: 5,
+      start: 1,
-      end: 7
+      end: 3
     });
     
-    popped.exec( 6, function() {
+    popped.exec( 2, function() {
   
       ok( /block/.test( recommenddiv.style.display ), "recommenddiv contents are displayed" );
       plus();
@@ -78,7 +78,7 @@ test("Popcorn LinkedIn Plugin", function () {
       plus();
     });
     
-    popped.exec( 8, function() {
+    popped.exec( 4, function() {
   
       ok( /none/.test( recommenddiv.style.display ), "recommenddiv contents are hidden again" );
       plus();
@@ -94,11 +94,11 @@ test("Popcorn LinkedIn Plugin", function () {
       format: "inline",
       target: "memberprofilediv",
       apikey: "ZOLRI2rzQS_oaXELpPF0aksxwFFEvoxAFZRLfHjaAhcGPfOX0Ds4snkJpWwKs8gk",
-      start: 9,
+      start: 1,
-      end: 11
+      end: 3
     });
 
-    popped.exec( 10, function() {
+    popped.exec( 2, function() {
   
       ok( /block/.test( memberprofilediv.style.display ), "memberprofilediv contents are displayed" );
       plus();
@@ -106,7 +106,7 @@ test("Popcorn LinkedIn Plugin", function () {
       plus();
     });
     
-    popped.exec( 12, function() {
+    popped.exec( 4, function() {
   
       ok( /none/.test( memberprofilediv.style.display ), "memberprofilediv contents are hidden again" );
       plus();
@@ -121,11 +121,11 @@ test("Popcorn LinkedIn Plugin", function () {
       companyid: "1441",
       target: "companyinsiderdiv",
       apikey: "ZOLRI2rzQS_oaXELpPF0aksxwFFEvoxAFZRLfHjaAhcGPfOX0Ds4snkJpWwKs8gk",
-      start: 13,
+      start: 1,
-      end: 15
+      end: 3
     });
 
-    popped.exec( 14, function() {
+    popped.exec( 2, function() {
   
       ok( /block/.test( companyinsiderdiv.style.display ), "companyinsiderdiv contents are displayed" );
       plus();
@@ -133,7 +133,7 @@ test("Popcorn LinkedIn Plugin", function () {
       plus();
     });
     
-    popped.exec( 16, function() {
+    popped.exec( 4, function() {
   
       ok( /none/.test( companyinsiderdiv.style.display ), "companyinsiderdiv contents are hidden again" );
       plus();
@@ -149,13 +149,13 @@ test("Popcorn LinkedIn Plugin", function () {
       format: "inline",
       target: "companyprofilediv",
       apikey: "ZOLRI2rzQS_oaXELpPF0aksxwFFEvoxAFZRLfHjaAhcGPfOX0Ds4snkJpWwKs8gk",
-      start: 17,
+      start: 1,
-      end: 19
+      end: 3
     });
     
     setupId = popped.getLastTrackEventId();
 
-    popped.exec( 18, function() {
+    popped.exec( 2, function() {
   
       ok( /block/.test( companyprofilediv.style.display ), "companyprofilediv contents are displayed" );
       plus();
@@ -163,7 +163,7 @@ test("Popcorn LinkedIn Plugin", function () {
       plus();
     });
     
-    popped.exec( 20, function() {
+    popped.exec( 4, function() {
   
       ok( /none/.test( companyprofilediv.style.display ), "companyprofilediv contents are hidden again" );
       plus();

plugins/lowerthird/popcorn.lowerthird.unit.js

@@ -27,14 +27,14 @@ test( "Popcorn lower third Plugin", function () {
   
   popped.lowerthird({
       start: 0, // seconds
-      end: 5, // seconds
+      end: 2, // seconds
       salutation: "Mr",
       name: "Hyde",
       role: "Monster"
     } )
     .lowerthird({
-      start: 3, // seconds
+      start: 2, // seconds
-      end: 10, // seconds
+      end: 4, // seconds
       target: "lowerthirddiv",
       salutation: "Dr",
       name: "Jekyll",
@@ -47,12 +47,12 @@ test( "Popcorn lower third Plugin", function () {
     plus();
   });
   
-  popped.exec( 4, function() {
+  popped.exec( 3, function() {
     equals ( lowerthirddiv.innerHTML, "Dr Jekyll<br>Person", "second lowerthird is visible" );
     plus();
   });
   
-  popped.exec( 11, function() {
+  popped.exec( 5, function() {
     equals ( popped.container.innerHTML, "", "first lowerthird is empty" );
     plus();
     equals ( lowerthirddiv.innerHTML, "", "second lowerthird is empty" );

plugins/mustache/popcorn.mustache.unit.js

@@ -23,8 +23,8 @@ test('Popcorn Mustache Plugin', function () {
 
   // Static strings
   popped.mustache({
-    start: 1, // seconds
+    start: 0, // seconds
-    end: 3, // seconds
+    end: 2, // seconds
     template: '<h1>{{heading}}</h1>',
     data: '{"heading": "mustache - test 1/3"}',
     target: 'mustache-div',
@@ -33,8 +33,8 @@ test('Popcorn Mustache Plugin', function () {
 
   // Dynamic functions
   popped.mustache({
-    start: 5, // seconds
+    start: 2, // seconds
-    end: 7, // seconds
+    end: 4, // seconds
     template: function(plugin, options) {
       return '<h1>{{heading}}</h1>';
     },
@@ -46,8 +46,8 @@ test('Popcorn Mustache Plugin', function () {
 
   // Template + Object literal
   popped.mustache({
-    start: 9, // seconds
+    start: 4, // seconds
-    end: 11, // seconds
+    end: 5, // seconds
     template: function(plugin, options) {
       return '<h1>{{heading}}</h1>';
     },
@@ -68,18 +68,18 @@ test('Popcorn Mustache Plugin', function () {
 
     var t = Math.floor(video.currentTime);
 
-    if (t === 2 && !two) {
+    if (t === 1 && !two) {
       pass(1, 3);
       two = true;
-    } else if (t === 6 && !six) {
+    } else if (t === 3 && !six) {
       pass(2, 3);
       six = true;
-    } else if (t === 10 && !ten) {
+    } else if (t === 4 && !ten) {
       pass(3, 3);
       ten = true;
     }
 
-    if (t === 11) {
+    if (t === 6) {
       video.pause();
     }
 

plugins/openmap/popcorn.openmap.unit.js

@@ -28,7 +28,7 @@ test( "Popcorn OpenMap Plugin", function () {
   
   popped.openmap({
     start: 0,
-    end: 5,
+    end: 4,
     type: 'ROADMAP',
     target: 'map',
     lat: 43.665429,
@@ -37,7 +37,7 @@ test( "Popcorn OpenMap Plugin", function () {
   } )
   .openmap({
     start: 0,
-    end: 5,
+    end: 4,
     type: 'SATELLITE',
     target: 'map2',
     lat: 40.943926,
@@ -46,7 +46,7 @@ test( "Popcorn OpenMap Plugin", function () {
   } )
   .openmap( {
     start: 0,
-    end: 5,
+    end: 4,
     type: 'TERRAIN',
     target: 'map3',
     lat: 40.943926,
@@ -55,7 +55,7 @@ test( "Popcorn OpenMap Plugin", function () {
   } )
   .openmap( {
     start: 0,
-    end: 5,
+    end: 4,
     target: 'map4',
     lat: 40.943926,
     lng: -78.968525,
@@ -66,7 +66,7 @@ test( "Popcorn OpenMap Plugin", function () {
 
   setupId = popped.getLastTrackEventId();
 
-  popped.exec( 4, function() {
+  popped.exec( 3, function() {
     ok(OpenLayers, "OpenLayers is available");
     plus();
 
@@ -94,7 +94,7 @@ test( "Popcorn OpenMap Plugin", function () {
     plus();
 
   } )
-  .exec( 6, function() {
+  .exec( 5, function() {
     ok (document.getElementById('openmapdiv2').style.display === "none" && 
         document.getElementById('openmapdiv3').style.display === "none" && 
         document.getElementById('openmapdiv4').style.display === "none" &&

plugins/wikipedia/popcorn.wikipedia.unit.js

@@ -30,7 +30,7 @@ test("Popcorn wikipedia Plugin", function () {
     } )
     .wikipedia({
       start: 4, // seconds
-      end: 8, // seconds
+      end: 5, // seconds
       src: 'http://en.wikipedia.org/wiki/S%C3%A3o_Paulo',
       target: 'wikidiv'
     } )
@@ -53,7 +53,7 @@ test("Popcorn wikipedia Plugin", function () {
     plus();
   });
   
-  popped.exec( 5, function() {
+  popped.exec( 4, function() {
     ok (theArticle.innerHTML !== "", "wikidiv now contains information" );
     plus();
     equals (theArticle.childElementCount, 2, "wikidiv now contains two child elements" );