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

notifications fix

Browse source
This commit is contained in:
Trevor Squillario 2014-12-08 20:48:12 -05:00
parent 08f09f8067
commit f8ef2ba227
7 changed files with 51 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
angular.module('JamStash')
.controller('AppCtrl', ['$scope', '$rootScope', '$document', '$window', '$location', '$cookieStore', 'utils', 'globals', 'model', 'notifications', 'player',
function($scope, $rootScope, $document, $window, $location, $cookieStore, utils, globals, model, notifications, player) {
.controller('AppCtrl', ['$scope', '$rootScope', '$document', '$window', '$location', '$cookieStore', '$http', 'utils', 'globals', 'model', 'notifications', 'player',
function($scope, $rootScope, $document, $window, $location, $cookieStore, $http, utils, globals, model, notifications, player) {
'use strict';
$rootScope.settings = globals.settings;
@ -162,7 +162,7 @@
}
}
};
$rootScope.showIndex = false;
$scope.dragStart = function (e, ui) {
ui.item.data('start', ui.item.index());
};
@ -173,6 +173,10 @@
$rootScope.queue.splice(start, 1)[0]);
$scope.$apply();
};
$(document).on( 'click', 'message', function() {
$(this).fadeOut(function () { $(this).remove(); });
return false;
})
$document.keydown(function (e) {
$scope.scrollToIndex(e);
});
@ -328,6 +332,14 @@
});
};
$scope.ping = function () {
return $http({
method: 'GET',
timeout: globals.settings.Timeout,
url: globals.BaseURL() + '/ping.view?' + globals.BaseParams(),
}).error(function (data) {
notifications.updateMessage('Unable to connect to Subsonic server');
});
/*
$.ajax({
url: globals.BaseURL() + '/ping.view?' + globals.BaseParams(),
method: 'GET',
@ -346,6 +358,7 @@
notifications.updateMessage('Unable to connect to Subsonic server');
}
});
*/
};
$scope.queueRemoveSelected = function (data, event) {
angular.forEach($scope.selectedSongs, function (item, key) {