Changeset 2047525

Timestamp:

03/10/2019 10:59:40 AM (7 years ago)

Author:

retokuhn

Message:

Fixed issues with parameters "thumbnail", "width", "height".

Location:

embed-simplex-player/trunk

Files:

• embed-simplex-player.php (modified) (8 diffs)
• js (added)
• js/script.js (added)
• readme.txt (modified) (2 diffs)

embed-simplex-player/trunk/embed-simplex-player.php

@@ -2 +2 @@
 /**
  * @package embed-simplex-player
- * @version 1.0.2
+ * @version 1.0.3
  */
 /*
@@ -8 +8 @@
 Plugin URI:     https://wordpress.org/plugins/embed-simplex-player/
 Description:    Integrate the xtendx simplex player with a shortcode. Generates an embed code and displays the simplex player in a responsive iframe.
-Version:        1.0.2
+Version:        1.0.3
 Author:         Reto Kuhn
 Author URI:     https://retokuhn.ch
@@ -40 +40 @@
             'pid' => '',
             'embed' => '1',
-            'width' => '1280',
-            'height' => '720',
+            'width' => '',
+            'height' => '',
             'get' => '',
             'style_wrapper' => '',
             'style_iframe' => '',
             'thumbnail' => '',
+            'style_thumbnail' => '',
         ), $atts, $tag );
 
@@ -60 +61 @@
     $width = sanitize_key( $atts['width'] );
     $height = sanitize_key( $atts['height'] );
-    $ratio = ($height / $width) * 100;
     $get = $atts['get'];
     if ( !empty($get) ) {
@@ -69 +69 @@
     $style_iframe = sanitize_text_field( $atts['style_iframe'] );
     $thumbnail = sanitize_text_field( $atts['thumbnail'] );
+    $style_thumbnail = sanitize_text_field( $atts['style_thumbnail'] );
 
     // create iframe url
@@ -76 +77 @@
 
         // iframe
-        $iframe_code = '<iframe style="position:absolute;top:0;left:0;width:100%;height:100%;' . $style_iframe . '" width="' . $width . '" height="' . $height . '" ';
+        $iframe_code = '<iframe style="position:absolute;top:0;left:0;width:100%;height:100%;' . $style_iframe . '"';
         $iframe_code .= 'src="' . $iframe_url . '" ';
         $iframe_code .= 'frameborder="0" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" scrolling="no">';
@@ -82 +83 @@
 
         // output start
-        $output = '<div style="position:relative;padding-bottom:' . $ratio . '%;height:0;overflow:hidden;margin:0;max-width:none;' . $style_wrapper . '">';
+        if ( !empty($height) ) {
+            $style_size = "height:" . $height . "px;";
+            if ( !empty($width) ) {
+                $style_size .= "width:" . $width . "px;";
+            }
+        }else{
+            $width = 1280;
+            $height = 720;
+            $ratio = ($height / $width) * 100;
+            $style_size = "padding-bottom:" . $ratio . "%;";
+        }
+        
+        $output = '<div style="position:relative;overflow:hidden;' . $style_size . $style_wrapper . '">';
 
         // thumbnail
         if ($thumbnail == 1) {
             $thumbnail_url = $url . 'content/' . $cid . '/' . $aid . '/' . $pid . '/simvid_1.jpg';
-            $thumbnail_code = '<script>function loadIframe(el) { el.parentNode.innerHTML="'.addslashes($iframe_code).'"; }</script>';
-            $thumbnail_code .= '<img src="'.$thumbnail_url.'" onclick="loadIframe(this);">';
+            $thumbnail_code = '<img src="'.$thumbnail_url.'" data-iframe-code="'.str_replace('"', "'", $iframe_code).'" onclick="loadIframe(this);">';
             $output .= $thumbnail_code;
         }else{
@@ -104 +116 @@
 }
 
+function embed_simplex_player_script() {
+    wp_register_script('embed-simplex-player', plugins_url('embed-simplex-player/js/script.js'));
+    wp_enqueue_script('embed-simplex-player');
+}
+add_action( 'wp_enqueue_scripts', 'embed_simplex_player_script' );
+
 function embed_simplex_player_init() {
     add_shortcode('embed-simplex-player', 'embed_simplex_player');

embed-simplex-player/trunk/readme.txt

@@ -3 +3 @@
 Tags: xtendx, simplex, player, embed
 Requires at least: 4.0
-Tested up to: 5.1.0
+Tested up to: 5.2.0
 Requires PHP: 5.6
-Stable tag: 1.0.2
+Stable tag: 1.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -65 +65 @@
 = 1.0.2 =
 * Additional parameter "thumbnail" loads video iframe after a click on the thumbnail image.
+= 1.0.3 =
+* Fixed issues with parameters "thumbnail", "width", "height".