Mercurial > hg > soundsoftware-site
comparison lib/redmine/wiki_formatting/macros.rb @ 1294:3e4c3460b6ca redmine-2.2
Update to Redmine SVN revision 11972 on 2.2-stable branch
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 09:01:12 +0100 |
parents | 433d4f72a19b |
children | 622f24f53b42 |
comparison
equal
deleted
inserted
replaced
1115:433d4f72a19b | 1294:3e4c3460b6ca |
---|---|
145 raise "Invalid macro name: #{name} (only 0-9, A-Z, a-z and _ characters are accepted)" | 145 raise "Invalid macro name: #{name} (only 0-9, A-Z, a-z and _ characters are accepted)" |
146 end | 146 end |
147 unless block_given? | 147 unless block_given? |
148 raise "Can not create a macro without a block!" | 148 raise "Can not create a macro without a block!" |
149 end | 149 end |
150 name = name.to_sym if name.is_a?(String) | 150 name = name.to_s.downcase.to_sym |
151 available_macros[name] = {:desc => @@desc || ''}.merge(options) | 151 available_macros[name] = {:desc => @@desc || ''}.merge(options) |
152 @@desc = nil | 152 @@desc = nil |
153 Definitions.send :define_method, "macro_#{name}".downcase, &block | 153 Definitions.send :define_method, "macro_#{name}", &block |
154 end | 154 end |
155 | 155 |
156 # Sets description for the next macro to be defined | 156 # Sets description for the next macro to be defined |
157 def desc(txt) | 157 def desc(txt) |
158 @@desc = txt | 158 @@desc = txt |