Merge branch 'master' into dev

channel.js

@@ -1215,7 +1215,6 @@ Channel.prototype.addMedia = function(data, user) {
 }
 
 Channel.prototype.addMediaList = function(data, user) {
-    var pl = data.list;
     var chan = this;
     this.playlist.addMediaList(data, function(err, item) {
         if(err) {
@@ -1226,6 +1225,8 @@ Channel.prototype.addMediaList = function(data, user) {
             return;
         }
         else {
+            item.temp = data.temp;
+            item.queueby = data.queueby;
             chan.sendAll("queue", {
                 item: item.pack(),
                 after: item.prev ? item.prev.uid : "prepend"
@@ -1253,6 +1254,7 @@ Channel.prototype.tryQueuePlaylist = function(user, data) {
     var pl = this.server.db.loadUserPlaylist(user.name, data.name);
     data.list = pl;
     data.queueby = user.name;
+    data.temp = !this.hasPermission(user, "addnontemp");
     this.addMediaList(data, user);
 }
 

playlist.js

@@ -283,29 +283,22 @@ Playlist.prototype.addMediaList = function(data, callback) {
     var pl = this;
     for(var i = 0; i < data.list.length; i++) {
         var x = data.list[i];
-        (function(i, x) {
+        x.pos = data.pos;
-            setTimeout(function() {
+        if(start && x == start) {
-                if(pl.dead)
+            pl.addMedia(x, function (err, item) {
-                    return;
+                if(err) {
-                x.queueby = data.queueby;
+                    callback(err, item);
-                x.pos = data.pos;
-                if(start && x == start) {
-                    pl.addMedia(x, function (err, item) {
-                        if(err) {
-                            callback(err, item);
-                        }
-                        else {
-                            callback(err, item);
-                            pl.current = item;
-                            pl.startPlayback();
-                        }
-                    });
                 }
                 else {
-                    pl.addMedia(x, callback);
+                    callback(err, item);
+                    pl.current = item;
+                    pl.startPlayback();
                 }
-            }, 500 * i);
+            });
-        })(i, x);
+        }
+        else {
+            pl.addMedia(x, callback);
+        }
     }
 }
 

www/channel.html

@@ -106,7 +106,7 @@
                   <div class="well well-small span12 row-fluid">
                   <div class="span12 pointer" id="librarytoggle">
                     <i class="icon-plus pull-left"></i>
-                    <p>Show Library</p>
+                    <p>Show Library/YouTube Search</p>
                   </div>
                   <div id="librarywrap">
                     <div class="span7" id="querywrap">