1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rdoc/*: Update rdoc master(cfffed5)

Browse Source 
https://github.com/rdoc/rdoc/pull/337
  https://github.com/rdoc/rdoc/pull/367

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2015-08-28 07:05:17 +00:00
parent 5dfc455b72
commit 94c5f5a77c
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Aug 28 16:05:09 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/rdoc/*: Update rdoc master(cfffed5)
https://github.com/rdoc/rdoc/pull/337
https://github.com/rdoc/rdoc/pull/367
Fri Aug 28 10:16:20 2015 Koichi Sasada <ko1@atdot.net> Fri Aug 28 10:16:20 2015 Koichi Sasada <ko1@atdot.net>
* vm.c (hook_before_rewind): prevent kicking :return event while * vm.c (hook_before_rewind): prevent kicking :return event while

4
lib/rdoc/generator/template/json_index/js/searcher.js
View File

@ -52,13 +52,13 @@ Searcher.prototype = new function() {
/* ----- Utilities ------ */ /* ----- Utilities ------ */
function splitQuery(query) { function splitQuery(query) {
return jQuery.grep(query.split(/(\s+|::?|\(\)?)/), function(string) { return jQuery.grep(query.split(/(\s+|::?|\(\)?)/), function(string) {
return string.match(/\S/) return string.match(/\S/);
}); });
} }
function buildRegexps(queries) { function buildRegexps(queries) {
return jQuery.map(queries, function(query) { return jQuery.map(queries, function(query) {
return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i') return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i');
}); });
} }

6
lib/rdoc/rdoc.rb
View File

@ -353,7 +353,11 @@ option)
return unless content return unless content
filename_path = Pathname(filename).expand_path filename_path = Pathname(filename).expand_path
relative_path = filename_path.relative_path_from @options.root begin
relative_path = filename_path.relative_path_from @options.root
rescue ArgumentError
relative_path = filename_path
end
if @options.page_dir and if @options.page_dir and
relative_path.to_s.start_with? @options.page_dir.to_s then relative_path.to_s.start_with? @options.page_dir.to_s then