From 126d9fe307af55906147201a197020ca4da56c24 Mon Sep 17 00:00:00 2001
From: Rene Saarsoo <nene@triin.net>
Date: Thu, 30 Jun 2011 11:12:43 +0300
Subject: [PATCH] Sensible defaults to @img and @link templates.

---
 Rakefile          | 4 ----
 bin/jsduck        | 4 ++--
 lib/jsduck/app.rb | 6 ++++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Rakefile b/Rakefile
index c2a12743..e1f54446 100644
--- a/Rakefile
+++ b/Rakefile
@@ -43,10 +43,6 @@ def run_jsduck(extra_options)
     "ruby", "bin/jsduck",
     # --external=Error to ignore the Error class that Ext.Error extends.
     "--external", "Error",
-    '--link', '<a href="#/api/%c%-%m" rel="%c%-%m" class="docClass">%a</a>',
-    # Note that we wrap image template inside <p> because {@img} often
-    # appears inline within text, but that just looks ugly in HTML
-    '--img', '<p><img src="doc-resources/%u" alt="%a"></p>',
     "--guides", "#{SDK_DIR}/guides",
     "--guides-order", "getting,class,application,layouts,data,grid,tree,drawing,forms,components,theming,direct",
     "--categories", "#{SDK_DIR}/extjs/doc-resources/categories.json",
diff --git a/bin/jsduck b/bin/jsduck
index 3abcd9f4..d091c385 100755
--- a/bin/jsduck
+++ b/bin/jsduck
@@ -82,7 +82,7 @@ opts = OptionParser.new do | opts |
     "Possible placeholders:",
     "%u - URL from @img tag (e.g. 'some/path.png')",
     "%a - alt text for image",
-    "Default value in export: '<img src=\"%u\" alt=\"%a\"/>'", " ") do |tpl|
+    "Default is: '<p><img src=\"doc-resources/%u\" alt=\"%a\"></p>'", " ") do |tpl|
     app.img_tpl = tpl
   end
 
@@ -99,7 +99,7 @@ opts = OptionParser.new do | opts |
     "%# - inserts '#' if member name present",
     "%- - inserts '-' if member name present",
     "%a - anchor text for link",
-    "Default value in export: '<a href=\"%c%#%m\">%a</a>'", " ") do |tpl|
+    "Default is: '<a href=\"#/api/%c%-%m\" rel=\"%c%-%m\" class=\"docClass\">%a</a>'", " ") do |tpl|
     app.link_tpl = tpl
   end
 
diff --git a/lib/jsduck/app.rb b/lib/jsduck/app.rb
index d0d0362f..71744dca 100644
--- a/lib/jsduck/app.rb
+++ b/lib/jsduck/app.rb
@@ -83,6 +83,12 @@ module JsDuck
 
     # Call this after input parameters set
     def run
+      # Set default templates
+      @link_tpl ||= '<a href="#/api/%c%-%m" rel="%c%-%m" class="docClass">%a</a>'
+      # Note that we wrap image template inside <p> because {@img} often
+      # appears inline within text, but that just looks ugly in HTML
+      @img_tpl ||= '<p><img src="doc-resources/%u" alt="%a"></p>'
+
       parsed_files = @timer.time(:parsing) { parallel_parse(@input_files) }
       result = @timer.time(:aggregating) { aggregate(parsed_files) }
       relations = @timer.time(:aggregating) { filter_classes(result) }
-- 
GitLab