diff --git a/client/app/app.js b/client/app/app.js index a00a06f..c86dbec 100755 --- a/client/app/app.js +++ b/client/app/app.js @@ -54,7 +54,7 @@ angular.module('dssWebApp', [ 'https://dsscdn.blob.core.windows.net/mixes/**' ]); $locationProvider.html5Mode(true); - }).run(function ($http, $rootScope, $state, $anchorScroll, $window, LoginService, Session, SocketService) { + }).run(function ($http, $rootScope, $state, $window, LoginService, Session, SocketService) { $rootScope.isPlaying = false; $rootScope.setCurrentUser = function (user) { @@ -115,24 +115,4 @@ angular.module('dssWebApp', [ event.preventDefault(); } }); - $rootScope.$on('$viewContentLoaded', function (evt, absNewUrl, absOldUrl) { - $anchorScroll(); - //$window.scrollTop(0, 0); - }); - $rootScope.$on('$locationChangeSuccess', function (evt, absNewUrl, absOldUrl) { - $anchorScroll(); - }); - /* - $rootScope.$on('$stateChangeError', function (event, toState, toParams, fromState, fromParams, error) { - console.log('$stateChangeError - fired when an error occurs during transition.'); - console.log(arguments); - }); - $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) { - console.log('$stateChangeSuccess to ' + toState.name + '- fired once the state transition is complete.'); - }); - $rootScope.$on('$stateNotFound', function (event, unfoundState, fromState, fromParams) { - console.log('$stateNotFound ' + unfoundState.to + ' - fired when a state cannot be found by its name.'); - console.log(unfoundState, fromState, fromParams); - }); - */ }); diff --git a/client/app/views/mixes/mixes.controller.js b/client/app/views/mixes/mixes.controller.js index 6aab7c8..2a5e96b 100755 --- a/client/app/views/mixes/mixes.controller.js +++ b/client/app/views/mixes/mixes.controller.js @@ -7,13 +7,12 @@ angular.module('dssWebApp') $scope.page = 1; $scope.nextPage = function (e) { $scope.page++; - /* MixModel.findAll({ page: $scope.page, waveform_generated: "True", is_featured: "True", limit: 3 - });*/ + }); }; - //MixModel.bindAll(null, $scope, 'mixes'); + MixModel.bindAll(null, $scope, 'mixes'); });