diff --git a/app/common/directives.js b/app/common/directives.js index 5e10b3f..9184060 100644 --- a/app/common/directives.js +++ b/app/common/directives.js @@ -31,12 +31,6 @@ angular.module('JamStash').directive('sortable', function () { $.fancybox.open(el); compiled($scope); }; - $scope.fancyboxOpenUrl = function () { - var el = angular.element(element.html()), - compiled = $compile(el); - $.fancybox.open(el); - compiled($scope); - }; } }; }]) diff --git a/app/common/json_changelog.json b/app/common/json_changelog.json index fcc31da..15cc402 100644 --- a/app/common/json_changelog.json +++ b/app/common/json_changelog.json @@ -1,4 +1,10 @@ [ + { + "date": "11/21/2014", "version": "4.2.3", + "changes": [ + { "text": "- Album Art will change with song if Preview is already open."} + ] + }, { "date": "11/17/2014", "version": "4.2.1", "changes": [ diff --git a/app/common/main-controller.js b/app/common/main-controller.js index 1b8fa2c..4acf0fc 100644 --- a/app/common/main-controller.js +++ b/app/common/main-controller.js @@ -108,10 +108,10 @@ } }; $rootScope.showQueue = function () { - $.fancybox.open(); + // TO DO: Fix me }; $rootScope.hideQueue = function () { - $.fancybox.close(); + // TO DO: Fix me }; $scope.toggleQueue = function () { var submenu = $('#QueuePreview'); @@ -121,84 +121,10 @@ $rootScope.hideQueue(); } }; - /* - $(document).on("click", "a[name=coverartfancy]", function () { - $.fancybox({ - beforeShow: function () { - //this.title = $('#songdetails_artist').html(); - }, - afterLoad: function () { - //this.inner.prepend( '

1. My custom title

' ); - //this.content = '

2. My custom title

'; - }, - hideOnContentClick: true, - type: 'image', - openEffect: 'none', - closeEffect: 'none' - }); - }); - */ - $("a.coverartfancy").fancybox({ - beforeShow: function () { - //this.title = $('#songdetails_artist').html(); - }, - afterLoad: function () { - //this.inner.prepend( '

1. My custom title

' ); - //this.content = '

2. My custom title

'; - }, - hideOnContentClick: true, - type: 'image', - openEffect: 'none', - closeEffect: 'none' - }); - $('.showQueue').fancybox({ - href: '#queue', - autoWidth: false, - width: '100%', - //margin: [50, 10, 50, 10], // top, right, bottom, left - openEffect: 'none', - closeEffect: 'none', - beforeLoad: function () { - if ($rootScope.queue == 0) { - this.close(); - } - }, - helpers: { - title: null - } - }); - /* - $('.showSongs').fancybox({ - href: '#songs', - autoWidth: false, - width: '100%', - //margin: [50, 10, 50, 10], // top, right, bottom, left - openEffect: 'none', - closeEffect: 'none', - beforeLoad: function () { - if ($rootScope.queue == 0) { - //this.close(); - } - }, - helpers: { - title: null - } - }); - $rootScope.showSongs = function () { - alert($("#songs").html()) - $.fancybox({ - type: 'inline', - content: $("#songs").html(), - autoWidth: false, - width: '100%', - transitionIn: 'elastic', - transitionOut: 'elastic', - helpers: { - title: null - } - }); - } - */ + + $scope.fancyboxOpenImage = function (url) { + utils.fancyboxOpenImage(url); + }; $('#audiocontainer .scrubber').mouseover(function (e) { $('.audiojs .scrubber').stop().animate({ height: '8px' }); diff --git a/app/common/player-service.js b/app/common/player-service.js index 48c361d..6a85535 100644 --- a/app/common/player-service.js +++ b/app/common/player-service.js @@ -184,6 +184,11 @@ }); data.playing = true; data.selected = false; + + if ($rootScope.playingSong != null && data.id != $rootScope.playingSong.id && $.fancybox.isOpen) { + utils.fancyboxOpenImage(data.coverartfull); + } + $rootScope.playingSong = data; var id = data.id; diff --git a/app/common/utils-service.js b/app/common/utils-service.js index c0a4bbc..d4753f9 100644 --- a/app/common/utils-service.js +++ b/app/common/utils-service.js @@ -8,6 +8,22 @@ angular.module('jamstash.utils', ['jamstash.settings']) .service('utils', ['$rootScope', 'globals', function ($rootScope, globals) { 'use strict'; + this.fancyboxOpenImage = function (url) { + $.fancybox.open({ + helpers : { + overlay : { + css : { + 'background' : 'rgba(0, 0, 0, 0.15)' + } + } + }, + hideOnContentClick: true, + type: 'image', + openEffect: 'none', + closeEffect: 'none', + href: url + }); + }; this.safeApply = function (fn) { var phase = $rootScope.$root.$$phase; if (phase === '$apply' || phase === '$digest') { diff --git a/app/index.html b/app/index.html index 0f4a0da..df05860 100755 --- a/app/index.html +++ b/app/index.html @@ -83,7 +83,7 @@
-
+