WordPress.org
Get WordPress

Plugin Directory

Changeset 1709981


Ignore:
Timestamp:
08/08/2017 07:20:21 AM (9 years ago)
Author:
Blrt
Message:

UPDATE VIA SCRIPT, VERSION 1.3.9

Location:
blrt-wp-embed
Files:
25 added
2 edited

Legend:

Unmodified
Added
Removed

  • blrt-wp-embed/trunk/blrt-wp-embed.php

    r1677971 r1709981  
    44* Plugin URI: http://www.blrt.com/wordpress-plugin
    55* Description: Enable Blrts and Blrt Galleries in your pages and posts - just like YouTube videos.
    6 * Version: 1.3.7
     6* Version: 1.3.9
    77* Author: Blrt
    88* Author URI: http://www.blrt.com
    … …  
    2727defined( 'ABSPATH' ) or die( 'No direct access to this file' );
    2828
    29 
    30 define('BLRT_WP_EMBED_VERSION', '1.3.7');
     29define('BLRT_WP_EMBED_ASSETS_VERSION', '1.3.7');
     30define('BLRT_WP_EMBED_VERSION', '1.3.9');
    3131define('CDN_URL', '//s3.amazonaws.com/blrt-gallery/'.BLRT_WP_EMBED_VERSION);
    3232
    … …  
    4646   
    4747    public function init() {
     48        global $wp_version;
    4849        wp_register_script('owlcarousel', '//cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.2.1/owl.carousel.min.js', ['jquery'], null, true);
    4950        wp_register_script('ua-parser', '//cdnjs.cloudflare.com/ajax/libs/UAParser.js/0.7.12/ua-parser.min.js', ['jquery'], null, true);
    5051        //wp_register_script('blrt-wp-embed', CDN_URL.'/admin.min.js', ['jquery', 'jquery-ui-sortable'], null, true);
    51         wp_register_script('blrt-wp-embed', plugins_url('dist/js/admin.min.js', __FILE__), ['jquery', 'jquery-ui-sortable'], BLRT_WP_EMBED_VERSION, true);
     52        wp_register_script('blrt-wp-embed', plugins_url('dist/js/admin.min.js', __FILE__), ['jquery', 'jquery-ui-sortable'], BLRT_WP_EMBED_ASSETS_VERSION, true);
    5253        wp_register_script('blrt-gallery', CDN_URL.'/main.min.js', ['jquery', 'owlcarousel', 'ua-parser'], null, true);
    53         //wp_register_script('blrt-gallery', plugins_url('dist/js/main.min.js', __FILE__), ['jquery', 'owlcarousel', 'ua-parser'], BLRT_WP_EMBED_VERSION, true);
     54        //wp_register_script('blrt-gallery', plugins_url('dist/js/main.min.js', __FILE__), ['jquery', 'owlcarousel', 'ua-parser'], BLRT_WP_EMBED_ASSETS_VERSION, true);
    5455       
    5556        wp_register_style('owlcarousel', '//cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.2.1/assets/owl.carousel.min.css', [], null);
    5657        //wp_register_style('owlcarousel', plugins_url('dist/css/owl.carousel.min.css',  __FILE__), [], '2.2.1');
    5758        //wp_register_style('blrt-wp-embed', CDN_URL.'/admin.min.css', [], null);
    58         wp_register_style('blrt-wp-embed', plugins_url('dist/css/admin.min.css',  __FILE__), [], BLRT_WP_EMBED_VERSION);
     59        wp_register_style('blrt-wp-embed', plugins_url('dist/css/admin.min.css',  __FILE__), [], BLRT_WP_EMBED_ASSETS_VERSION);
    5960        wp_register_style('blrt-gallery', CDN_URL.'/main.min.css', [], null);
    60         //wp_register_style('blrt-gallery', plugins_url('dist/css/main.min.css',  __FILE__), [], BLRT_WP_EMBED_VERSION);
     61        //wp_register_style('blrt-gallery', plugins_url('dist/css/main.min.css',  __FILE__), [], BLRT_WP_EMBED_ASSETS_VERSION);
    6162        wp_register_style('blrt-web', CDN_URL.'/blrt-web.min.css', [], null);
    62         //wp_register_style('blrt-web', plugins_url('dist/css/blrt-web.min.css',  __FILE__), [], BLRT_WP_EMBED_VERSION);
    63        
    64         add_filter( 'style_loader_tag', array( $this, 'fix_style_tags'), 10, 4);
     63        //wp_register_style('blrt-web', plugins_url('dist/css/blrt-web.min.css',  __FILE__), [], BLRT_WP_EMBED_ASSETS_VERSION);
     64       
     65        add_filter( 'style_loader_tag', array( $this, 'fix_style_tags'), 10, 2);
    6566
    6667        include dirname( __FILE__ ).'/includes/shortcodes.php';
    … …  
    6970    }
    7071   
    71     function fix_style_tags($html, $handle, $href, $media) {
    72         if (in_array($handle, ['blrt-gallery', 'blrt-web', 'blrt-wp-embed', 'owlcarousel'])) {
    73             return "<link rel='stylesheet' id='".$handle."'  href='".$href."' type='text/css' media='".$media."' crossorigin='anonymous'/>";
    74         } else {
    75             return $html;
    76         }
     72    function fix_style_tags($html, $handle) {
     73        if (in_array($handle, ['blrt-gallery', 'blrt-web', 'blrt-wp-embed', 'owlcarousel']) && strpos($html, 'crossorigin') === false) {
     74            $html = preg_replace('/ \/>/', ' crossorigin=\'anonymous\' />', $html);
     75        }
     76        return $html;
    7777    }
    7878   
    … …  
    9696        }
    9797        if (wp_script_is( 'blrt-gallery', 'enqueued' )) {
    98             echo "(window.blrt_gallery_js_loaded) || document.write('<script src=\"".plugins_url('dist/js/main.min.js?ver='.BLRT_WP_EMBED_VERSION, __FILE__)."\"><\/script>');\n";
     98            echo "(window.blrt_gallery_js_loaded) || document.write('<script src=\"".plugins_url('dist/js/main.min.js?ver='.BLRT_WP_EMBED_ASSETS_VERSION, __FILE__)."\"><\/script>');\n";
    9999        }
    100100        echo "(function($) {
    … …  
    124124                        if (rules.length == 0) {
    125125                            //$('<link rel=\"stylesheet\" type=\"text/css\" href=\"".CDN_URL.'/main.min.css'."\" \/>').appendTo('body');
    126                             $('<link rel=\"stylesheet\" type=\"text/css\" href=\"".plugins_url('dist/css/main.min.css'.'?ver='.BLRT_WP_EMBED_VERSION,  __FILE__)."\" \/>').appendTo('body');
     126                            $('<link rel=\"stylesheet\" type=\"text/css\" href=\"".plugins_url('dist/css/main.min.css'.'?ver='.BLRT_WP_EMBED_ASSETS_VERSION,  __FILE__)."\" \/>').appendTo('body');
    127127                        }
    128128                        return;
    … …  
    138138                        if (rules.length == 0) {
    139139                            //$('<link rel=\"stylesheet\" type=\"text/css\" href=\"".CDN_URL.'/blrt-web.min.css'."\" \/>').appendTo('body');
    140                             $('<link rel=\"stylesheet\" type=\"text/css\" href=\"".plugins_url('dist/css/blrt-web.min.css'.'?ver='.BLRT_WP_EMBED_VERSION,  __FILE__)."\" \/>').appendTo('body');
     140                            $('<link rel=\"stylesheet\" type=\"text/css\" href=\"".plugins_url('dist/css/blrt-web.min.css'.'?ver='.BLRT_WP_EMBED_ASSETS_VERSION,  __FILE__)."\" \/>').appendTo('body');
    141141                        }
    142142                        return;

  • blrt-wp-embed/trunk/readme.txt

    r1677971 r1709981  
    33Tags: Blrt,Embed,oembed
    44Requires at least: 2.9
    5 Stable tag: 1.3.7
     5Stable tag: 1.3.9
    66Tested up to: 4.7.5
    77License: GPL2
    … …  
    3131
    3232-== Changelog ==
     33
     34= 1.3.9
     35* Fix PHP error on WordPress =< 4.3.0 related to `style_loader_tag` parameter amount
     36* Add seperate version number for assets to prevent unnecessary asset versions
    3337
    3438= 1.3.7
Note: See TracChangeset for help on using the changeset viewer.