better fix for trash

joomla · Aug 25, 2020 · 3cbf5ac · 3cbf5ac
1 parent b2648c4
commit 3cbf5ac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/layouts/joomla/button/iconclass.php b/layouts/joomla/button/iconclass.php
@@ -14,13 +14,13 @@
 
 if(strpos($icon, 'fa-') !== false)
 {
-	$icon = 'fas ' . $icon;
+	$icon = 'fas ' . str_ireplace('fas ','', $icon);
 }
-elseif(strpos($icon, 'icon-') !== false)
+elseif (strpos($icon, 'icon-') !== false)
 {
 	$icon = $icon;
 }
-elseif  ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
+elseif ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
 {
 	$icon = 'fas fa-folder';
 }
@@ -72,7 +72,7 @@
 {
 	$icon = 'fas fa-compress';
 }
-elseif ($icon === 'purge' || $icon === 'trash')
+elseif ($icon === 'purge')
 {
 	$icon = 'fas fa-trash';
 }

diff --git a/layouts/joomla/toolbar/iconclass.php b/layouts/joomla/toolbar/iconclass.php
@@ -14,7 +14,7 @@
 
 if(strpos($icon, 'fa-') !== false)
 {
-	$icon = 'fas ' . $icon;
+	$icon = 'fas ' . str_ireplace('fas ','', $icon);
 }
 elseif(strpos($icon, 'icon-') !== false)
 {
@@ -72,7 +72,7 @@
 {
 	$icon = 'fas fa-compress';
 }
-elseif ($icon === 'purge' || $icon === 'trash')
+elseif ($icon === 'purge')
 {
 	$icon = 'fas fa-trash';
 }

diff --git a/libraries/src/Toolbar/CoreButtonsTrait.php b/libraries/src/Toolbar/CoreButtonsTrait.php
@@ -332,7 +332,7 @@ public function delete(string $task, string $text = 'JTOOLBAR_DELETE'): ConfirmB
 	 */
 	public function trash(string $task, string $text = 'JTOOLBAR_TRASH'): StandardButton
 	{
-		return $this->standardButton('trash', $text)
+		return $this->standardButton('fa-trash', $text)
 			->task($task);
 	}
 

diff --git a/libraries/src/Toolbar/ToolbarButton.php b/libraries/src/Toolbar/ToolbarButton.php
@@ -197,6 +197,7 @@ protected function renderButton(array &$options): string
 
 		// Isolate button class from icon class
 		$buttonClass = str_replace('fas fa-', '', $this->getName());
+		$buttonClass = str_ireplace('fa-', '', $buttonClass);
 		$iconclass = $options['btnClass'] ?? '';
 		$options['btnClass'] = 'button-' . $buttonClass . ' ' . $iconclass;