merge branch touch

diff --cc htdocs/index.html
Simple merge

diff --cc htdocs/js/mpd.js
index 414d324,0b47d16..07f4c60
--- 1/htdocs/js/mpd.js
--- 2/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@@ -245,26 -255,7 +258,23 @@@ function webSocketConnect() 
                              socket.send('MPD_API_PLAY_TRACK,'+$(this).attr('trackid'));
                              $(this).addClass('active');
                          },
-                         mouseleave: function(){
-                             $(this).children().last().find("a").stop().remove();
-                         }
                      });
 +                    //Helper function to keep table row from collapsing when being sorted
 +                    var fixHelperModified = function(e, tr) {
 +                      var $originals = tr.children();
 +                      var $helper = tr.clone();
 +                      $helper.children().each(function(index)
 +                      {
 +                        $(this).width($originals.eq(index).width())
 +                      });
 +                      return $helper;
 +                    };
 +                    
 +                    //Make queue table sortable
 +                    $("#salamisandwich > tbody").sortable({
 +                      helper: fixHelperModified,
 +                      stop: function(event,ui) {renumber_table('#salamisandwich',ui.item)}
 +                    }).disableSelection();
                      break;
                  case "search":
                      $('#wait').modal('hide');