From 3b5ab8ff30dcdf436305d13c5de6a85a21b1660f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ba=CC=81lint=20Szekeres?= Date: Tue, 19 Nov 2019 20:42:37 +0100 Subject: [PATCH] handle updating hash --- resources/js/app.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/js/app.js b/resources/js/app.js index 6082732..1d86b4d 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -265,6 +265,8 @@ return; } + $scope.updatingHash = true; + var changedData = {}; for (var key in $scope.data) { if (!angular.equals($scope.data[key], $scope.defaultData[key])) { @@ -295,6 +297,10 @@ $scope.isDirty = false; $location.search({}); } + + $timeout(function() { + $scope.updatingHash = false; + }); } function initMasonry() { @@ -362,6 +368,7 @@ $scope.defaultData = DEFAULTS; $scope.dataInit = false; + $scope.updatingHash = false; $scope.data = angular.copy($scope.defaultData); $scope.isDirty = false; $scope.masonryInit = false; @@ -1336,6 +1343,12 @@ } }, true); + $scope.$on('$locationChangeSuccess', function(){ + if (!$scope.updatingHash) { + setDataFromHash(); + } + }); + //////////