Remove lazyload functionality from SizedImage

dnadesign · Apr 18, 2019 · a8ae436 · a8ae436
1 parent 9be6d9e
commit a8ae436
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 70 deletions.
diff --git a/src/models/SizedImage.php b/src/models/SizedImage.php
@@ -7,64 +7,51 @@
 
 class SizedImage extends DataObject
 {
-	private static $table_name = 'SizedImage';
-
-	private static $db = [
-		'Name' => 'Varchar(255)',
-		'Size' => 'Varchar(100)',
-		'Rule' => 'Varchar(100)'
-	];
-
-	private static $has_one = [
-		'Image' => Image::class
-	];
-
-	private static $owns = [
-        'Image'
-    ];
-
-	private static $summary_fields = [
-		'ID' => 'ID',
-		'Size' => 'Size',
-		'Image.CMSThumbnail' => 'Thumbnail'
-	];
-
-	public function getCMSFields()
-	{
-		$fields = parent::getCMSFields();
-
-		$name = $fields->dataFieldByName('Name');
-		$name->setDescription('For reference only');
-
-		return $fields;
-	}
-
-	/**
-	* This object should exists only if it has an image
-	*/
-	public function exists()
-	{
-		return $this->Image() && $this->Image()->exists();
-	}
-
-	/**
-	* Proxy method to be able to render the lazyloaded template
-	* @see DNADesign\Images\Extensions\LazyloadedImage
-	*/
-	public function getLazyloaded()
-	{
-		if ($this->Image()->exists() && $this->Image()->hasMethod('getLazyloaded')) {
-			return $this->Image()->getLazyloaded();
-		}
-
-		return $this->Image();
-	}
-
-	/**
-	* Render normal image by default
-	*/
-	public function forTemplate()
-	{
-		return ($this->Image()->exists()) ? $this->Image()->fortemplate() : '';
-	}
+  private static $table_name = 'SizedImage';
+
+  private static $db = [
+    'Name' => 'Varchar(255)',
+    'Size' => 'Varchar(100)',
+    'Rule' => 'Varchar(100)'
+  ];
+
+  private static $has_one = [
+    'Image' => Image::class
+  ];
+
+  private static $owns = [
+    'Image'
+  ];
+
+  private static $summary_fields = [
+    'ID' => 'ID',
+    'Size' => 'Size',
+    'Image.CMSThumbnail' => 'Thumbnail'
+  ];
+
+  public function getCMSFields()
+  {
+    $fields = parent::getCMSFields();
+
+    $name = $fields->dataFieldByName('Name');
+    $name->setDescription('For reference only');
+
+    return $fields;
+  }
+
+  /**
+  * This object should exists only if it has an image
+  */
+  public function exists()
+  {
+    return $this->Image() && $this->Image()->exists();
+  }
+
+  /**
+  * Render normal image by default
+  */
+  public function forTemplate()
+  {
+    return ($this->Image()->exists()) ? $this->Image()->fortemplate() : '';
+  }
 }
diff --git a/src/templates/DNADesign/Images/Models/MultipleSizeImage.ss b/src/templates/DNADesign/Images/Models/MultipleSizeImage.ss
@@ -1,15 +1,6 @@
-<% if $Lazyload %>
 <picture>
-	<% loop $Sources %>
-		<source media="($Rule)" data-srcset="$Image.URL">
-	<% end_loop %>
-	$BaseImage.Lazyloaded
-</picture>
-<% else %>
-	<picture>
 	<% loop $Sources %>
 		<source media="($Rule)" srcset="$Image.URL">
 	<% end_loop %>
-	$BaseImage
+	{$BaseImage}
 </picture>
-<% end_if %>