if ajax request don't put script tags around the output.

cykod · Apr 15, 2010 · bc2c934 · bc2c934
1 parent a1876bf
commit bc2c934
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb
@@ -33,7 +33,7 @@ def paragraph #:nodoc:
     @result = engine.run_paragraph(para,self,myself)
 
     if @result
-      render :text => webiva_post_process_paragraph(render_paragraph(container.is_a?(SiteNode) ? container : container.site_node, revision, @result))
+      render :text => webiva_post_process_paragraph(render_paragraph(container.is_a?(SiteNode) ? container : container.site_node, revision, @result, :ajax => true))
     else
       render :nothing => true
     end

diff --git a/app/controllers/paragraph_feature.rb b/app/controllers/paragraph_feature.rb
@@ -1797,7 +1797,9 @@ def webiva_feature(feature_name,data={})
      end 
      opts = {}
      opts[:site_feature_id] = data[:site_feature_id] if data.has_key?(:site_feature_id)
-     parse_feature(get_feature(feature_name,opts),parser_context)
+     feature = get_feature(feature_name,opts)
+     feature.body_html = single_feature(data[:partial_feature], feature.body_html) unless data[:partial_feature].blank?
+     parse_feature(feature,parser_context)
   else
     documenter = FeatureDocumenter.new(self) do |c|
       yield c
@@ -1806,7 +1808,14 @@ def webiva_feature(feature_name,data={})
   end
  end
 
-
+  def single_feature(tag_name, feature_body)
+    if feature_body =~ /(<cms:#{tag_name}.*?\/cms:#{tag_name}>)/m
+      $1
+    else
+      feature_body
+    end
+  end
+
  def get_feature(type,options = {}) #:nodoc:
     if options.has_key?(:site_feature_id) && @feature_override = SiteFeature.find_by_id(options[:site_feature_id])
       @feature_override

diff --git a/lib/site_node_engine.rb b/lib/site_node_engine.rb
@@ -297,7 +297,9 @@ def render_paragraph(site_node,revision,paragraph,opts = {})
           paragraph.render_args[:locals] ||= {}
           paragraph.render_args[:locals][:renderer] = paragraph.rnd unless paragraph.render_args[:locals][:renderer]
           @paragraph = paragraph
-          str = "<script type='text/javascript'>" + render_to_string(paragraph.render_args) + "</script>"
+          str = render_to_string(paragraph.render_args)
+          str = "<script type='text/javascript'>" + str + "</script>" unless opts[:ajax]
+          str
         elsif paragraph.render_args[:parent_rjs]
           paragraph.render_args[:partial] = paragraph.render_args.delete(:parent_rjs)
           paragraph.render_args[:locals] ||= {}