use the new jquery.oembed implementation provided by collecetive.oembed

collective · Dec 19, 2012 · b617fb8 · b617fb8
1 parent 335a8c0
commit b617fb8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/collective/portlet/oembed/jsoembed.pt b/collective/portlet/oembed/jsoembed.pt
@@ -0,0 +1 @@
+<a class="oembed" tal:attributes="href view/data/remote_url; data-maxwidth view/data/maxwidth; data-maxheight view/data/maxheight" tal:content="view/data/header"></a>
diff --git a/collective/portlet/oembed/portlet.pt b/collective/portlet/oembed/portlet.pt
@@ -18,13 +18,12 @@
     </dt>
 
     <dd class="portletItem odd">
-        <div tal:replace="structure view/embed" />
         <tal:corners condition="not:view/has_footer">
             <span class="portletBottomLeft"></span>
             <span class="portletBottomRight"></span>
         </tal:corners>
     </dd>
-    
+
     <dd class="portletFooter" tal:condition="view/has_footer">
         <span class="portletBottomLeft"></span>
         <span>

diff --git a/collective/portlet/oembed/portlet.py b/collective/portlet/oembed/portlet.py
@@ -92,6 +92,7 @@ class Renderer(static.Renderer):
 
     render = ViewPageTemplateFile('portlet.pt')
     jsoembedall = ViewPageTemplateFile('jsoembedall.pt')
+    jsoembed = ViewPageTemplateFile('jsoembed.pt')
 
     def get_rendering(self):
         registry = component.getUtility(IRegistry)
@@ -102,6 +103,9 @@ def get_rendering(self):
     def embed(self):
         if self.get_rendering() == "collective.js.oembedall":
             return self.jsoembedall()
+        if self.get_rendering() == "collective.oembed.jquery":
+            return self.jsoembed()
+        #rendering should be "collective.oembed"
         return self.embed_collective_oembed()
 
     def embed_collective_oembed(self):

diff --git a/collective/portlet/oembed/profiles/default/registry.xml b/collective/portlet/oembed/profiles/default/registry.xml
@@ -3,6 +3,6 @@
         <field type="plone.registry.field.ASCIILine">
             <title>Rendering</title>
         </field>
-        <value>collective.oembed</value>
+        <value>collective.oembed.jquery</value>
     </record>
 </registry>
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -5,6 +5,7 @@ Changelog
 ----------------
 
 - Add collective.js.oembedall rendering option
+- Add collective.oembed.jquery rendering option and activate it by default
 
 
 1.1 (2012-07-10)