Bugfix for tags delete icon rendering after search ajax request returns

3 files changed, 9 insertions, 4 deletions

diff --git a/askbot/skins/common/media/js/live_search.js b/askbot/skins/common/media/js/live_search.js
index b6adba83..892f5585 100644
--- a/askbot/skins/common/media/js/live_search.js
+++ b/askbot/skins/common/media/js/live_search.js
@@ -84,8 +84,8 @@ var liveSearch = function(query_string) {
         for (var i=0; i<tags.length; i++){
             var tag = new Tag();
             tag.setName(tags[i]['name']);
-            tag.setDeletable(true);
-            tag.setLinkable(false);
+            tag.setDeletable(false);
+            tag.setLinkable(true);
             tag.setUrlParams(query_string);
 
             html_list.push(tag.getElement().outerHTML());
@@ -109,8 +109,8 @@ var liveSearch = function(query_string) {
             $.each(tags, function(idx, tag_name){
                 var tag = new Tag();
                 tag.setName(tag_name);
-                tag.setDeletable(true);
                 tag.setLinkable(false);
+                tag.setDeletable(true);
                 tag.setDeleteHandler(
                     function(){
                         remove_search_tag(tag_name, query_string);
diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js
index 8708df54..9f1510ca 100644
--- a/askbot/skins/common/media/js/utils.js
+++ b/askbot/skins/common/media/js/utils.js
@@ -475,7 +475,9 @@ Tag.prototype.createDom = function(){
         if (this._delete_icon_title !== null){
             this._delete_icon.setTitle(this._delete_icon_title);
         }
-        this._element.append(this._delete_icon.getElement());
+        var del_icon_elem = this._delete_icon.getElement();
+        del_icon_elem.text('x'); // HACK by Tomasz
+        this._element.append(del_icon_elem);
     }
 };
 
diff --git a/askbot/skins/default/templates/widgets/ask_button.html b/askbot/skins/default/templates/widgets/ask_button.html
index c6cba37d..0eb9243e 100644
--- a/askbot/skins/default/templates/widgets/ask_button.html
+++ b/askbot/skins/default/templates/widgets/ask_button.html
@@ -1,3 +1,6 @@
 {% if active_tab != "ask" %}
+    {% if not search_state %}  {#  get empty SearchState() if there's none #}
+        {% set search_state=search_state|get_empty_search_state %}
+    {% endif %}
     <a id="askButton" href="{{ search_state.full_ask_url() }}">{% trans %}ask a question{% endtrans %}</a>
 {% endif %}