Changeset 1694456

Timestamp:

07/11/2017 01:15:56 PM (9 years ago)

Author:

0xbbc

Message:

support bilibili via prprpr.me

Location:

dplayer-for-wp

Files:

• tags/1.1.9 (copied) (copied from dplayer-for-wp/trunk)
• tags/1.1.9/dplayer (copied) (copied from dplayer-for-wp/trunk/dplayer)
• tags/1.1.9/dplayer.php (copied) (copied from dplayer-for-wp/trunk/dplayer.php) (4 diffs)
• tags/1.1.9/js (deleted)
• tags/1.1.9/readme.txt (copied) (copied from dplayer-for-wp/trunk/readme.txt) (1 diff)
• trunk/dplayer.php (modified) (4 diffs)
• trunk/readme.txt (modified) (1 diff)

dplayer-for-wp/tags/1.1.9/dplayer.php

@@ -3 +3 @@
 * Plugin Name: DPlayer for WordPress
 * Description: Wow, such a lovely HTML5 danmaku video player comes to WordPress
-* Version: 1.1.8
+* Version: 1.1.9
 * Author: 0xBBC
 * Author URI: https://blog.0xbbc.com/
@@ -98 +98 @@
         // normalize attribute keys, lowercase
         $atts = array_change_key_case((array)$atts, CASE_LOWER);
-        
-        $id = md5($_SERVER['HTTP_HOST'] . $atts['url']);
+        $bilibili_param = $atts['bilibili'] ? $atts['bilibili'] : '';
+        $id = md5($_SERVER['HTTP_HOST'] . $atts['url'] . $bilibili_param);
         $result = array(
             'url' => $atts['url'] ? $atts['url'] : '',
-            'pic' => $atts['pic'] ? $atts['pic'] : ''
+            'pic' => $atts['pic'] ? $atts['pic'] : '',
+            'type' => $atts['type'] ? $atts['type'] : 'auto', 
         );
-        if (empty($result)) return;
         
         $theme = $atts['theme'];
@@ -128 +128 @@
         $playerCode = '<div id="player'.$id.'" class="dplayer">';
         $playerCode .= "</div>\n";
-        $data['video'] = $result;
 
         $danmaku = array(
@@ -136 +135 @@
         );
         
-        if ($atts['bilibili']) $danmaku['addition'] = DPlayer::dplayer_bilibili_url_handler($atts['bilibili']);
+        if ($bilibili_param) {
+            $danmaku['addition'] = DPlayer::dplayer_bilibili_url_handler($bilibili_param);
+            if (empty($atts['url'])) $result['url'] = $bilibili_param;
+        }
+        
+        $data['video'] = $result;
         $data['danmaku'] = ($atts['danmu'] != 'false') ? $danmaku : null;
 

dplayer-for-wp/tags/1.1.9/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0.1
 Tested up to: 4.8.0
-Stable tag: 1.1.8
+Stable tag: 1.1.9
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html

dplayer-for-wp/trunk/dplayer.php

@@ -3 +3 @@
 * Plugin Name: DPlayer for WordPress
 * Description: Wow, such a lovely HTML5 danmaku video player comes to WordPress
-* Version: 1.1.8
+* Version: 1.1.9
 * Author: 0xBBC
 * Author URI: https://blog.0xbbc.com/
@@ -98 +98 @@
         // normalize attribute keys, lowercase
         $atts = array_change_key_case((array)$atts, CASE_LOWER);
-        
-        $id = md5($_SERVER['HTTP_HOST'] . $atts['url']);
+        $bilibili_param = $atts['bilibili'] ? $atts['bilibili'] : '';
+        $id = md5($_SERVER['HTTP_HOST'] . $atts['url'] . $bilibili_param);
         $result = array(
             'url' => $atts['url'] ? $atts['url'] : '',
-            'pic' => $atts['pic'] ? $atts['pic'] : ''
+            'pic' => $atts['pic'] ? $atts['pic'] : '',
+            'type' => $atts['type'] ? $atts['type'] : 'auto', 
         );
-        if (empty($result)) return;
         
         $theme = $atts['theme'];
@@ -128 +128 @@
         $playerCode = '<div id="player'.$id.'" class="dplayer">';
         $playerCode .= "</div>\n";
-        $data['video'] = $result;
 
         $danmaku = array(
@@ -136 +135 @@
         );
         
-        if ($atts['bilibili']) $danmaku['addition'] = DPlayer::dplayer_bilibili_url_handler($atts['bilibili']);
+        if ($bilibili_param) {
+            $danmaku['addition'] = DPlayer::dplayer_bilibili_url_handler($bilibili_param);
+            if (empty($atts['url'])) $result['url'] = $bilibili_param;
+        }
+        
+        $data['video'] = $result;
         $data['danmaku'] = ($atts['danmu'] != 'false') ? $danmaku : null;
 

dplayer-for-wp/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0.1
 Tested up to: 4.8.0
-Stable tag: 1.1.8
+Stable tag: 1.1.9
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html