[search addon] Simplify control flow

addon/search/search.js

@@ -63,16 +63,11 @@
   function parseQuery(query) {
     var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
     if (isRE) {
-      try {
-        query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
-      } catch (ex) {
-        // Not a regular expression after all, do a string search
-        return query;
-      }
-      if (query.test("")) query = /x^/;
-    } else if (query == "") {
-      query = /x^/;
+      try { query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); }
+      catch(e) {} // Not a regular expression after all, do a string search
     }
+    if (typeof query == "string" ? query == "" : query.test(""))
+      query = /x^/;
     return query;
   }
   var queryDialog =