From 5d033dfa41bc9362b530730f9358ddcefd35c3cf Mon Sep 17 00:00:00 2001 From: Vit Brunner Date: Tue, 16 Dec 2014 12:05:17 +0100 Subject: [PATCH] Don't scrollspy when loading --- source/scripts/controllers.js.coffee | 5 +++-- source/scripts/services/poems.js.coffee | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/scripts/controllers.js.coffee b/source/scripts/controllers.js.coffee index 7435aa6..d589836 100644 --- a/source/scripts/controllers.js.coffee +++ b/source/scripts/controllers.js.coffee @@ -15,8 +15,9 @@ angular.module("sideBySide.controllers", []) , 1 $rootScope.$on 'duScrollspy:becameActive', ($event, $element) -> - $location.hash($element.prop('id')).replace() - $rootScope.$apply() + if (not $scope.meta[0].Loading) + $location.hash($element.prop('id')).replace() + $rootScope.$apply() $scope.$watchCollection () -> poems.getActive() diff --git a/source/scripts/services/poems.js.coffee b/source/scripts/services/poems.js.coffee index a67a031..78fe891 100644 --- a/source/scripts/services/poems.js.coffee +++ b/source/scripts/services/poems.js.coffee @@ -2,6 +2,7 @@ angular.module("sideBySide").service "poems", ['fetch', (fetch) -> @all = [{ meta: { Active: true + Loading: true } content: [{ section: 'Loading...'