From 675bcadda07cfa93598c81dfd7da31927ddfc834 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Fri, 2 Oct 2015 14:39:17 +0800 Subject: [PATCH] deal with https://github.com/twitter/typeahead.js/issues/1195 --- app/assets/javascripts/src/Metamaps.GlobalUI.js | 4 ++-- app/assets/javascripts/src/Metamaps.js | 4 +--- app/assets/stylesheets/application.css | 16 ++++++++-------- app/assets/stylesheets/clean.css | 6 +++--- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js b/app/assets/javascripts/src/Metamaps.GlobalUI.js index 46a34b5c..656c62e5 100644 --- a/app/assets/javascripts/src/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js @@ -616,7 +616,7 @@ Metamaps.GlobalUI.Search = { var self = Metamaps.GlobalUI.Search; function toggleResultSet(set) { - var s = $('.tt-dataset-' + set + ' .tt-suggestions'); + var s = $('.tt-dataset-' + set + ' .tt-dataset'); if (s.css('height') == '0px') { s.css({ 'height': 'auto', @@ -658,4 +658,4 @@ Metamaps.GlobalUI.Search = { showLoader: function () { $('#searchLoading').show(); } -}; \ No newline at end of file +}; diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 5f41472d..cacdd3c3 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -37,7 +37,7 @@ Metamaps.Settings = { background: '#18202E', text: '#DDD' } - } + }, }; Metamaps.Touch = { @@ -1564,8 +1564,6 @@ Metamaps.SynapseCard = { ////////////////////// END TOPIC AND SYNAPSE CARDS ////////////////////////////////// - - /* * * VISUALIZE diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 392b2d2c..6ab5085d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1373,10 +1373,10 @@ h3.realtimeBoxTitle { /* topic and synapse autocomplete */ -#new_topic .tt-suggestion.tt-is-under-cursor, -#new_topic .tt-suggestion.tt-is-under-mouse-cursor, -#new_synapse .tt-suggestion.tt-is-under-cursor, -#new_synapse .tt-suggestion.tt-is-under-mouse-cursor { +#new_topic .tt-suggestion:hover, +#new_topic .tt-suggestion.tt-cursor, +#new_synapse .tt-suggestion:hover, +#new_synapse .tt-suggestion.tt-cursor { background: #E0E0E0; } #new_topic .tt-suggestion, @@ -1421,12 +1421,12 @@ h3.realtimeBoxTitle { background-image: url(arrowright_sprite.png); background-position: 0 -32px; } -#new_topic .tt-suggestion.tt-is-under-cursor .expandTopicMetadata, -#new_topic .tt-suggestion.tt-is-under-mouse-cursor .expandTopicMetadata { +#new_topic .tt-suggestion:hover .expandTopicMetadata, +#new_topic .tt-suggestion.tt-cursor .expandTopicMetadata { display: block; } -#new_topic .tt-suggestion.tt-is-under-cursor .topicMetadata, -#new_topic .tt-suggestion.tt-is-under-mouse-cursor .topicMetadata { +#new_topic .tt-suggestion:hover .topicMetadata, +#new_topic .tt-suggestion.tt-cursor .topicMetadata { display: block; } #new_topic .topicMetadata { diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 4ecd3120..d2cc6c7d 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -301,7 +301,7 @@ .sidebarSearch .tt-dropdown-menu .maximizeResults { background-position: -32px 0; } -.sidebarSearch .tt-suggestions { +.sidebarSearch .tt-dataset { overflow: visible; } .sidebarSearch .tt-suggestion { @@ -310,7 +310,7 @@ padding: 8px 0; } .sidebarSearch .tt-is-under-cursor, -.sidebarSearch .tt-is-under-mouse-cursor { +.sidebarSearch .tt-suggestion:hover { background: #E0E0E0; } @@ -1227,4 +1227,4 @@ box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24); body a#barometer_tab:hover { background-position: 0 -110px; -} \ No newline at end of file +}