Now using ivopetkov/client-packages-bearframework-addon.

bearcms · May 13, 2019 · 70147bf · 70147bf
1 parent dcdc4e1
commit 70147bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/autoload.php b/autoload.php
@@ -11,6 +11,6 @@
     'require' => [
         'bearcms/bearframework-addon',
         'bearframework/localization-addon',
-        'ivopetkov/client-shortcuts-bearframework-addon'
+        'ivopetkov/client-packages-bearframework-addon'
     ]
 ]);
diff --git a/components/embedElement.php b/components/embedElement.php
@@ -135,7 +135,7 @@
 }
 ?><html>
     <head>
-        <link rel="client-shortcuts-embed" name="-bearcms-embed-element-responsively-lazy">
+        <link rel="client-packages-embed" name="-bearcms-embed-element-responsively-lazy">
     </head>
     <body><?= $content ?></body>
 </html>
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "bearcms/bearframework-addon": "1.*",
         "bearframework/localization-addon": "0.2.*",
         "ivopetkov/html5-dom-document-php": "2.*",
-        "ivopetkov/client-shortcuts-bearframework-addon": "0.1.*"
+        "ivopetkov/client-packages-bearframework-addon": "0.1.*"
     },
     "autoload": {
         "files": ["autoload.php"]

diff --git a/index.php b/index.php
@@ -56,19 +56,10 @@
                     ]);
                 };
 
-                $app->clientShortcuts
-                ->add('-bearcms-embed-element-responsively-lazy', function(IvoPetkov\BearFrameworkAddons\ClientShortcut $shortcut) use ($context) {
-                    $shortcut->requirements[] = [
-                        'type' => 'file',
-                        'url' => $context->assets->getURL('assets/responsivelyLazy.min.js', ['cacheMaxAge' => 999999999, 'version' => 2]),
-                        'async' => true,
-                        'mimeType' => 'text/javascript'
-                    ];
-                    $shortcut->requirements[] = [
-                        'type' => 'text',
-                        'value' => '.responsively-lazy:not(img){position:relative;height:0;}.responsively-lazy:not(img)>img{position:absolute;top:0;left:0;width:100%;height:100%}img.responsively-lazy{width:100%;}',
-                        'mimeType' => 'text/css'
-                    ];
+                $app->clientPackages
+                ->add('-bearcms-embed-element-responsively-lazy', 1, function(IvoPetkov\BearFrameworkAddons\ClientPackage $package) use ($context) {
+                    $package->addJSFile($context->assets->getURL('assets/responsivelyLazy.min.js', ['cacheMaxAge' => 999999999, 'version' => 2]), ['async' => true]);
+                    $package->addCSSCode('.responsively-lazy:not(img){position:relative;height:0;}.responsively-lazy:not(img)>img{position:absolute;top:0;left:0;width:100%;height:100%}img.responsively-lazy{width:100%;}');
                 });
             };
         });