Merge branch 'develop'

Conflicts:
	src/manifest.json

src/background.html

@@ -4,13 +4,6 @@
     <audio id="player" src=""></audio>
     <script src="scripts/jquery.js"></script>
     <script src="scripts/player.js"></script>
-    <script>
-      chrome.extension.onRequest.addListener(function(request, sender, callback) {
-          if (request.title != undefined)
-              player.add(request.id, request.title);
-          else if (player.contains(request.id))
-              callback();
-      });
-    </script>
+    <script src="scripts/background.js"></script>
   </body>
 </html>

src/manifest.json

@@ -1,14 +1,17 @@
 {
     "name": "MusicTube",
-    "version": "1.1.2",
+    "version": "1.1.3",
+    "manifest_version": 2,
     "description": "Plays YouTube music in your web browser.",
     "update_url": "https://raw.github.com/jason2506/MusicTube/master/updates.xml",
     "icons": {
         "128": "icons/icon_128.png",
          "48": "icons/icon_48.png",
          "16": "icons/icon_16.png"
     },
-    "background_page": "background.html",
+    "background": {
+        "page": "background.html"
+    },
     "browser_action": {
         "default_icon": "icons/icon_48.png",
         "default_popup": "popup.html"

src/popup.html

@@ -18,17 +18,8 @@
       </div>
     </div>
     <ol id="playlist"></ol>
-    <script id="playlist-tmpl" type="text/template">
-    <% for (var index = 0; index < playlist.length; index++) { %>
-      <li index="<%= index + 1 %>">
-        <span class="title"><%= playlist[index].title %></span>
-        <img src="icons/remove.png" class="remove" />
-      </li>
-    <% } %>
-    </script>
     <script src="scripts/jquery.js"></script>
     <script src="scripts/jquery-ui-custom.js"></script>
-    <script src="scripts/underscore.js"></script>
     <script src="scripts/popup.js"></script>
   </body>
 </html>

src/scripts/background.js

@@ -0,0 +1,6 @@
+chrome.extension.onRequest.addListener(function(request, sender, callback) {
+    if (request.title != undefined)
+        player.add(request.id, request.title);
+    else if (player.contains(request.id))
+        callback();
+});

src/scripts/popup.js

@@ -7,17 +7,19 @@
         volume:     $('#volume-range'),
         time:       $('#time'),
         toggle:     $('#toggle'),
-        playlist:   $('#playlist'),
-        template:   $('#playlist-tmpl')
+        playlist:   $('#playlist')
     };
 
     displayPlaylist();
     startListenEvent();
     startUpdate();
 
     function displayPlaylist () {
-        var template = _.template(components.template.html());
-        components.playlist.html(template({ playlist: player.playlist }));
+        var playlist = player.playlist;
+        for (var index = 0; index < playlist.length; index++) {
+            appendPlaylistItem(index + 1, playlist[index].title);
+        }
+
         components.playlist.sortable({
             stop: function(event, ui) {
                 var from = $(ui.item).attr('index') - 1;
@@ -35,6 +37,20 @@
         });
     }
 
+    function appendPlaylistItem(index, title) {
+        var item = $('<li>').attr('index', index);
+
+        var itemTitle = $('<span>').text(title)
+            .addClass('title');
+        item.append(itemTitle);
+
+        var removeButton = $('<img>').attr('src', 'icons/remove.png')
+            .addClass('remove');
+        item.append(removeButton);
+
+        components.playlist.append(item);
+    }
+
     function removePlaylistItem(index) {
         var items = components.playlist.children();
         $(items[index]).remove();

updates.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='dkpajgdindimkhbgiobapbhejcabcfdd'>
-    <updatecheck codebase='https://github.com/downloads/jason2506/MusicTube/MusicTube.crx' version='1.1.2' />
+    <updatecheck codebase='https://github.com/downloads/jason2506/MusicTube/MusicTube.crx' version='1.1.3' />
   </app>
 </gupdate>