From 61360f7ff447f3155634840ee7cac7ddb22e0bd6 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Tue, 6 Jan 2015 21:25:20 +0000
Subject: [PATCH] hint javascript

---
 templates/client/accounts/feed.html                | 14 +++++++++-----
 .../static_client/js/_modules/page.events.feed.js  |  8 +++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html
index 32bbaa7a..4674f61c 100644
--- a/templates/client/accounts/feed.html
+++ b/templates/client/accounts/feed.html
@@ -28,7 +28,7 @@
                         <div class="csb-selected-items " >
                             <div class="csb-selected  csb-subj-selected dna-template" id="filter-subject-tags">
                                 <div class="csbs-text ">~~text~~</div>
-                                <a class="csbs-del" href="#"  data-checkbox-id="~~id~~" id="subject-tag-remove">x</a>
+                                <a class="csbs-del" href="javascript:void(0);"  data-checkbox-id="~~id~~" id="subject-tag-remove">x</a>
                             </div>
 
                         </div>
@@ -41,7 +41,7 @@
                         <div class="csb-selected-items" >
                             <div class="csb-selected csb-subj-selected dna-template" id="filter-places-tags">
                                 <div class="csbs-text ">~~text~~</div>
-                                <a class="csbs-del " href="#" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
+                                <a class="csbs-del " href="javascript:void(0);" data-checkbox-id="~~id~~" id="place-tag-remove">x</a>
                             </div>
 
                         </div>
@@ -73,7 +73,7 @@
 
             </form>
         </div>
-        <div class="filter-hint-block">
+        <div class="filter-hint-block" id="filter-hint-block">
             <p><span class="red">*</span>{% trans ' Вы можете настроить ленту событий, один раз выбрав интересные темы и географию с помощью кнопки «Фильтрация ленты».' %}</p>
         </div>
 
@@ -81,7 +81,10 @@
         {% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
 
         {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-        <script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>
+        <!--todo: вернуть минификацию-->
+        <!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>-->
+
+        <script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script>
         <!--<script src="{% static 'client/js/_modules/block.search.js' %}"></script>-->
 
         <script>
@@ -146,7 +149,8 @@
                 filter: {
                     wrapperId:'"events-filter-wrap"',
                     bodyId:'events-filter',
-                    buttonId:'filter-show-button'
+                    buttonId:'filter-show-button',
+                    hintId:'filter-hint-block'
 
                 },
                 modal:{
diff --git a/templates/client/static_client/js/_modules/page.events.feed.js b/templates/client/static_client/js/_modules/page.events.feed.js
index 6bd67809..c62afba8 100644
--- a/templates/client/static_client/js/_modules/page.events.feed.js
+++ b/templates/client/static_client/js/_modules/page.events.feed.js
@@ -638,6 +638,7 @@ if (EXPO.events.feed) {
 				self._refreshLabel();
 				if(getObjectLength(self.itemsSelected)){
 					$(EXPO.events.feed.DOMapplyButton).show();
+					$(EXPO.events.feed.DOMhint).hide();
 				}
 			},
 			/**
@@ -1353,6 +1354,8 @@ if (EXPO.events.feed) {
 				this._refreshLabel();
 				if(getObjectLength(self.itemsSelected)){
 					$(EXPO.events.feed.DOMapplyButton).show();
+					$(EXPO.events.feed.DOMhint).hide();
+
 				}
 
 			},
@@ -1604,6 +1607,7 @@ if (EXPO.events.feed) {
 
 			}
 			this.DOMform = document.getElementById(this.opt.formId);
+			this.DOMhint = document.getElementById(this.opt.filter.hintId);
 			$(this.DOMform).on('submit', function () {
 				submitHandler();
 			});
@@ -1647,7 +1651,8 @@ if (EXPO.events.feed) {
 			};
 			// заполнение полей предыдущими значениями
 			$(function () {
-				if(self.previousSearch){
+				if(self.previousSearch.inputs.length){
+					$(self.DOMhint).hide();
 					for (var i = 0; i < self.previousSearch.inputs.length; i++) {
 						// окно выбора тематики
 						if (self.previousSearch.inputs[i].name == 'th'){
@@ -1681,6 +1686,7 @@ if (EXPO.events.feed) {
 				//Если выбраны фильтры то появляется кнопка "применить"
 				 if(getObjectLength(self.placesModal.itemsSelected) || getObjectLength(self.subjModal.itemsSelected) ){
 					 $(self.DOMapplyButton).show();
+
 				 }
 			});