Changeset 2384037

Timestamp:

09/17/2020 11:03:23 PM (5 years ago)

Author:

dottech

Message:

Version 1.0.6

Location:

dot-monetize-polls-quizzes/trunk

Files:

• dot-press.php (modified) (2 diffs)
• includes/class-dot-press-block-renderer.php (modified) (3 diffs)
• includes/class-dot-press-public.php (modified) (8 diffs)
• readme.txt (modified) (1 diff)

dot-monetize-polls-quizzes/trunk/dot-press.php

@@ -3 +3 @@
  * Plugin Name:       DOT | Monetize Polls & Quizzes
  * Description:      The easiest way to create and publish interactive polls and quizzes. Fully integrated monetization and analytics.
- * Version:           1.0.5
+ * Version:           1.0.6
  * Requires at least: 5.2
  * Requires PHP:      7.2
@@ -17 +17 @@
 }
 
-define( 'DOT_PRESS_VERSION', '1.0.5' );
+define( 'DOT_PRESS_VERSION', '1.0.6' );
 require_once plugin_dir_path(__FILE__) . 'constants.php';
 

dot-monetize-polls-quizzes/trunk/includes/class-dot-press-block-renderer.php

@@ -113 +113 @@
             return $b['blockName'] === $block['blockName'];
         });
-        
+
         return DotPressArrayUtils::findIndex(function ($b) use ($block) {
             return $b['innerHTML'] === $block['innerHTML'];
@@ -122 +122 @@
     {
         if ($block_type) {
-            if (empty($this->posts)) {
+            if (empty($this->posts) || !isset($block['blockName'])) {
                 return $block_content;
             }
@@ -183 +183 @@
         ];
         $alignment = $placement->meta['alignment'][0];
-        return sprintf('<div style="margin: %s; max-width: 600px;">', $marginOptions[$alignment]) . $carry . '</div>';
+        return sprintf('<!-- wp:html --><div style="margin: %s; max-width: 600px;">', $marginOptions[$alignment]) . $carry . '</div><!-- /wp:html -->';
     }
 

dot-monetize-polls-quizzes/trunk/includes/class-dot-press-public.php

@@ -21 +21 @@
  * @author     Your Name <[email protected]>
  */
-class DotPressPublic {
+class DotPressPublic
+{
 
     /**
@@ -28 +29 @@
      * @since    1.0.0
      * @access   private
-     * @var      string    $plugin_name    The ID of this plugin.
+     * @var      string $plugin_name The ID of this plugin.
      */
     private $plugin_name;
@@ -37 +38 @@
      * @since    1.0.0
      * @access   private
-     * @var      string    $version    The current version of this plugin.
+     * @var      string $version The current version of this plugin.
      */
     private $version;
@@ -56 +57 @@
      * @since    1.0.0
      */
-    public function __construct( $plugin_name, $version, $loader ) {
+    public function __construct($plugin_name, $version, $loader)
+    {
 
         $this->plugin_name = $plugin_name;
@@ -62 +64 @@
         $this->loader = $loader;
 
-        $this->loader->add_action( 'wp_enqueue_scripts', $this, 'enqueue_scripts' );
+        $this->loader->add_action('wp_enqueue_scripts', $this, 'enqueue_scripts');
         $this->loader->add_action('loop_start', $this, 'load_renderer', 1);
-        $this->loader->add_filter('render_block', $this, 'render_block', 10, 2);
+        $this->loader->add_filter('the_content', $this, 'render_content', 999999999);
+//        $this->loader->add_filter('render_block', $this, 'render_block', 0, 2);
     }
 
@@ -72 +75 @@
      * @since    1.0.0
      */
-    public function enqueue_scripts() {
+    public function enqueue_scripts()
+    {
 
         /**
@@ -86 +90 @@
          */
 
-        wp_enqueue_script( $this->plugin_name, DOT_PRESS_ROOT_URL . 'js/dist/dot-press-public.js', array( 'jquery' ), filemtime(DOT_PRESS_ROOT . 'js/dist/dot-press-public.js'), false );
+        wp_enqueue_script($this->plugin_name, DOT_PRESS_ROOT_URL . 'js/dist/dot-press-public.js', array('jquery'), filemtime(DOT_PRESS_ROOT . 'js/dist/dot-press-public.js'), false);
 
     }
 
-    public function load_renderer() {
+    public function load_renderer()
+    {
         if (DotPressWpUtils::is_front_end()) {
             global $post;
@@ -97 +102 @@
     }
 
-    public function render_block($block_content, $block) {
+    public function render_content($content)
+    {
+        if (!DotPressWpUtils::is_front_end() || is_null($this->renderer)) {
+            return $content;
+        }
+        global $post;
+        $blocks = parse_blocks($post->post_content);
+        $newBlocks = array_merge(...array_map(function ($block) {
+            $parsed = parse_blocks($this->render_block(render_block($block), $block));
+            return array_merge([$block], array_slice($parsed, 1));
+        }, $blocks));
+        return implode(array_map(function ($block) {
+            return render_block($block);
+        }, $newBlocks), '');
+    }
+
+    public function render_block($block_content, $block)
+    {
         $block_type = $block['blockName'];
 

dot-monetize-polls-quizzes/trunk/readme.txt

@@ -77 +77 @@
 == Changelog ==
 
-= 1.0 =
-* First Release
+= 1.0.6 =
+* Now using the_content hook instead of render_block hook to render widgets to fix AMP compatibility
+
+= 1.0.5 =
+* Added cache reset functionality for popular cache plugins
+
+= 1.0.4 =
+* Now resetting post cache when saving or deleting placements
+
+= 1.0.3 =
+* Tweaked placement render logic to be less prone to external plugin block usage
+
+= 1.0.2 =
+* Stopped placement renderer from triggering when block rendering outside wp loop
 
 = 1.0.1 =
 * Added explicit output for unrecognised types
 
-= 1.0.2 =
-* Stopped placement renderer from triggering when block rendering outside wp loop
-
-= 1.0.3 =
-* Tweaked placement render logic to be less prone to external plugin block usage
-
-= 1.0.4 =
-* Now resetting post cache when saving or deleting placements
-
-= 1.0.5 =
-* Added cache reset functionality for popular cache plugins
+= 1.0 =
+* First Release