@@ -54,8 +54,8 @@ function execute() {
54
54
}
55
55
} catch ( e ) {
56
56
console . log ( e ) ;
57
- $ ( '#results' ) . val ( 'Invalid regular expression' ) ;
58
- $ ( '#splitresults' ) . val ( 'Invalid regular expression' ) ;
57
+ $ ( '#results' ) . html ( 'Invalid regular expression' ) ;
58
+ $ ( '#splitresults' ) . html ( 'Invalid regular expression' ) ;
59
59
}
60
60
61
61
updateStateInHost ( ) ;
@@ -96,22 +96,22 @@ function buildResultsTable(results, parent) {
96
96
97
97
function match ( ) {
98
98
const regex = new MultiRegExp2 ( new RegExp ( $ ( '#regex' ) . val ( ) , "g" + getSwitches ( ) ) ) ;
99
- const search = $ ( '#search' ) . val ( ) ;
99
+ const search = $ ( '#search' ) . html ( ) ;
100
+ let results = [ ] ;
100
101
101
102
const execResults = regex . execForAllGroups ( search , true ) ;
102
- if ( execResults == null ) {
103
- return ;
103
+ if ( execResults != null ) {
104
+ const match = execResults . shift ( ) ;
105
+ match . groups = execResults ;
106
+ results . push ( match ) ;
104
107
}
105
108
106
- const match = execResults . shift ( ) ;
107
- match . groups = execResults ;
108
-
109
- buildResultsTable ( [ match ] , $ ( '#results' ) ) ;
109
+ buildResultsTable ( results , $ ( '#results' ) ) ;
110
110
} ;
111
111
112
112
function matchAll ( ) {
113
113
const regex = new MultiRegExp2 ( new RegExp ( $ ( '#regex' ) . val ( ) , "g" + getSwitches ( ) ) ) ;
114
- const search = $ ( '#search' ) . val ( ) ;
114
+ const search = $ ( '#search' ) . html ( ) ;
115
115
116
116
let results = [ ] ;
117
117
let iteration ;
@@ -127,7 +127,7 @@ function matchAll() {
127
127
128
128
function split ( ) {
129
129
const regex = new RegExp ( $ ( '#regex' ) . val ( ) , "g" + getSwitches ( ) ) ;
130
- const search = $ ( '#search' ) . val ( ) ;
130
+ const search = $ ( '#search' ) . html ( ) ;
131
131
132
132
const items = search . split ( regex ) . map ( s => s . replace ( / [ \r \n ] / g, " " ) ) ;
133
133
const results = items . map ( item => `<span class="nl">${ item } </span>` ) . join ( '' ) ;
@@ -138,19 +138,19 @@ function split() {
138
138
function replace ( ) {
139
139
match ( ) ;
140
140
const regex = new RegExp ( $ ( '#regex' ) . val ( ) , getSwitches ( ) ) ;
141
- const search = $ ( '#search' ) . val ( ) ;
142
- const replacement = $ ( '#replacement' ) . val ( ) ;
141
+ const search = $ ( '#search' ) . html ( ) ;
142
+ const replacement = $ ( '#replacement' ) . html ( ) ;
143
143
144
144
$ ( '#replaced' ) . val ( search . replace ( regex , replacement ) ) ;
145
145
} ;
146
146
147
147
function replaceAll ( ) {
148
148
matchAll ( ) ;
149
149
const regex = new RegExp ( $ ( '#regex' ) . val ( ) , "g" + getSwitches ( ) ) ;
150
- const search = $ ( '#search' ) . val ( ) ;
151
- const replacement = $ ( '#replacement' ) . val ( ) ;
150
+ const search = $ ( '#search' ) . html ( ) ;
151
+ const replacement = $ ( '#replacement' ) . html ( ) ;
152
152
153
- $ ( '#replaced' ) . val ( search . replace ( regex , replacement ) ) ;
153
+ $ ( '#replaced' ) . html ( search . replace ( regex , replacement ) ) ;
154
154
} ;
155
155
156
156
function processResults ( r ) {
@@ -206,8 +206,8 @@ function onReplacementChange(_) {
206
206
function updateStateInHost ( ) {
207
207
const state = {
208
208
regex : $ ( '#regex' ) . val ( ) ,
209
- search : $ ( '#search' ) . val ( ) ,
210
- replacement : $ ( '#replacement' ) . val ( ) ,
209
+ search : $ ( '#search' ) . html ( ) ,
210
+ replacement : $ ( '#replacement' ) . html ( ) ,
211
211
mode : $ ( '.mode-btn.selected' ) [ 0 ] . id . replace ( "-btn" , "" ) ,
212
212
switches : {
213
213
i : $ ( '#i-switch.selected' ) . length > 0 ,
@@ -249,8 +249,8 @@ function infoWindow(msg) {
249
249
250
250
function setUiState ( state ) {
251
251
$ ( '#regex' ) . val ( state . regex ) ;
252
- $ ( '#search' ) . val ( state . search ) ;
253
- $ ( '#replacement' ) . val ( state . replacement ) ;
252
+ $ ( '#search' ) . html ( state . search ) ;
253
+ $ ( '#replacement' ) . html ( state . replacement ) ;
254
254
255
255
const buttonId = `#${ state . mode } -btn` ;
256
256
$ ( buttonId ) . click ( ) ;
0 commit comments