From dfcfa1a5693e93b53ae8a698212b788bbdfd314b Mon Sep 17 00:00:00 2001 From: jmoenig Date: Mon, 14 Oct 2019 12:57:31 +0200 Subject: [PATCH] fixed #2485 --- HISTORY.md | 2 ++ snap.html | 2 +- src/objects.js | 28 ++++++++++++++++------------ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index a58e574f..fe079c50 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,7 @@ * accept a list of pixels in the SWITCH TO COSTUME block * **Notable Changes:** * **Notable Fixes:** + * typing strings into the search-field again shows relevant blocks (regression from IME) * morphic collision detection off-by-1 fix, thanks, Dariusz! * fixed a typo in the OF-reporter's help screen, thanks, @jasonappah * enable costumes created in the vector editor to be stretchable in Firefox, thanks, @coproc @@ -17,6 +18,7 @@ ### 2019-10-14 * morphic: new "reactToInput" text-editing event +* objects: fixed #2485 (find blocks and text-entry mode feature) ### 2019-10-11 * objects, threads: accept a list of pixels in the SWITCH TO COSTUME block diff --git a/snap.html b/snap.html index 7d3c8f12..942eec80 100755 --- a/snap.html +++ b/snap.html @@ -8,7 +8,7 @@ - + diff --git a/src/objects.js b/src/objects.js index ab406c43..f4a6591a 100644 --- a/src/objects.js +++ b/src/objects.js @@ -84,7 +84,7 @@ BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, BooleanSlotMorph, localize, TableMorph, TableFrameMorph, normalizeCanvas, VectorPaintEditorMorph, HandleMorph, AlignmentMorph, Process, XML_Element, WorldMap*/ -modules.objects = '2019-October-11'; +modules.objects = '2019-October-14'; var SpriteMorph; var StageMorph; @@ -3176,7 +3176,7 @@ SpriteMorph.prototype.searchBlocks = function ( }; searchPane.reactToKeystroke = function (evt) { - var search, idx, code = evt ? evt.keyCode : 0; + var idx, code = evt ? evt.keyCode : 0; switch (code) { case 38: // up arrow if (!scriptFocus || !selection) {return; } @@ -3197,16 +3197,20 @@ SpriteMorph.prototype.searchBlocks = function ( showSelection(); return; default: - search = searchBar.getValue(); - if (search !== oldSearch) { - oldSearch = search; - show(myself.blocksMatching( - search, - search.length < 2, - types, - varNames - )); - } + nop(); + } + }; + + searchPane.reactToInput = function (evt) { + var search = searchBar.getValue(); + if (search !== oldSearch) { + oldSearch = search; + show(myself.blocksMatching( + search, + search.length < 2, + types, + varNames + )); } };