``if (false)''

desuwa · Aug 26, 2012 · 159a0a4 · 159a0a4
1 parent 7180125
commit 159a0a4
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/public/javascripts/fourcat-ui.js b/public/javascripts/fourcat-ui.js
@@ -589,29 +589,24 @@ $.fourcat = function() {
               words = rawPattern.replace(regexOrNorm, '|').split(' ');
               pattern = '';
               wordcount = words.length;
-              if (false) {
-                pattern = new RegExp(wordSepS + inner + wordSepE, 'i');
-              }
-              else {
-                for (w = 0; w < wordcount; ++w) {
-                  if (words[w].indexOf('|') != -1) {
-                    orOp = words[w].split('|');
-                    orCluster = [];
-                    for (v = orOp.length - 1; v >= 0; v--) {
-                      if (orOp[v] != '') {
-                        orCluster.push(orOp[v].replace(regexEscape, '\\$1'));
-                      }
+              for (w = 0; w < wordcount; ++w) {
+                if (words[w].indexOf('|') != -1) {
+                  orOp = words[w].split('|');
+                  orCluster = [];
+                  for (v = orOp.length - 1; v >= 0; v--) {
+                    if (orOp[v] != '') {
+                      orCluster.push(orOp[v].replace(regexEscape, '\\$1'));
                     }
-                    inner = orCluster.join('|').replace(regexWc, replWc);
-                    pattern += wordSepS + '(' + inner + ')' + wordSepE;
-                  }
-                  else {
-                    inner = words[w].replace(regexEscape, '\\$1').replace(regexWc, replWc);
-                    pattern += wordSepS + inner + wordSepE;
                   }
+                  inner = orCluster.join('|').replace(regexWc, replWc);
+                  pattern += wordSepS + '(' + inner + ')' + wordSepE;
+                }
+                else {
+                  inner = words[w].replace(regexEscape, '\\$1').replace(regexWc, replWc);
+                  pattern += wordSepS + inner + wordSepE;
                 }
-                pattern = new RegExp('^' + pattern, 'i');
               }
+              pattern = new RegExp('^' + pattern, 'i');
             }
           }
           //console.log('Resulting regex: ' + pattern);