find and replacing multiple OR and AND

cesine · cesine · commit 3885ebf1c838 · 2017-07-08T15:48:24.000-04:00
diff --git a/app/components/Search/index.jsx b/app/components/Search/index.jsx
@@ -148,7 +148,7 @@ class SearchContainer extends Component {
     let searchWarning = ''
     // help with copy paste
     if (searchIn) {
-      searchIn = searchIn.toLowerCase().replace(/\s*:\s*/, ':').replace(' and ', ' AND ').replace(' or ', ' OR ')
+      searchIn = searchIn.toLowerCase().replace(/\s*:\s*/, ':').replace(/ and /g, ' AND ').replace(/ or /g, ' OR ')
     }
     if (searchIn && searchIn.indexOf(':') === -1) {
       // Default to search in all fields

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class SearchContainer extends Component {`
`148`	`148`	`let searchWarning = ''`
`149`	`149`	`// help with copy paste`
`150`	`150`	`if (searchIn) {`
`151`		`- searchIn = searchIn.toLowerCase().replace(/\s:\s/, ':').replace(' and ', ' AND ').replace(' or ', ' OR ')`
	`151`	`+ searchIn = searchIn.toLowerCase().replace(/\s:\s/, ':').replace(/ and /g, ' AND ').replace(/ or /g, ' OR ')`
`152`	`152`	`}`
`153`	`153`	`if (searchIn && searchIn.indexOf(':') === -1) {`
`154`	`154`	`// Default to search in all fields`