diff options
author | Seth Tisue <seth@tisue.net> | 2016-03-14 17:31:09 -0400 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-03-14 17:31:09 -0400 |
commit | ed6d4a54df50caa1f79b7bff011bb2fd35d32a07 (patch) | |
tree | a37b1fd5008f591a726ac4a70bc3be1369acde57 | |
parent | 66588a78f22aa3595df9938449268e432f27e3ff (diff) | |
parent | c2781f5a1d81a3362035bde4d0d5d6f320a7bd16 (diff) | |
download | scala-ed6d4a54df50caa1f79b7bff011bb2fd35d32a07.tar.gz scala-ed6d4a54df50caa1f79b7bff011bb2fd35d32a07.tar.bz2 scala-ed6d4a54df50caa1f79b7bff011bb2fd35d32a07.zip |
Merge pull request #5039 from felixmulder/topic/scaladoc-clear-input-behavior
Scaladoc: change behavior of clear-button on input fields
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js | 13 | ||||
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.js | 19 |
2 files changed, 13 insertions, 19 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js index 494ad91cc8..55224eae52 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js +++ b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js @@ -33,14 +33,11 @@ $(document).ready(function() { configureTextFilter(); - $("#index-input").on("focus", function(e) { - $("#textfilter > .input > .clear").show(); - }); - - $("#index-input").on("blur", function() { - setTimeout(function() { + $("#index-input").on("input", function(e) { + if($(this).val().length > 0) + $("#textfilter > .input > .clear").show(); + else $("#textfilter > .input > .clear").hide(); - }, 10); }); }); @@ -229,6 +226,8 @@ function configureTextFilter() { $("div#search-results").hide(); $("#search > span.close-results").hide(); $("#search > span#doc-title").show(); + + $(this).hide(); }); }); diff --git a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.js b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.js index ae39f83852..5f42dfa114 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.js +++ b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/template.js @@ -147,10 +147,10 @@ $(document).ready(function() { }); $("#memberfilter > .clear").click(function() { $("#memberfilter input").attr("value", ""); + $(this).hide(); filter(); }); $(document).keydown(function(event) { - if (event.keyCode == 9) { // tab $("#index-input", window.parent.document).focus(); input.attr("value", ""); @@ -162,8 +162,7 @@ $(document).ready(function() { if ($(this).hasClass("in")) { $(this).removeClass("in"); $(this).addClass("out"); - } - else if ($(this).hasClass("out")) { + } else if ($(this).hasClass("out")) { $(this).removeClass("out"); $(this).addClass("in"); } @@ -174,8 +173,7 @@ $(document).ready(function() { if ($(this).hasClass("in")) { $(this).removeClass("in"); $(this).addClass("out"); - } - else if ($(this).hasClass("out")) { + } else if ($(this).hasClass("out")) { $(this).removeClass("out"); $(this).addClass("in"); } @@ -307,14 +305,11 @@ $(document).ready(function() { exposeMember(jqElem); } - $("#mbrsel-input").on("focus", function() { - $("#memberfilter > .clear").show(); - }); - - $("#mbrsel-input").on("blur", function() { - setTimeout(function() { + $("#mbrsel-input").on("input", function() { + if ($(this).val().length > 0) + $("#memberfilter > .clear").show(); + else $("#memberfilter > .clear").hide(); - }, 10); }); }); |