Changeset 803113

Timestamp:

11/12/2013 02:19:56 PM (12 years ago)

Author:

migueluy

Message:

Jetpack: Shortcodes: Bandcamp: update to the bandcamp shortcode from Neal Tucker. New 'tracklist' attribute, more 'artwork' attribute values, and minimal
attribute.
Dailymotion: Update to use an iframe and html5 player vs. a flash player. This makes the shortcode work on mobile too. Props @kraftbj.

Location:

jetpack/trunk/modules/shortcodes

Files:

• bandcamp.php (modified) (2 diffs)
• dailymotion.php (modified) (3 diffs)
• presentations.php (modified) (1 diff)

jetpack/trunk/modules/shortcodes/bandcamp.php

@@ -20 +20 @@
         'height'        => null,        // integer with optional "%"
         'notracklist'   => null,        // may be string "true" (defaults false)
-        'artwork'       => null,        // may be string "false" (defaults true)
+        'tracklist'     => null,        // may be string "false" (defaults true)
+        'artwork'       => null,        // may be string "false" (alternately: "none") or "small" (default is large)
+        'minimal'       => null,        // may be string "true" (defaults false)
         'theme'         => null,        // may be theme identifier string ("light"|"dark" so far)
         'package'       => null,        // integer package id
@@ -127 +129 @@
     }
 
-    if ( $attributes['artwork'] == "false" ) {
-        $url .= "/artwork=false";
+    // 'tracklist' arg deprecates 'notracklist=true' to be less weird.
+    // Note, behavior if both are specified is undefinied
+    switch ( $attributes['tracklist'] ) {
+        case "false":
+        case "none":
+            $url .= "/tracklist=false";
+            break;
+    }
+
+    switch ( $attributes['artwork'] ) {
+        case "false":
+        case "none":
+        case "small":
+            $url .= "/artwork=" . $attributes['artwork'];
+            break;
+    }
+
+    if ( $attributes['minimal'] == "true" ) {
+        $url .= "/minimal=true";
     }
 

jetpack/trunk/modules/shortcodes/dailymotion.php

@@ -67 +67 @@
  * The new style is now:
  * [dailymotion id=x8oma9 title=2 user=3 video=4]
+ * @todo: Update code to sniff for iframe embeds and convert those to shortcodes.
  *
  * @param array $atts
@@ -97 +98 @@
     $id = urlencode( $id );
 
-    $output = '<object width="' . $width . '" height="' . $height . '"><param name="movie" value="http://www.dailymotion.com/swf/';
-    $after = '';
-    if ( preg_match( '/^[a-z0-9]+$/', $id ) ) {
-        $output .= $id;
+    if ( preg_match( '/^[A-Za-z0-9]+$/', $id ) ) {
+        $output = '<iframe width="' . $width . '" height="' . $height . '" src="http://www.dailymotion.com/embed/video/' . $id . '" frameborder="0"></iframe>';
+        $after = '';
 
         if ( array_key_exists( 'video', $atts ) && $video = preg_replace( '/[^-a-z0-9_]/i', '', $atts['video'] ) && array_key_exists( 'title', $atts ) && $title = wp_kses( $atts['title'], array() ) )
@@ -109 +109 @@
     }
 
-    $output .=  '"></param><param name="allowfullscreen" value="true"></param><param name="wmode" value="opaque"></param><embed src="http://www.dailymotion.com/swf/' . $id . '" width="' . $width . '" height="' . $height . '" allowfullscreen="true" wmode="opaque"></embed></object>';
-
     return $output . $after;
 }

jetpack/trunk/modules/shortcodes/presentations.php

@@ -141 +141 @@
 
         $atts = shortcode_atts( array(
-            'duration'    => '',
-            'height'      => '',
-            'width'       => '',
-            'bgcolor'     => '',
-            'bgimg'       => '',
-            'autoplay'    => '',
+            'duration'   => '',
+            'height'     => '',
+            'width'      => '',
+            'bgcolor'    => '',
+            'bgimg'      => '',
+            'autoplay'   => '',
 
             // Settings
-            'transition'  => '',
-            'scale'       => '',
-            'rotate'      => '',
-            'fade'        => '',
-            'fadebullets' => '',
+            'transition' => '',
+            'scale'      => '',
+            'rotate'     => '',
+            'fade'       => '',
+            'fadebullets'=> '',
         ), $atts );
 
         $this->presentation_settings = array(
-            'transition'  => 'down',
-            'scale'       => 1,
-            'rotate'      => 0,
-            'fade'        => 'on',
-            'fadebullets' => 0,
-            'last'        => array(
-                'x'       => 0,
-                'y'       => 0,
-                'scale'   => 1,
-                'rotate'  => 0,
+            'transition' => 'down',
+            'scale'      => 1,
+            'rotate'     => 0,
+            'fade'       => 'on',
+            'last'       => array(
+                'x'      => 0,
+                'y'      => 0,
+                'scale'  => 1,
+                'rotate' => 0,
             ),
         );