Merge pull request #4 from Misfits-BE/develop

Develop

Author: Tjoosten

CHANGELOG.md

@@ -5,7 +5,6 @@ All notable changes to `misfits/toastr` will be documented in this file.
 ## 1.1.0 - XXXX-XX-XX
 
 - Fix #1 | Fix typo. (`signleton` to `singleton`)
-- Bring the javascript defer option to the package
 
 ## 1.0.0 - 2018-06-24
 

README.md

@@ -25,14 +25,6 @@ Include jQuery and [toastr.js](https://github.com/CodeSeven/toastr) in your mast
 {!! Toastr::render() !!}
 ```
 
-If you defer the loading of your scripts include `Toastr::render(true)`
-
-```html
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js" defer></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js" defer></script>
-{!! Toastr::render(true) !!}
-```
-
 Call one of these methods in your controllers to insert a toast:
   - `Toastr::warning($message, $title = null, $options = [])` - add a warning toast
   - `Toastr::error($message, $title = null, $options = [])` - add an error toast

composer.json

@@ -23,7 +23,7 @@
     "extra": {
         "laravel": {
            "providers": ["ActivismeBe\\Toastr\\ToastrServiceProvider"],
-           "aliases": {"Toastr": "ActivismeBe\\Toastr\\ToastrFacade"}
+           "aliases": {"Toastr": "ActivismeBe\\Toastr\\Facade\\Toastr"}
         }
     }
 }

src/ToastrFacade.php src/Facade/Toastr.phpsrc/ToastrFacade.php renamed to src/Facade/Toastr.php

@@ -1,6 +1,6 @@
 <?php 
 
-namespace ActivismeBe\Toastr; 
+namespace ActivismeBe\Toastr\Facade; 
 
 use Illuminate\Support\Facades\Facade; 
 
@@ -11,9 +11,9 @@
  *
  * @author      Kamal Nasser <kamal@kamalnasser.net>
  * @copyright   2013 Kamal Nasser <kamal@kamalnasser.net>
- * @package     ActivismeBe\Toastr
+ * @package     ActivismeBe\Toastr\Facade
  */
-class ToastrFacade extends Facade 
+class Toastr extends Facade 
 {
     /**
      * Get the register name of the component. 
@@ -22,6 +22,6 @@ class ToastrFacade extends Facade
      */
     protected static function getFacadeAccessor(): string 
     {
-        return "Toastr";
+        return "toastr";
     }
 }

src/Toastr.php

@@ -54,21 +54,13 @@ public function __construct(SessionManager $session, Repository $config)
     /**
      * Render the notifications script tag 
      * 
-     * @param  bool $defer Indicates that the resources are loading with deferred option or not.
      * @return string
      */
-    public function render(bool $defer = false): string 
+    public function render(): string 
     {
         $notifications = $this->session->get('toastr::notifications'); 
         $output        = '<script type="text/javascript">';
         $lastconfig    = [];
-
-        if ($defer) {
-            $output = 'window.addEventListener("DOMContentLoaded", function() {
-            (function($) {
-                $(document).ready(function() {
-                    $(function(){';
-        }
 
         if (! $notifications) { // Notifications are empty so register a empty array under the variable.
             $notifications = [];
@@ -96,13 +88,6 @@ public function render(bool $defer = false): string
                 (isset($notification['title']) ? ", '" . str_replace("'", "\\'", htmlentities($notification['title'])) . "'" : null) . ');';
         }
 
-        if ($defer) {
-                $output = '});
-                    });
-                })(jQuery);
-            });';
-        }
-
         $output .= '</script>';
 
         return $output;