Changeset 2126229

Timestamp:

07/21/2019 08:32:20 AM (6 years ago)

Author:

solarissmoke

Message:

Version 1.10.2

Location:

disable-comments/trunk

Files:

• assets/disable-comments.js (modified) (1 diff)
• assets/disable-comments.js.map (modified) (1 diff)
• disable-comments.php (modified) (4 diffs)
• src/disable-comments.js (modified) (1 diff)

disable-comments/trunk/assets/disable-comments.js

@@ -2 +2 @@
 
 wp.domReady(function () {
-  wp.blocks.getBlockTypes().forEach(function (block) {
-    if (disable_comments.disabled_blocks.includes(block.name)) {
-      wp.blocks.unregisterBlockType(block.name);
-    }
-  });
+  if (wp.blocks) {
+    wp.blocks.getBlockTypes().forEach(function (block) {
+      if (disable_comments.disabled_blocks.includes(block.name)) {
+        wp.blocks.unregisterBlockType(block.name);
+      }
+    });
+  }
 });
 //# sourceMappingURL=disable-comments.js.map

disable-comments/trunk/assets/disable-comments.js.map

@@ -1 @@
-{"version":3,"sources":["../src/disable-comments.js"],"names":["wp","domReady","blocks","getBlockTypes","forEach","block","disable_comments","disabled_blocks","includes","name","unregisterBlockType"],"mappings":";;AAAAA,EAAE,CAACC,QAAH,CAAY,YAAM;AACjBD,EAAAA,EAAE,CAACE,MAAH,CAAUC,aAAV,GAA0BC,OAA1B,CAAkC,UAACC,KAAD,EAAW;AAC5C,QAAIC,gBAAgB,CAACC,eAAjB,CAAiCC,QAAjC,CAA0CH,KAAK,CAACI,IAAhD,CAAJ,EAA2D;AAC1DT,MAAAA,EAAE,CAACE,MAAH,CAAUQ,mBAAV,CAA8BL,KAAK,CAACI,IAApC;AACA;AACD,GAJD;AAKA,CAND","sourcesContent":["wp.domReady(() => {\n\twp.blocks.getBlockTypes().forEach((block) => {\n\t\tif (disable_comments.disabled_blocks.includes(block.name)) {\n\t\t\twp.blocks.unregisterBlockType(block.name);\n\t\t}\n\t});\n});"],"file":"disable-comments.js"}
+{"version":3,"sources":["../src/disable-comments.js"],"names":["wp","domReady","blocks","getBlockTypes","forEach","block","disable_comments","disabled_blocks","includes","name","unregisterBlockType"],"mappings":";;AAAAA,EAAE,CAACC,QAAH,CAAY,YAAM;AACjB,MAAGD,EAAE,CAACE,MAAN,EAAc;AACbF,IAAAA,EAAE,CAACE,MAAH,CAAUC,aAAV,GAA0BC,OAA1B,CAAkC,UAACC,KAAD,EAAW;AAC5C,UAAIC,gBAAgB,CAACC,eAAjB,CAAiCC,QAAjC,CAA0CH,KAAK,CAACI,IAAhD,CAAJ,EAA2D;AAC1DT,QAAAA,EAAE,CAACE,MAAH,CAAUQ,mBAAV,CAA8BL,KAAK,CAACI,IAApC;AACA;AACD,KAJD;AAKA;AACD,CARD","sourcesContent":["wp.domReady(() => {\n\tif(wp.blocks) {\n\t\twp.blocks.getBlockTypes().forEach((block) => {\n\t\t\tif (disable_comments.disabled_blocks.includes(block.name)) {\n\t\t\t\twp.blocks.unregisterBlockType(block.name);\n\t\t\t}\n\t\t});\n\t}\n});\n"],"file":"disable-comments.js"}

disable-comments/trunk/disable-comments.php

@@ -4 +4 @@
 Plugin URI: https://wordpress.org/plugins/disable-comments/
 Description: Allows administrators to globally disable comments on their site. Comments can be disabled according to post type.
-Version: 1.10.1
+Version: 1.10.2
 Author: Samir Shah
 Author URI: http://www.rayofsolaris.net/
@@ -137 +137 @@
 
         // Disable "Latest comments" block in Gutenberg
-        add_action( 'admin_enqueue_scripts', array( $this, 'filter_gutenberg_blocks') );
+        add_action( 'enqueue_block_editor_assets', array( $this, 'filter_gutenberg_blocks') );
     }
 
@@ -259 +259 @@
      * Determines if scripts should be enqueued
      */
-    public function filter_gutenberg_blocks($hook) {
-        if (!in_array($hook, array('post-new.php', 'post.php'), true)) {
-            return;
-        }
-
-        if ($this->options['remove_everywhere']) {
-            return $this->disable_comments_script();
-        }
-
+    public function filter_gutenberg_blocks( $hook ) {
         global $post;
 
-        if (isset($post->post_type) && in_array($post->post_type, $this->get_disabled_post_types(), true)) {
+        if ( $this->options['remove_everywhere'] || ( isset( $post->post_type ) && in_array( $post->post_type, $this->get_disabled_post_types(), true ) ) ) {
             return $this->disable_comments_script();
         }
@@ -279 +271 @@
      */
     public function disable_comments_script() {
-        wp_enqueue_script('disable-comments-gutenberg', plugin_dir_url(__FILE__) . 'assets/disable-comments.js', array( 'wp-blocks', 'wp-dom-ready', 'wp-edit-post' ));
-        wp_localize_script('disable-comments-gutenberg', 'disable_comments', array(
-            'disabled_blocks' => array('core/latest-comments'),
-        ));
+        wp_enqueue_script( 'disable-comments-gutenberg', plugin_dir_url( __FILE__ ) . 'assets/disable-comments.js', array(), false, true );
+        wp_localize_script(
+            'disable-comments-gutenberg',
+            'disable_comments',
+            array(
+                'disabled_blocks' => array( 'core/latest-comments' ),
+            )
+        );
     }
 

disable-comments/trunk/src/disable-comments.js

@@ -1 +1 @@
 wp.domReady(() => {
-    wp.blocks.getBlockTypes().forEach((block) => {
-        if (disable_comments.disabled_blocks.includes(block.name)) {
-            wp.blocks.unregisterBlockType(block.name);
-        }
-    });
+    if(wp.blocks) {
+        wp.blocks.getBlockTypes().forEach((block) => {
+            if (disable_comments.disabled_blocks.includes(block.name)) {
+                wp.blocks.unregisterBlockType(block.name);
+            }
+        });
+    }
 });