diff --git a/vipra-ui/html/index.html b/vipra-ui/html/index.html index 6d4c4c0f97d41be2318f1ff9482b93b3da106a2a..336e7d2f348a602b8c83c30c000aec72297eac34 100644 --- a/vipra-ui/html/index.html +++ b/vipra-ui/html/index.html @@ -1,12 +1,12 @@ <div class="container"> - <div class="row" slide-on="search"> + <div class="row" ng-hide="search"> <div class="col-md-12"> <div class="heading"></div> </div> </div> - <div class="row" slide-on="search"> + <div class="row" ng-hide="search"> <div class="col-md-6 text-center"> <h4>Latest articles</h4> <ul class="list-unstyled"> diff --git a/vipra-ui/js/controllers.js b/vipra-ui/js/controllers.js index 7a5b23e5704bd782bcdf6f252d550586a42c0777..fe19b5f01344aa6aba4bba10ac6baa50582a5655 100644 --- a/vipra-ui/js/controllers.js +++ b/vipra-ui/js/controllers.js @@ -13,6 +13,8 @@ app.controller('IndexController', ['$scope', '$location', 'ArticleFactory', 'TopicFactory', 'WordFactory', 'SearchFactory', function($scope, $location, ArticleFactory, TopicFactory, WordFactory, SearchFactory) { + $scope.search = $location.search().query; + ArticleFactory.query({limit:latestItemsCount, sort:'-created'}, function(response) { $scope.latestArticles = response.data; }); @@ -27,6 +29,7 @@ $scope.$watch('search', function() { if($scope.search) { + $location.search('query', $scope.search); $scope.searching = true; SearchFactory.query({limit:searchItemsCount, query:$scope.search}, function(response) { $scope.searching = false; @@ -34,6 +37,7 @@ $scope.queryTime = response.$queryTime; }); } else { + $location.search('query', null); $scope.searchResults = []; } }); diff --git a/vipra-ui/js/directives.js b/vipra-ui/js/directives.js index 9b8dda0a49c1b243818c811695f34c81eb201db9..a5681be6b7a90c2135129d2b1d5feec91e8b17d0 100644 --- a/vipra-ui/js/directives.js +++ b/vipra-ui/js/directives.js @@ -40,23 +40,4 @@ }; }); - app.directive('slideOn', function() { - return { - scope: { - slideOn: '=' - }, - link: function($scope, $elem) { - $scope.$watch('slideOn', function(newVal, oldVal) { - if(newVal != oldVal) { - if(newVal) { - $elem.slideUp(slideDuration); - } else { - $elem.slideDown(slideDuration); - } - } - }); - } - }; - }); - })(); \ No newline at end of file