voloko-sdoc 0.1.4 → 0.1.5

data/lib/sdoc/generator/template/shtml/resources/js/searchdoc.js

@@ -37,21 +37,21 @@ Searchdoc.Navigation = new function() {
         if (!this.navigationActive) return;
         switch(e.keyCode) {
             case 37: //Event.KEY_LEFT:
-                this.moveLeft();
-                e.preventDefault();
+                if (this.moveLeft())
+                    e.preventDefault();
                 break;
             case 38: //Event.KEY_UP:
-                this.moveUp();
-                e.preventDefault();
+                if (this.moveUp())
+                    e.preventDefault();
                 this.startMoveTimeout(false);
                 break;
             case 39: //Event.KEY_RIGHT:
-                this.moveRight();
-                e.preventDefault();
+                if (this.moveRight())
+                    e.preventDefault();
                 break;
             case 40: //Event.KEY_DOWN:
-                this.moveDown();
-                e.preventDefault();
+                if (this.moveDown())
+                    e.preventDefault();
                 this.startMoveTimeout(true);
                 break;
             case 9: //Event.KEY_TAB:
@@ -89,11 +89,11 @@ Searchdoc.Navigation = new function() {
     }
 
     this.moveUp = function() {
-        this.move(false);
+        return this.move(false);
     }
 
     this.moveDown = function() {
-        this.move(true);
+        return this.move(true);
     }    
 }
 
@@ -205,9 +205,8 @@ Searchdoc.Searcher.prototype = new function() {
     }
     
     function matchPassRegexp(index, longIndex, queries, regexps) {
-        if (!index.match(regexps[0])) return false;
-        for (var i=1, l = regexps.length; i < l; i++) {
-            if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
+        for (var i=0, l = regexps.length; i < l; i++) {
+            if (!index.match(regexps[i]) && (i == 0 || !longIndex.indexOf(regexps[i]))) return false;
         };
         return true;
     }
@@ -268,7 +267,7 @@ Searchdoc.Searcher.prototype = new function() {
                 matchFunc = matchPass1;
                 hltFunc = highlightQuery;
             } else if (state.pass == 1) {
-                matchFunc = matchPass2;
+                matchFunc = matchPass1;
                 hltFunc = highlightQuery;
             } else if (state.pass == 2) {
                 matchFunc = matchPassRegexp;
@@ -395,6 +394,7 @@ Searchdoc.Panel.prototype = $.extend({}, Searchdoc.Navigation, new function() {
             scrollIntoView($next[0], this.$view[0]);
             this.$current = $next;
         }
+        return true;
     }
 
     function renderItem(result) {

data/lib/sdoc/merge.rb

@@ -51,7 +51,7 @@ class SDoc::Merge
         name,
         '',
         '',
-        subtree
+        append_path(subtree, name)
       ]
       tree << item
     end
@@ -63,6 +63,14 @@ class SDoc::Merge
     end
   end
   
+  def append_path subtree, path
+    subtree.map do |item|
+      item[1] = path + '/' + item[1] unless item[1].empty?
+      item[3] = append_path item[3], path
+      item
+    end
+  end
+  
   def merge_search_index
     items = []
     @directories.each_with_index do |dir, i|
@@ -86,7 +94,10 @@ class SDoc::Merge
     items.sort! do |a, b|
       a[:info][5] == b[:info][5] ?        # type (class/method/file)
         (a[:info][0] == b[:info][0] ?     # or name
-          a[:info][1] <=> b[:info][1] :    # or namespace
+          (a[:info][6] == b[:info][6] ?   # or doc part
+            a[:info][1] <=> b[:info][1] :  # or namespace
+            a[:info][6] <=> b[:info][6]
+          ) :
           a[:info][0] <=> b[:info][0]
         ) : 
         a[:info][5] <=> b[:info][5]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: voloko-sdoc
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Vladimir Kolesnikov