Skip to content

Commit 18f771a

Browse files
committed
Simplify rel_prefix locasls declaration
1 parent 737c611 commit 18f771a

File tree

1 file changed

+9
-24
lines changed

1 file changed

+9
-24
lines changed

lib/rdoc/generator/darkfish.rb

+9-24
Original file line numberDiff line numberDiff line change
@@ -288,14 +288,13 @@ def generate_index
288288

289289
out_file = @base_dir + @options.op_dir + 'index.html'
290290
rel_prefix = @outputdir.relative_path_from out_file.dirname
291-
asset_rel_prefix = rel_prefix + @asset_rel_path
292291

293292
@title = @options.title
294293
@main_page = @files.find { |f| f.full_name == @options.main_page }
295294

296295
render_template template_file, out_file: out_file, locals: {
297296
rel_prefix: rel_prefix,
298-
asset_rel_prefix: asset_rel_prefix,
297+
asset_rel_prefix: rel_prefix + @asset_rel_path,
299298
target: @main_page,
300299
}
301300
rescue => e
@@ -320,8 +319,6 @@ def generate_class klass, template_file = nil
320319
out_file = @outputdir + klass.path
321320
rel_prefix = @outputdir.relative_path_from out_file.dirname
322321

323-
asset_rel_prefix = rel_prefix + @asset_rel_path
324-
325322
breadcrumb = generate_nesting_namespaces_breadcrumb(target, rel_prefix)
326323

327324
@title = "#{klass.type} #{klass.full_name} - #{@options.title}"
@@ -334,7 +331,7 @@ def generate_class klass, template_file = nil
334331

335332
debug_msg " rendering #{out_file}"
336333
render_template template_file, out_file: out_file, locals: {
337-
asset_rel_prefix: asset_rel_prefix,
334+
asset_rel_prefix: rel_prefix + @asset_rel_path,
338335
rel_prefix: rel_prefix,
339336
target: target,
340337
klass: klass,
@@ -408,8 +405,6 @@ def generate_file_files
408405
debug_msg " working on %s (%s)" % [file.full_name, out_file]
409406
rel_prefix = @outputdir.relative_path_from out_file.dirname
410407

411-
asset_rel_prefix = rel_prefix + @asset_rel_path
412-
413408
unless filepage_file then
414409
if file.text? then
415410
next unless page_file.exist?
@@ -427,7 +422,7 @@ def generate_file_files
427422

428423
render_template template_file, out_file: out_file, locals: {
429424
rel_prefix: rel_prefix,
430-
asset_rel_prefix: asset_rel_prefix,
425+
asset_rel_prefix: rel_prefix + @asset_rel_path,
431426
file: file,
432427
target: target,
433428
}
@@ -453,15 +448,14 @@ def generate_page file
453448
rel_prefix = @outputdir.relative_path_from out_file.dirname
454449

455450
target = file
456-
asset_rel_prefix = rel_prefix + @asset_rel_path
457451

458452
@title = "#{file.page_name} - #{@options.title}"
459453

460454
debug_msg " rendering #{out_file}"
461455
render_template template_file, out_file: out_file, locals: {
462456
file: file,
463457
target: target,
464-
asset_rel_prefix: asset_rel_prefix,
458+
asset_rel_prefix: rel_prefix + @asset_rel_path,
465459
rel_prefix: rel_prefix,
466460
}
467461
end
@@ -477,15 +471,11 @@ def generate_servlet_not_found message
477471

478472
debug_msg "Rendering the servlet 404 Not Found page..."
479473

480-
rel_prefix = rel_prefix = ''
481-
482-
asset_rel_prefix = ''
483-
484474
@title = 'Not Found'
485475

486476
render_template template_file, locals: {
487-
asset_rel_prefix: asset_rel_prefix,
488-
rel_prefix: rel_prefix,
477+
asset_rel_prefix: '',
478+
rel_prefix: '',
489479
}
490480
rescue => e
491481
error = RDoc::Error.new \
@@ -506,14 +496,11 @@ def generate_servlet_root installed
506496

507497
debug_msg 'Rendering the servlet root page...'
508498

509-
rel_prefix = '.'
510-
asset_rel_prefix = rel_prefix
511-
512499
@title = 'Local RDoc Documentation'
513500

514501
render_template template_file, locals: {
515-
asset_rel_prefix: asset_rel_prefix,
516-
rel_prefix: rel_prefix,
502+
asset_rel_prefix: '.',
503+
rel_prefix: '.',
517504
}
518505
rescue => e
519506
error = RDoc::Error.new \
@@ -537,13 +524,11 @@ def generate_table_of_contents
537524
out_file = @outputdir + 'table_of_contents.html'
538525
rel_prefix = @outputdir.relative_path_from out_file.dirname
539526

540-
asset_rel_prefix = rel_prefix + @asset_rel_path
541-
542527
@title = "Table of Contents - #{@options.title}"
543528

544529
render_template template_file, out_file: out_file, locals: {
545530
rel_prefix: rel_prefix,
546-
asset_rel_prefix: asset_rel_prefix,
531+
asset_rel_prefix: rel_prefix + @asset_rel_path,
547532
}
548533
rescue => e
549534
error = RDoc::Error.new \

0 commit comments

Comments
 (0)