yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'brb-at/sidebar' into release-4.2.4

Browse source 
Conflicts:
	app/common/main-controller.js
This commit is contained in:
Trevor Squillario 2014-11-21 19:21:26 -05:00
commit 1259075797
8 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/common/main-controller.js
View file

@ -108,14 +108,15 @@
}
};
$rootScope.showQueue = function () {
// TO DO: Fix me
$('#SideBar').css('display', '');
$('#right-component').removeClass('lgcolumn_expanded');
};
$rootScope.hideQueue = function () {
// TO DO: Fix me
$('#SideBar').css('display', 'none');
$('#right-component').addClass('lgcolumn_expanded');
};
$scope.toggleQueue = function () {
var submenu = $('#QueuePreview');
if (submenu.css('display') == 'none') {
if ($('#SideBar').css('display') == 'none') {
$rootScope.showQueue();
} else {
$rootScope.hideQueue();
@ -457,6 +458,11 @@
/* Launch on Startup */
$scope.loadSettings();
utils.switchTheme(globals.settings.Theme);
if(!globals.settings.ShowQueue) {
$rootScope.hideQueue();
}
if ($scope.loggedIn()) {
//$scope.ping();
if (globals.settings.SaveTrackPosition) {