Merge pull request angular#35 from Shraymonks/fix-search

Fix search bugs
Shraymonks · Jul 17, 2015 · b5a8402 · b5a8402
2 parents ffc3a87 + 33126a1
commit b5a8402
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/panelSrc/components/SearchBar.js b/panelSrc/components/SearchBar.js
@@ -41,10 +41,6 @@ class SearchBar extends React.Component {
     }
 
     onKeyUp(evt) {
-        if (this.props.root.length <= 0) {
-            return;
-        }
-
         var nodes = this.state.matchednodes;
         var charCode = (typeof evt.which === "number") ? evt.which : evt.keyCode;
         if (charCode === 13) { // enter key
@@ -59,13 +55,16 @@ class SearchBar extends React.Component {
                 curmatch: 0,
                 matchednodes: []
             });
+            Array.from(this.props.root).forEach((element) => {
+                element.innerHTML = element.innerHTML.replace(/(<em>|<\/em>)/igm, "");
+            });
         } else if (nodes.length <= 0) {
             var query = new RegExp("(" + evt.target.value + ")", "gim");
             var matches = 0;
 
             for (var i = 0; i < this.props.root.length; i++) {
                 let el = this.props.root[i];
-                let e = el.innerHTML;
+                let e = el.innerHTML.replace(/(<em>|<\/em>)/igm, "");
 
                 let match = e.match(query);
                 let nm = match ? match.length : 0;
@@ -76,17 +75,17 @@ class SearchBar extends React.Component {
 
                 matches += nm;
 
-                let en = e.replace(/(<em>|<\/em>)/igm, "");
-                let ne = en.replace(query, `<em>$1</em>`);
+                let ne = e.replace(query, `<em>$1</em>`);
                 this.props.root[i].innerHTML = ne;
             };
 
+            nodes[0].scrollIntoView();
+
             this.setState({
+                curmatch: 1,
                 matchcount: matches,
                 matchednodes: nodes
             });
-
-            this.setState({ curmatch: 1 });
         }
     }