From dcf7f9d92e6e523720d3aae0d6d8c58d40b673c8 Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Thu, 4 Feb 2016 14:50:08 +0100
Subject: [PATCH] updated ui, search adds query param for refresh
---
vipra-ui/html/index.html | 4 ++--
vipra-ui/js/controllers.js | 4 ++++
vipra-ui/js/directives.js | 19 -------------------
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/vipra-ui/html/index.html b/vipra-ui/html/index.html
index 6d4c4c0f..336e7d2f 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 7a5b23e5..fe19b5f0 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 9b8dda0a..a5681be6 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
--
GitLab