cleanup

annasob · Sep 29, 2010 · 697c849 · 697c849
1 parent dea1d78
commit 697c849
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/index.html b/index.html
@@ -17,7 +17,7 @@
   var DEFAULTEMT = "happy";
   var VIDEOHEIGHT = 270;
   var VIDEOWIDTH = 480;
-  var twitterData  = "LevFeels";
+  var twitterData  = "newTwitter";
   var emotion = "happy";
   var screenX, screenY, videoPosition;
   var playingVideo = false;
@@ -129,15 +129,13 @@
             tweet += data.results[i].text +" ";
             allTweets.push(tweetText); 
             setTimeout(
-              (function(aTweet) {
+              (function(aTweet, i) {
                 var tweet = aTweet;
                 return function() { 
                   printTweet(tweet);
                 };
-              })(tweetObject), 1500 *i);
+              })(tweetObject), 5000 *i);
           }
-          // add to the tweet string
-          tweet += data.results[i].text +" ";
         }
       }
 
@@ -372,18 +370,14 @@
   $.getJSON('http://api.flickr.com/services/feeds/photos_public.gne?tags=happy&lang=en-us&format=json&jsoncallback=?',null, function(data){ flickrCallback(data, "happy");
     $.getJSON('http://api.flickr.com/services/feeds/photos_public.gne?tags=sad&lang=en-us&format=json&jsoncallback=?',null, function(data){ flickrCallback(data, "sad");
       $.getJSON('http://api.flickr.com/services/feeds/photos_public.gne?tags=angry&lang=en-us&format=json&jsoncallback=?',null, function(data){ flickrCallback(data, "angry");
-        //document.getElementById("happySong").play();
         playVideo();
+        document.getElementById(emotion+"Song").play();
       });
     });
   });
   getTwitter();
   twitterInterval = setInterval(getTwitter, (DURATION *3)*1000);
   init();
- //setTimeout(playVideo, 10000);
- //playVideo();
-  document.getElementById("happySong").play();
- //setTimeout(function() { document.getElementById("happySong").play()}, 10000);
 }, false);
 window.onresize = function (){
     videoPosition = $("#videoDiv").position();
@@ -395,9 +389,9 @@
 <video src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/videos/happy.ogg" style="display:none;" width="480" height="270" id="happy"></video>
 <video src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/videos/angry.ogg" style="display:none;" width="480" height="270" id="angry"></video>
 <video src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/videos/middle.ogg" style="display:none;" width="480" height="270" id="middle"></video>
-<audio style="display:none;" src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/music/sad.ogg" id="sadSong" controls="none" loop></audio>
-<audio style="display:none;" src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/music/happy.ogg" id="happySong" controls="none" loop></audio>
-<audio style="display:none;" src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/music/angry.ogg" id="angrySong" controls="none" loop></audio>
+<audio style="display:none;" src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/music/sad.ogg" id="sadSong" controls="none" loop="true"></audio>
+<audio style="display:none;" src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/music/happy.ogg" id="happySong" controls="none" loop="true"></audio>
+<audio style="display:none;" src="http://scotland.proximity.on.ca/sdowne/LevFeelsFine/music/angry.ogg" id="angrySong" controls="none" loop="true"></audio>
 <img style="display:none;" id="image" />
 <div style="position:fixed;left:50%;top:50%;margin:-135px 0 0 -240px;" id="videoDiv" width="480" height="270" ></div>
 <canvas style="display:none;border-radius:10px;-moz-border-radius: 10px;-webkit-border-radius: 10px;position:fixed;left:50%;top:50%;margin:-135px 0 0 -240px;border-style:solid;border-width:15px;" id="canvas" width="480" height="270" ></canvas>