Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
got rid of some comments, renamed some variables
  • Loading branch information
ethn committed May 18, 2011
1 parent b0ae145 commit f1bda3e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions app/models/renderer.rb
Expand Up @@ -102,7 +102,6 @@ def define_view(view, opts={}, &final)
if view_key == view
#Rails.logger.debug "define base view: _render_#{view}, render_#{view}"
define_method( "_render_#{view}" ) do |*a| a = [{}] if a.empty?
#a[0][:home_view] ||= view
final_meth = view_method( view )
#Rails.logger.debug " in #{caller(0).first}[#{card}] #{view}, #{final_meth}"
raise "??? #{view.inspect}" unless final_meth
Expand Down Expand Up @@ -235,7 +234,6 @@ def process_content(content=nil, opts={})
update_references(wiki_content) if card.references_expired

wiki_content.render! do |opts|
# @home_view = opts[:view].to_sym if @home_view.nil? and opts[:view]
expand_inclusion(opts) { yield }
end
end
Expand Down Expand Up @@ -424,8 +422,6 @@ def resize_image_content(content, size)
def process_inclusion(tcard, options)
sub = subrenderer(tcard, options[:context])
oldrenderer, Renderer.current_slot = Renderer.current_slot, sub

# set item_view; search cards access this variable when rendering their content.
sub.item_view = options[:item] if options[:item]
sub.type = options[:type] if options[:type]
sub.showname = options[:showname] || tcard.name
Expand All @@ -434,7 +430,7 @@ def process_inclusion(tcard, options)

vmode = (options[:view] || :content).to_sym
sub.requested_view = vmode
action = case
subview = case

when [:name, :link, :linkname].member?(vmode) ; vmode
when :edit == state
Expand All @@ -449,7 +445,7 @@ def process_inclusion(tcard, options)
when state==:line ; :closed_content
else ; vmode
end
result = sub.render(action, options)
result = sub.render(subview, options)
Renderer.current_slot = oldrenderer
result
rescue Exception=>e
Expand Down
2 changes: 1 addition & 1 deletion packs/default/rich_html_pack.rb
Expand Up @@ -99,7 +99,7 @@ class RichHtmlRenderer
###---( EDIT VIEWS )
define_view(:edit_in_form) do |args|
form = form_for_multi
Rails.logger.info "_final_edit_in_form( #{args.inspect} )"
#Rails.logger.info "_final_edit_in_form( #{args.inspect} )"
%{
<div class="edit-area in-multi RIGHT-#{ card.name.tag_name.to_key.css_name }">
<div class="label-in-multi">
Expand Down

0 comments on commit f1bda3e

Please sign in to comment.