diff --git a/README.md b/README.md index 16ac160..5395e28 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,11 @@ MiniSub is an HTML5 Web Player for the Subsonic streaming server. Features * HTML5 Audio with Flash fallback (provided by the SoundManager2 library) * Flexible Layout (will scale to whatever size your browser window is) -* Keyboard shortcuts (back, forward, play/pause, skip to artist, volume control) +* Keyboard shortcuts (back, forward, play/pause, skip to artist) * Playlist support (create new, add to existing, delete) * Podcast support (includes description field on hover) * Favorite/Starred support for Albums & Songs +* Shortcuts supported * Chat support (when the chat window is open it will auto-update in the background) * Now Playing support (see what others are streaming at the moment) * Easy installation (Chrome App or manual install) diff --git a/index.html b/index.html index c85d878..3d88a98 100755 --- a/index.html +++ b/index.html @@ -22,7 +22,6 @@ - @@ -45,7 +44,7 @@
  • -
  • +
  • @@ -93,7 +92,7 @@
    - + @@ -296,7 +295,7 @@ - --> -
  • 11/26/2012 - 2.3.2 +
  • 11/27/2012 - 2.3.4 - Basic Breadcrumb navigation implemented
  • 11/1/2012 - 2.3.1 @@ -436,7 +435,7 @@

    Thanks

    diff --git a/js/app.js b/js/app.js index 6d6bf67..d972fa4 100755 --- a/js/app.js +++ b/js/app.js @@ -9,7 +9,7 @@ var password; var passwordenc; var server; var smwidth; -var currentVersion = '2.3.2'; +var currentVersion = '2.3.4'; function getCookie(value) { if ($.cookie(value)) { diff --git a/js/plugins/jquery.mousewheel.min.js b/js/plugins/jquery.mousewheel.min.js deleted file mode 100644 index 3390202..0000000 --- a/js/plugins/jquery.mousewheel.min.js +++ /dev/null @@ -1,12 +0,0 @@ -/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net) - * Licensed under the MIT License (LICENSE.txt). - * - * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. - * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. - * Thanks to: Seamus Leahy for adding deltaX and deltaY - * - * Version: 3.0.6 - * - * Requires: 1.2.2+ - */ -(function(a){function d(b){var c=b||window.event,d=[].slice.call(arguments,1),e=0,f=!0,g=0,h=0;return b=a.event.fix(c),b.type="mousewheel",c.wheelDelta&&(e=c.wheelDelta/120),c.detail&&(e=-c.detail/3),h=e,c.axis!==undefined&&c.axis===c.HORIZONTAL_AXIS&&(h=0,g=-1*e),c.wheelDeltaY!==undefined&&(h=c.wheelDeltaY/120),c.wheelDeltaX!==undefined&&(g=-1*c.wheelDeltaX/120),d.unshift(b,e,g,h),(a.event.dispatch||a.event.handle).apply(this,d)}var b=["DOMMouseScroll","mousewheel"];if(a.event.fixHooks)for(var c=b.length;c;)a.event.fixHooks[b[--c]]=a.event.mouseHooks;a.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=b.length;a;)this.addEventListener(b[--a],d,!1);else this.onmousewheel=d},teardown:function(){if(this.removeEventListener)for(var a=b.length;a;)this.removeEventListener(b[--a],d,!1);else this.onmousewheel=null}},a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery) diff --git a/js/ui-ready.js b/js/ui-ready.js index 339e81a..70e1402 100755 --- a/js/ui-ready.js +++ b/js/ui-ready.js @@ -144,7 +144,7 @@ playPauseSong(); return false; } else if (unicode == 36 && $('#tabLibrary').is(':visible')) { - $('#Artists').stop().scrollTo('#auto', 400); + $('#Artists').stop().scrollTo('#MusicFolders', 400); } } }); @@ -177,6 +177,10 @@ $(this).addClass('selected'); getAlbumListBy($(this).attr("id")); }); + $('#BreadHome').live('click', function () { + $('#Artists').stop().scrollTo('#MusicFolders', 400); + return false; + }); $('#BreadCrumbs a').live('click', function () { var artistid = $(this).attr('artistid'); var albumid = $(this).attr('albumid'); @@ -528,30 +532,6 @@ loadTabContent('#tabQueue'); } }); - $('#songdetails').bind('mousewheel', function (event, delta, deltaX, deltaY) { - var dir = delta > 0 ? 'Up' : 'Down'; - var vel = Math.abs(delta); - var v = getCookie('Volume') ? parseFloat(getCookie('Volume')) : 1; - if (deltaY > 0) { - var newVolume = v + .2; - if (newVolume <= 1) { - $("#playdesk").jPlayer({ - volume: newVolume - }); - setCookie('Volume', newVolume); - } - } else { - var newVolume = v - .2; - if (newVolume > 0) { - $("#playdesk").jPlayer({ - volume: newVolume - }); - setCookie('Volume', newVolume); - } - } - if (debug) { console.log(dir + ' velocity: ' + vel + ' x: ' + deltaX + ' y: ' + deltaY); } - return false; - }); $('#songdetails').mouseover(function () { $(this).addClass('hover'); @@ -965,6 +945,8 @@ $('#ScrollTitle').live('click', function () { if ($('#ScrollTitle').is(':checked')) { setCookie('ScrollTitle', '1'); + } else { + setCookie('ScrollTitle', null); } }); $('#Debug').live('click', function () { diff --git a/manifest.json b/manifest.json index 0a54284..ae27460 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "MiniSub", "description": "MiniSub - HTML5 Mini Player for Subsonic", - "version": "2.3.2", + "version": "2.3.4", "app": { "launch": { "local_path": "index.html" diff --git a/style/Style.css b/style/Style.css index 8930b84..3606312 100755 --- a/style/Style.css +++ b/style/Style.css @@ -397,16 +397,21 @@ ul.mainlist li.item a.add:hover padding: 2px 0px 2px 0; float: left; } -#BreadCrumb a +#BreadCrumbs a { margin: 0 2px 0 6px; text-decoration: none; color: #829FC0; } -#BreadCrumb a:hover +#BreadCrumbs a:hover { text-decoration: underline; } +#BreadHome a +{ + padding: 0; + margin: 0; +} #AlbumContainer {