Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: magefan/module-lazyload
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.0
Choose a base ref
...
head repository: magefan/module-lazyload
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Aug 13, 2017

  1. Changes for composer

    ihorvansach committed Aug 13, 2017
    Copy the full SHA
    14b5678 View commit details
  2. Change system.xml acl

    ihorvansach committed Aug 13, 2017
    Copy the full SHA
    24d7b63 View commit details

Commits on Aug 19, 2017

  1. Improvments

    ihorvansach committed Aug 19, 2017
    Copy the full SHA
    1104f03 View commit details

Commits on Sep 28, 2017

  1. Update README.md

    magefan authored Sep 28, 2017
    Copy the full SHA
    bf524cf View commit details

Commits on Mar 6, 2018

  1. Update README.md

    magefan authored Mar 6, 2018
    Copy the full SHA
    836e46c View commit details

Commits on Jun 10, 2018

  1. fix for product tabs

    magefan authored Jun 10, 2018
    Copy the full SHA
    fdeb5a1 View commit details

Commits on Jul 25, 2018

  1. Update module.xml

    magefan authored Jul 25, 2018
    Copy the full SHA
    cc5567e View commit details
  2. Update composer.json

    magefan authored Jul 25, 2018
    Copy the full SHA
    fb67e46 View commit details

Commits on Aug 8, 2018

  1. Update README.md

    magefan authored Aug 8, 2018
    Copy the full SHA
    58db76d View commit details

Commits on Dec 11, 2018

  1. Copy the full SHA
    11d157b View commit details
  2. Copy the full SHA
    56e6a3e View commit details

Commits on Dec 26, 2018

  1. Update lazy.phtml

    termos008 authored Dec 26, 2018
    Copy the full SHA
    7af0c0b View commit details
  2. Merge pull request #2 from magefan/dom-content-loaded

    Update lazy.phtml
    magefan authored Dec 26, 2018
    Copy the full SHA
    58b9041 View commit details
  3. Update lazy.phtml

    termos008 authored Dec 26, 2018
    Copy the full SHA
    8aa6c17 View commit details
  4. Merge pull request #3 from magefan/dom-content-loaded

    Update lazy.phtml
    magefan authored Dec 26, 2018
    Copy the full SHA
    ff732a9 View commit details

Commits on Jan 4, 2019

  1. Update composer.json

    magefan authored Jan 4, 2019
    Copy the full SHA
    5038ec6 View commit details
  2. Update module.xml

    magefan authored Jan 4, 2019
    Copy the full SHA
    a08f994 View commit details

Commits on Jan 29, 2019

  1. Copy the full SHA
    fab9c72 View commit details
  2. Fix for sliders

    magefan authored Jan 29, 2019
    Copy the full SHA
    e49fbcc View commit details

Commits on Jan 30, 2019

  1. Update composer.json

    magefan authored Jan 30, 2019
    Copy the full SHA
    e918597 View commit details
  2. Update module.xml

    magefan authored Jan 30, 2019
    Copy the full SHA
    1195ad7 View commit details

Commits on Jan 31, 2019

  1. Update README.md

    magefan authored Jan 31, 2019
    Copy the full SHA
    442a970 View commit details

Commits on Feb 25, 2019

  1. Update README.md

    magefan authored Feb 25, 2019
    Copy the full SHA
    03b4f29 View commit details

Commits on Mar 4, 2019

  1. Update README.md

    magefan authored Mar 4, 2019
    Copy the full SHA
    49adfba View commit details

Commits on May 14, 2019

  1. Update README.md

    magefan authored May 14, 2019
    Copy the full SHA
    72321dd View commit details

Commits on May 30, 2019

  1. Update README.md

    magefan authored May 30, 2019
    Copy the full SHA
    183deb2 View commit details

Commits on Jul 18, 2019

  1. Update README.md

    magefan authored Jul 18, 2019
    Copy the full SHA
    23a4543 View commit details
  2. Update README.md

    magefan authored Jul 18, 2019
    Copy the full SHA
    d14bd08 View commit details

Commits on Sep 6, 2019

  1. Update README.md

    magefan authored Sep 6, 2019
    Copy the full SHA
    db56b31 View commit details
  2. Update README.md

    magefan authored Sep 6, 2019
    Copy the full SHA
    606e07a View commit details

Commits on Sep 9, 2019

  1. Copy the full SHA
    fa23c25 View commit details

Commits on Sep 10, 2019

  1. Merge pull request #7 from Tjitse-E/patch-2

    Remove typo from default configuration
    magefan authored Sep 10, 2019
    Copy the full SHA
    b2257a9 View commit details
  2. Copy the full SHA
    5029a50 View commit details

Commits on Sep 12, 2019

  1. Merge pull request #8 from simonrl/issue-5

    fix missing space between attributes
    magefan authored Sep 12, 2019
    Copy the full SHA
    12064ad View commit details
  2. Update composer.json

    magefan authored Sep 12, 2019
    Copy the full SHA
    427acfd View commit details
  3. Update module.xml

    magefan authored Sep 12, 2019
    Copy the full SHA
    1ae8c88 View commit details

Commits on Oct 11, 2019

  1. Update README.md

    magefan authored Oct 11, 2019
    Copy the full SHA
    2e5176f View commit details

Commits on Nov 19, 2019

  1. Update README.md

    magefan authored Nov 19, 2019
    Copy the full SHA
    28e7a08 View commit details

Commits on Jan 3, 2020

  1. Copy the full SHA
    c4f3791 View commit details
  2. Updated lazyload JS config

    magefan authored Jan 3, 2020
    Copy the full SHA
    d963ab6 View commit details

Commits on Jan 8, 2020

  1. Copy the full SHA
    60b6d00 View commit details
  2. Update README.md

    magefan authored Jan 8, 2020
    Copy the full SHA
    3f19acb View commit details
  3. Update composer.json

    magefan authored Jan 8, 2020
    Copy the full SHA
    bfc37d7 View commit details
  4. Update module.xml

    magefan authored Jan 8, 2020
    Copy the full SHA
    b8bd3ef View commit details
  5. Merge pull request #11 from magefan/amasty-pagespeedoptimizer-integra…

    …tion
    
    integration with amasty lazy load
    magefan authored Jan 8, 2020
    Copy the full SHA
    3065368 View commit details

Commits on Jan 13, 2020

  1. Changes OSL to EULA

    ihorvansach committed Jan 13, 2020
    Copy the full SHA
    5f3e6a1 View commit details
  2. Update README.md

    magefan authored Jan 13, 2020
    Copy the full SHA
    2bf302c View commit details
  3. Update system.xml

    magefan authored Jan 13, 2020
    Copy the full SHA
    e0cb66a View commit details

Commits on Jan 24, 2020

  1. Update README.md

    magefan authored Jan 24, 2020
    Copy the full SHA
    2e78904 View commit details

Commits on Feb 4, 2020

  1. added compatibility with magefan webp

    Bohdan Berezhniy committed Feb 4, 2020
    Copy the full SHA
    cb0de46 View commit details
27 changes: 27 additions & 0 deletions Block/Adminhtml/System/Config/Form/DynamicRow.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php
/**
* Copyright © Magefan (support@magefan.com). All rights reserved.
* Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
*
* Glory to Ukraine! Glory to the heroes!
*/

declare(strict_types=1);

namespace Magefan\LazyLoad\Block\Adminhtml\System\Config\Form;

use Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray;

class DynamicRow extends AbstractFieldArray
{
/**
* Prepare rendering the new field by adding all the needed columns
*/
protected function _prepareToRender()
{
$this->addColumn('block_identifier', ['label' => __('Block Identifier'), 'style' => 'width:350px']);
$this->addColumn('first_images_to_skip', ['label' => __('First Images To Skip'), 'style' => 'width:70px']);
$this->_addAfter = false;
$this->_addButtonLabel = __('Add');
}
}
43 changes: 13 additions & 30 deletions Block/Adminhtml/System/Config/Form/Info.php
Original file line number Diff line number Diff line change
@@ -1,52 +1,35 @@
<?php
/**
* Copyright © 2017 Ihor Vansach (ihor@magefan.com). All rights reserved.
* See LICENSE.txt for license details (http://opensource.org/licenses/osl-3.0.php).
* Copyright © Magefan (support@magefan.com). All rights reserved.
* Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
*
* Glory to Ukraine! Glory to the heroes!
*/

namespace Magefan\LazyLoad\Block\Adminhtml\System\Config\Form;
declare(strict_types=1);

use Magento\Store\Model\ScopeInterface;
namespace Magefan\LazyLoad\Block\Adminhtml\System\Config\Form;

/**
* Admin blog configurations information block
*/
class Info extends \Magento\Config\Block\System\Config\Form\Field
class Info extends \Magefan\Community\Block\Adminhtml\System\Config\Form\Info
{
/**
* @var \Magento\Framework\Module\ModuleListInterface
*/
protected $moduleList;

/**
* @param \Magento\Framework\Module\ModuleListInterface $moduleList
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
* Return extension url
* @return string
*/
public function __construct(
\Magento\Framework\Module\ModuleListInterface $moduleList,
\Magento\Backend\Block\Template\Context $context,
array $data = []
) {
parent::__construct($context, $data);
$this->moduleList = $moduleList;
protected function getModuleUrl()
{
return 'https://mage' . 'fan.com/magento-2-image-lazy-load-extension';
}

/**
* Return info block html
* @param \Magento\Framework\Data\Form\Element\AbstractElement $element
* Return extension title
* @return string
*/
public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
protected function getModuleTitle()
{
$m = $this->moduleList->getOne($this->getModuleName());
$html = '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">
Lazy Load Extension v' . $m['setup_version'] . ' was developed by <a href="http://magefan.com/" target="_blank">Magefan</a>.
</div>';

return $html;
return 'Image Lazy Load Extension';
}

}
70 changes: 62 additions & 8 deletions Block/Lazy.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,89 @@
<?php
/**
* Copyright © 2017 Ihor Vansach (ihor@magefan.com). All rights reserved.
* See LICENSE.txt for license details (http://opensource.org/licenses/osl-3.0.php).
* Copyright © Magefan (support@magefan.com). All rights reserved.
* Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
*
* Glory to Ukraine! Glory to the heroes!
*/

declare(strict_types=1);

namespace Magefan\LazyLoad\Block;

use Magento\Store\Model\ScopeInterface;
use Magento\Framework\View\Element\Template;
use Magento\Framework\View\Element\Template\Context;
use Magefan\LazyLoad\Model\Config;

/**
* Init lazy load
*/
class Lazy extends \Magento\Framework\View\Element\Template
class Lazy extends Template
{
/**
* @param Context $context
* @param Config $config
* @param array $data
*/
public function __construct(
Context $context,
Config $config,
array $data = []
) {
parent::__construct($context, $data);
$this->config = $config;
}

/**
* Retrieve block html
*
* @return string
*/
protected function _toHtml()
{
if ($this->_scopeConfig->getValue(
'mflazyzoad/general/enabled',
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
)) {
if ($this->config->getEnabled()) {
return parent::_toHtml();
}

return '';
}

/**
* @return bool
*/
public function isNoScriptEnabled(): bool
{
return (bool)$this->config->isNoScriptEnabled();
}

/**
* @return bool
*/
public function getIsJavascriptLazyLoadMethod(): bool
{
return $this->config->getIsJavascriptLazyLoadMethod();
}

/**
* Retrieve lazy load config json string
*
* @return string
*/
public function getLazyLoadConfig(): string
{
$config = $this->getData('lazy_load_config');

if (!is_array($config)) {
$config = [];
}

if (!isset($config['elements_selector'])) {
$config['elements_selector'] = 'img,div';
}

if (!isset($config['data_srcset'])) {
$config['data_srcset'] = 'originalset';
}

return json_encode($config);
}
}
46 changes: 1 addition & 45 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1 @@
This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:

Licensed under the Open Software License version 3.0

1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:

a) to reproduce the Original Work in copies, either alone or as part of a collective work;

b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;

c) to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;

d) to perform the Original Work publicly; and

e) to display the Original Work publicly.

2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.

3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.

4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.

5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).

6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.

7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.

8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.

9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).

10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.

11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.

12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.

13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.

14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.

16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement)
Loading