From f5c1640dbd1f16b2c8a874c6cb90f467c9c70609 Mon Sep 17 00:00:00 2001 From: mattpass Date: Fri, 9 Apr 2021 16:48:26 +0100 Subject: [PATCH] Move check after establishing results DOM elem --- assets/js/icecoder.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/icecoder.js b/assets/js/icecoder.js index 21e6fe5..5484472 100644 --- a/assets/js/icecoder.js +++ b/assets/js/icecoder.js @@ -2831,6 +2831,11 @@ var ICEcoder = { findReplace: function(find, selectNext, canActionChanges, findPrevious) { let replace, results, thisCM, thisSelection, rBlocks, rExpMatch0String, replaceQS, targetQS, filesQS; + // Determine our find rExp, replace value and results display + const rExp = new RegExp(true === parent.ICEcoder.findRegex ? find : ICEcoder.escapeRegex(find), "gi"); + replace = get('replace').value; + results = get('results'); + // Return early if we're finding with regex and only have ^ or $ or .*, avoids CPU crash if (true === parent.ICEcoder.findRegex && "" === find.replace(/\^|\$|\.\*/g, "")) { results.innerHTML = "No results"; @@ -2840,11 +2845,6 @@ var ICEcoder = { return false; } - // Determine our find rExp, replace value and results display - const rExp = new RegExp(true === parent.ICEcoder.findRegex ? find : ICEcoder.escapeRegex(find), "gi"); - replace = get('replace').value; - results = get('results'); - // Get CM pane thisCM = this.getThisCM();