diff --git a/index.html b/index.html index af5119e..f4ec7a4 100755 --- a/index.html +++ b/index.html @@ -29,7 +29,7 @@ - + diff --git a/js/app.js b/js/app.js index 525cefa..a6a9ea4 100755 --- a/js/app.js +++ b/js/app.js @@ -10,7 +10,7 @@ JamStash.service('globals', function (utils) { Password: "guest"), Server: "http://subsonic.org/demo"), */ - Url: "http://Jamstash.com/beta/#/archive/", + Url: "http://beta.jamstash.com/#/archive/", Username: "", Password: "", Server: "", diff --git a/js/controllers/archive.js b/js/controllers/archive.js index 38ffba7..a9bde1d 100644 --- a/js/controllers/archive.js +++ b/js/controllers/archive.js @@ -51,7 +51,6 @@ function ArchiveCtrl($scope, $rootScope, $location, $routeParams, $http, $timeou } }); }; - $scope.archiveUrl = globals.archiveUrl; /* Filter */ $scope.selectedArchiveAlbumSort = globals.settings.DefaultArchiveAlbumSort; diff --git a/js/controllers/main.js b/js/controllers/main.js index 01028cb..782f547 100644 --- a/js/controllers/main.js +++ b/js/controllers/main.js @@ -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; diff --git a/js/json_changelog.js b/js/json_changelog.js index 76b29a9..c98d617 100644 --- a/js/json_changelog.js +++ b/js/json_changelog.js @@ -1,4 +1,10 @@ [ + { + "date": "7/28/2014", "version": "3.4.2", + "changes": [ + { "text": "- jPlayer updated to 2.6.3 & patched for https://github.com/happyworm/jPlayer/issues/223" } + ] + }, { "date": "5/4/2014", "version": "3.4.1", "changes": [ diff --git a/js/partials/archive.html b/js/partials/archive.html index 124f306..25ce9f4 100644 --- a/js/partials/archive.html +++ b/js/partials/archive.html @@ -62,7 +62,7 @@