Merge pull request #41 from CU-CommunityApps/fix-ivalid-date-ff

fix bug in invalid date in firefox and use dependency injection in drupal block

cwd_events.libraries.yml

@@ -1,9 +1,6 @@
 cwdeventslib:
   version: 8.x
   header: true
-  css:
-    theme:
-      includes/cwd_events.css: {}
   js:
     includes/cwd_events.js: {preprocess: false}
   dependencies:

includes/cwd_events.js.LICENSE.txt

@@ -14,9 +14,10 @@
 	***************************************************************************** */
 
 /**
-	 * build-url - A small library that builds a URL given its components
-	 * @version v6.0.0
-	 * @link https://github.com/steverydz/build-url#readme
+	 * A better abstraction over CSS.
+	 *
+	 * @copyright Oleg Isonen (Slobodskoi) / Isonen 2014-present
+	 * @website https://github.com/cssinjs/jss
 	 * @license MIT
 	 */
 

includes/mix-manifest.json

@@ -1,4 +1,3 @@
 {
-    "/cwd_events.js": "/cwd_events.js",
-    "/cwd_events.css": "/cwd_events.css"
+    "/cwd_events.js": "/cwd_events.js"
 }

src/Plugin/Block/EventsBlock.php

@@ -3,8 +3,10 @@
 namespace Drupal\cwd_events\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Component\Uuid\Php;
 
 /**
  * Provides an Events Block containing Localist Data.
@@ -15,7 +17,33 @@
  *   category = @Translation("Events Block"),
  * )
  */
-class EventsBlock extends BlockBase implements BlockPluginInterface {
+class EventsBlock extends BlockBase implements ContainerFactoryPluginInterface {
+  /**
+   * Service uuid.
+   *
+   * @var Drupal\Component\Uuid\Php
+   */
+  protected $uuidService;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+         $configuration,
+         $plugin_id,
+         $plugin_definition,
+         $container->get('uuid'),
+       );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, Php $uuidService) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->uuidService = $uuidService;
+  }
 
   /**
    * List of supported format options.
@@ -270,8 +298,7 @@ public function blockSubmit($form, FormStateInterface $form_state) {
     parent::blockSubmit($form, $form_state);
     $values = $form_state->getValues();
     $formatOptions = $this->formatOptions;
-    $uuid = \Drupal::service('uuid');
-    $id = $uuid->generate();
+    $id = $this->uuidService->generate();
     $this->configuration['id'] = $id;
     $this->configuration['target'] = "events-listing-$id";