Merge branch 'release/v1.1.1'

Author: bgartenmann

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v1.1.1
+##  11/03/2017
+
+1. [](#bugfix)
+    * enable `onPageContentProcessed` and `onTwigSiteVariables` directly in `onPluginsInitialized`. Otherwise it would not work, if another plugin uses the same hooks (like grav-plugin-shortcode-core).
+2. [](#improved)
+    * only include css and js files, if the plugin is active on current page
+
+
 # v1.1.0
 ##  10/27/2017
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Simple Responsive Tables
-version: 1.1.0
+version: 1.1.1
 description: Wraps tables in a div, enabling them to be scrolled vertically on small screens.
 icon: table
 author:

simple-responsive-tables.php

@@ -1,6 +1,7 @@
 <?php
 namespace Grav\Plugin;
 
+use Grav\Common\Page\Page;
 use Grav\Common\Plugin;
 use RocketTheme\Toolbox\Event\Event;
 
@@ -40,38 +41,29 @@ public function onPluginsInitialized()
 
     // Enable the main event we are interested in
     $this->enable([
-        'onPageInitialized' => ['onPageInitialized', 0]
+        'onPageContentProcessed' => ['onPageContentProcessed', 0],
+        'onTwigSiteVariables' => ['onTwigSiteVariables', 0]
     ]);
   }
 
-  public function onPageInitialized()
-    {
-        if ($this->isAdmin()) {
-            return;
-        }
-
-        /** @var Page $page */
-        $page = $this->grav['page'];
-
-        $config = $this->mergeConfig($page);
-        $active = $config->get('active', $config->get('process'));
-
-        if ($active) {
-            $this->enable([
-                'onPageContentProcessed' => ['onPageContentProcessed', 0],
-                'onTwigSiteVariables' => ['onTwigSiteVariables', 0]
-            ]);
-        }
-    }
-
   /**
+   * Process shortcodes after Grav's processing, but before caching
    * Find tables in page content and wrap it with two divs
+   * @param Event $event
    * @return void
    */
   public function onPageContentProcessed(Event $event)
   {
     /** @var Page $page */
-    $page = $this->grav['page'];
+    $page = $event['page'];
+    $config = $this->mergeConfig($page);
+
+    $this->active = $config->get('active', $config->get('process'));
+
+    // if the plugin is not active (either global or on page) exit
+    if (!$this->active) {
+        return;
+    }
 
     $raw_content = $page->content();
 
@@ -89,7 +81,9 @@ public function onPageContentProcessed(Event $event)
   */
   public function onTwigSiteVariables()
   {
-    $this->grav['assets']->add('plugin://simple-responsive-tables/assets/css/simple-responsive-tables.css');
-    $this->grav['assets']->add('plugin://simple-responsive-tables/assets/js/simple-responsive-tables.js');
+    if($this->active) {
+      $this->grav['assets']->add('plugin://simple-responsive-tables/assets/css/simple-responsive-tables.css');
+      $this->grav['assets']->add('plugin://simple-responsive-tables/assets/js/simple-responsive-tables.js');
+    }
   }
 }