Objectsssssss

nfelger · Dec 3, 2011 · 1420da1 · 1420da1
1 parent 393c5b9
commit 1420da1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/index.html b/index.html
@@ -5,6 +5,7 @@
     <title>Green Room</title>
     <script src="javascripts/jquery-1.6.4.min.js"></script>
     <link rel="stylesheet" href="sp://import/css/adam.css">
+    <link rel="stylesheet" href="sp://import/css/api.css">
     <link rel="stylesheet" href="base_style.css">
   </head>
   <body>
@@ -13,10 +14,9 @@ <h1 id="header">Welcome to the Green Room</h1>
       $(document).ready(function() {
         console.log('All Systems go.');
         sp = getSpotifyApi(1);
-        greenRoom = sp.require('javascripts/green_room');
-        greenRoom.init({
-          sp: sp
-        });
+        gr = sp.require('javascripts/green_room');
+        greenRoom = new gr.GreenRoom(sp);
+        greenRoom.init();
       });
     </script>
   </body>

diff --git a/javascripts/green_room.js b/javascripts/green_room.js
@@ -1,34 +1,34 @@
-sp = getSpotifyApi(1);
+var GreenRoom = function(sp) {
+  this._sp = sp;
+};
 
-exports.init = init;
+GreenRoom.prototype.init = function() {
+  this.updatePageWithTrackDetails();
 
-function init() {
-  updatePageWithTrackDetails();
-
-  sp.trackPlayer.addEventListener("playerStateChanged", function (event) {
+  this._sp.trackPlayer.addEventListener("playerStateChanged", function (event) {
 
     // Only update the page if the track changed
     if (event.data.curtrack == true) {
-      updatePageWithTrackDetails();
+      this.updatePageWithTrackDetails();
     }
   });
-}
+};
 
-function updatePageWithTrackDetails() {
+GreenRoom.prototype.updatePageWithTrackDetails = function() {
   var header = document.getElementById("header");
 
   // This will be null if nothing is playing.
-  var playerTrackInfo = sp.trackPlayer.getNowPlayingTrack();
+  var playerTrackInfo = this._sp.trackPlayer.getNowPlayingTrack();
 
   if (!playerTrackInfo) {
     header.innerText = "Nothing playing!";
   } else {
     var track = playerTrackInfo.track;
     header.innerText = track.name + " from the album " + track.album.name + " by " + track.album.artist.name + ".";
   }
-}
+};
 
-function searchGoogleForSpotify() {
+GreenRoom.prototype.searchGoogleForSpotify = function() {
   var req = new XMLHttpRequest();
   req.open("GET", "https://www.googleapis.com/customsearch/v1?q=spotify", true);
 
@@ -44,3 +44,5 @@ function searchGoogleForSpotify() {
 
   req.send();
 }
+
+exports.GreenRoom = GreenRoom;