Fixed highlight regex. Optimization on the directory search class.

m1r0 · Mar 21, 2014 · 29bfb01 · 29bfb01
1 parent 22c0d7d
commit 29bfb01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/theme/js/typeahead.bundle.js b/theme/js/typeahead.bundle.js
@@ -865,7 +865,7 @@
             if (!o.node || !o.pattern) {
                 return;
             }
-            o.pattern = _.isArray(o.pattern) ? o.pattern : o.pattern.replace(/^\s+|\s+$/, '').split(' ');
+            o.pattern = _.isArray(o.pattern) ? o.pattern : o.pattern.replace(/(^\s+|\s+$|(\s)\s+)/g, '$2').split(' ');
             regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly);
             traverse(o.node, hightlightTextNode);
             function hightlightTextNode(textNode) {

diff --git a/theme/lib/directory_search.php b/theme/lib/directory_search.php
@@ -24,9 +24,10 @@ function get_directories($path, $depth) {
 
 		foreach ($di as $fileinfo) {
 			if ($fileinfo->isDir() && !$fileinfo->isDot() && strpos($fileinfo->getFilename(), '.') === false) {
-
 				$relative_path = preg_replace('~^' . preg_quote($this->root) . '[\/\\\]?~', '', $fileinfo->getPathName());
 
+				$relative_path = str_replace($this->root . DIRECTORY_SEPARATOR, '', $fileinfo->getPathName());
+
 				$dirs[] = str_replace('\\', '/', $relative_path) . '/';
 
 				if ($depth) {