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

3.4.2 - jPlayer updated to 2.6.3

Browse source
This commit is contained in:
Trevor Squillario 2014-08-22 14:16:56 -04:00
parent bf96983edf
commit c53ddb0eee
11 changed files with 3152 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/controllers/main.js
View file

@ -42,13 +42,17 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
$.each(utils.getValue('Settings'), function (k, v) {
if (v == 'false') { v = false; }
if (v == 'true') { v = true; }
globals.settings[k] = v;
var exclude = ['Url'];
var idx = exclude.indexOf(k);
if (idx === -1) {
globals.settings[k] = v;
}
});
}
if (utils.getValue("SavedCollections")) { globals.SavedCollections = utils.getValue("SavedCollections").split(","); }
if (utils.getValue("DefaultCollection")) { globals.DefaultCollection = utils.getValue("DefaultCollection"); }
if (utils.getValue("SavedGenres")) { globals.SavedGenres = utils.getValue("SavedGenres").split(","); }
if (globals.settings.Debug) { console.log('Settings: ' + JSON.stringify(globals.settings, null, 2)); }
if (globals.settings.Debug) { console.log('Loaded Settings: ' + JSON.stringify(globals.settings, null, 2)); }
};
$scope.toggleSetting = function (setting) {
var id = setting;