Changeset 6645

Show
Ignore:
Timestamp:
02/14/08 00:08:57 (5 years ago)
Author:
drry
Message:

lang/ruby/wikiforme/trunk/bundles/article.4me/web.4me/flot.rb
lang/ruby/wikiforme/branches/frsyuki/bundles/article.4me/web.4me/flot.rb
lang/ruby/wikiforme/branches/frsyuki/bundles/article.4me/web.4me/s6.rb: fixed to use multiple CDATA sections for MSC instead of removing it.

Location:
lang/ruby/wikiforme
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • lang/ruby/wikiforme/branches/frsyuki/bundles/article.4me/web.4me/flot.rb

    r6439 r6645  
    6262                        end 
    6363                } 
    64                 script = XMLRaw.new("//<![CDATA[\n$(function(){ $.plot($('##{@anchor}'), #{ds.to_json.gsub(']]>','')}); });\n//]]>") 
     64                script = XMLRaw.new("//<![CDATA[\n$(function(){ $.plot($('##{@anchor}'), #{ds.to_json.gsub(']]>',']]]]><![CDATA[>')}); });\n//]]>") 
    6565                placeholder << XML[:script, {:language => 'javascript', :type => 'text/javascript'}, script] 
    6666                placeholder 

  • lang/ruby/wikiforme/branches/frsyuki/bundles/article.4me/web.4me/s6.rb

    r6434 r6645  
    173173                js.merge! @s6_page_option 
    174174                unless js.empty? 
    175                         script = "s6.page(#{js.to_json})".gsub(']]>', ']]&gt;') 
     175                        script = "s6.page(#{js.to_json})".gsub(']]>', ']]]]><![CDATA[>') 
    176176                        [:div, body, [:script, XML.escaped("//<![CDATA[\n#{script}\n//]]>\n")]] 
    177177                else 

  • lang/ruby/wikiforme/trunk/bundles/article.4me/web.4me/flot.rb

    r3446 r6645  
    6363                        end 
    6464                } 
    65                 script = XMLRaw.new("//<![CDATA[\n$(function(){ $.plot($('##{@anchor}'), #{ds.to_json.gsub(']]>','')}); });\n//]]>") 
     65                script = XMLRaw.new("//<![CDATA[\n$(function(){ $.plot($('##{@anchor}'), #{ds.to_json.gsub(']]>',']]]]><![CDATA[>')}); });\n//]]>") 
    6666                placeholder << XML[:script, {:language => 'javascript', :type => 'text/javascript'}, script] 
    6767                placeholder