Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 6 commits into from
Nov 24, 2020
Merged

Throw out toenail clippings #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df41915
Remove toenail thumbnail references, we no longer use them.
jasonvarga Nov 24, 2020
87643d7
Remove standalone small preset. There will always be an orientation s…
jasonvarga Nov 24, 2020
5b5e2f0
Tidy command
jasonvarga Nov 24, 2020
3622c83
Use method
jasonvarga Nov 24, 2020
86f8ef6
New simpler manipulator methods through Image facade. Deprecate the e…
jasonvarga Nov 24, 2020
906d620
Add missing parent construct
jasonvarga Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions resources/js/components/fieldtypes/assets/Asset.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
return this.asset.thumbnail;
},

toenail() {
return this.asset.toenail;
},

label() {
return this.asset.basename;
}
Expand Down
5 changes: 4 additions & 1 deletion src/Config.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
* Get the image manipulation presets.
*
* @return array
* @deprecated Use Statamic\Facades\Image::userManipulationPresets()
* or Image::manipulationPresets() to get merged with CP presets.
*/
public function getImageManipulationPresets()
{
return config('statamic.assets.image_manipulation.presets', []);
return Image::userManipulationPresets();
}
}
24 changes: 12 additions & 12 deletions src/Console/Commands/AssetsGeneratePresets.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
protected $description = 'Generate asset preset manipulations.';

/**
* @var ImageGenerator
* @var PresetGenerator
*/
protected $imageGenerator;
protected $generator;

/**
* @var \Statamic\Assets\AssetCollection
*/
protected $imageAssets;

public function __construct(PresetGenerator $generator)
{
$this->generator = $generator;
parent::__construct();
}

/**
* Execute the console command.
*
* @param ImageGenerator $imageGenerator
*/
public function handle(ImageGenerator $imageGenerator)
public function handle()
{
$this->imageGenerator = $imageGenerator;

$this->imageAssets = Asset::all()->filter(function ($asset) {
return $asset->isImage();
});
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
*/
protected function generateUserPresets()
{
$presets = config('statamic.assets.image_manipulation.presets', []);
$presets = Image::userManipulationPresets();

if (empty($presets)) {
return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
*/
private function generatePresets($presets)
{
$generator = new PresetGenerator($this->imageGenerator, $presets);

foreach ($presets as $preset => $params) {
$bar = $this->output->createProgressBar($this->imageAssets->count());
$bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

foreach ($this->imageAssets as $asset) {
$bar->setMessage($asset->basename(), 'filename');
$generator->generate($asset, $preset);
$this->generator->generate($asset, $preset);
$bar->advance();
}

Expand Down
4 changes: 3 additions & 1 deletion src/Facades/Image.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
* @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
* @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
* @method static array getCpImageManipulationPresets()
* @method static array manipulationPresets()
* @method static array userManipulationPresets()
* @method static array cpManipulationPresets()
*
* @see \Statamic\Imaging\Manager
*/
Expand Down
1 change: 0 additions & 1 deletion src/Http/Resources/CP/Assets/Asset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
'height' => $this->height(),
'preview' => $this->previewUrl(),
'thumbnail' => $this->thumbnailUrl('small'),
'toenail' => $this->thumbnailUrl('large'),
];
}),

Expand Down
1 change: 0 additions & 1 deletion src/Http/Resources/CP/Assets/FolderAsset.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
return [
'is_image' => true,
'thumbnail' => $this->thumbnailUrl('small'),
'toenail' => $this->thumbnailUrl('large'),
];
}),

Expand Down
18 changes: 1 addition & 17 deletions src/Imaging/GlideServer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
'response' => new LaravelResponseFactory(app('request')),
'driver' => Config::get('statamic.assets.image_manipulation.driver'),
'cache_with_file_extensions' => true,
'presets' => $this->presets(),
'presets' => Image::manipulationPresets(),
]);
}

Expand All@@ -37,20 +37,4 @@ public function cachePath()
? Config::get('statamic.assets.image_manipulation.cache_path')
: storage_path('statamic/glide');
}

/**
* Get glide presets.
*
* @return array
*/
private function presets()
{
$presets = Config::getImageManipulationPresets();

if (config('statamic.cp.enabled')) {
$presets = array_merge($presets, Image::getCpImageManipulationPresets());
}

return $presets;
}
}
38 changes: 35 additions & 3 deletions src/Imaging/Manager.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
return app(ImageManipulator::class);
}

/**
* Get the image manipulation presets.
*
* @return array
*/
public function manipulationPresets()
{
$presets = $this->userManipulationPresets();

if (config('statamic.cp.enabled')) {
$presets = array_merge($presets, $this->cpManipulationPresets());
}

return $presets;
}

/**
* Get the user defined image manipulation presets.
*
* @return array
*/
public function userManipulationPresets()
{
return config('statamic.assets.image_manipulation.presets', []);
}

/**
* Get the image manipulation presets required by the control panel.
*
* @return array
*/
public function getCpImageManipulationPresets()
public function cpManipulationPresets()
{
return [
'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
];
}

/**
* @deprecated
*/
public function getCpImageManipulationPresets()
{
return $this->cpManipulationPresets();
}
}
3 changes: 2 additions & 1 deletion src/Providers/GlideServiceProvider.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
$this->app->bind(PresetGenerator::class, function ($app) {
return new PresetGenerator(
$app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
);
});
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/Assets/BrowserTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
'data' => [
'assets' => [
['id', 'size_formatted', 'last_modified_relative', 'actions'],
['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
],
'folder' => [
'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Nov 24, 2020
 Merged


Throw out toenail clippings
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
df41915

Remove toenail thumbnail references, we no longer use them.


jasonvarga Nov 24, 2020
87643d7

Remove standalone small preset. There will always be an orientation s…


jasonvarga Nov 24, 2020
5b5e2f0

Tidy command


jasonvarga Nov 24, 2020
3622c83

Use method


jasonvarga Nov 24, 2020
86f8ef6

New simpler manipulator methods through Image facade. Deprecate the e…


jasonvarga Nov 24, 2020
906d620

Add missing parent construct


jasonvarga Nov 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
resources/js/components/fieldtypes/assets/Asset.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
 return this.asset.thumbnail;
 },

 toenail() {
 return this.asset.toenail;
 },

 label() {
 return this.asset.basename;
 }
Expand Down

5 changes: 4 additions & 1 deletion
src/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
 * Get the image manipulation presets.
 *
 * @return array
 * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
 * or Image::manipulationPresets() to get merged with CP presets.
 */
 public function getImageManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 return Image::userManipulationPresets();
 }
}

24 changes: 12 additions & 12 deletions
src/Console/Commands/AssetsGeneratePresets.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
 protected $description = 'Generate asset preset manipulations.';

 /**
 * @var ImageGenerator
 * @var PresetGenerator
 */
 protected $imageGenerator;
 protected $generator;

 /**
 * @var \Statamic\Assets\AssetCollection
 */
 protected $imageAssets;

 public function __construct(PresetGenerator $generator)
 {
 $this->generator = $generator;
 parent::__construct();
 }

 /**
 * Execute the console command.
 *
 * @param ImageGenerator $imageGenerator
 */
 public function handle(ImageGenerator $imageGenerator)
 public function handle()
 {
 $this->imageGenerator = $imageGenerator;

 $this->imageAssets = Asset::all()->filter(function ($asset) {
 return $asset->isImage();
 });
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
 */
 protected function generateUserPresets()
 {
 $presets = config('statamic.assets.image_manipulation.presets', []);
 $presets = Image::userManipulationPresets();

 if (empty($presets)) {
 return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
 */
 private function generatePresets($presets)
 {
 $generator = new PresetGenerator($this->imageGenerator, $presets);

 foreach ($presets as $preset => $params) {
 $bar = $this->output->createProgressBar($this->imageAssets->count());
 $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

 foreach ($this->imageAssets as $asset) {
 $bar->setMessage($asset->basename(), 'filename');
 $generator->generate($asset, $preset);
 $this->generator->generate($asset, $preset);
 $bar->advance();
 }

Expand Down

4 changes: 3 additions & 1 deletion
src/Facades/Image.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
 * @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
 * @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
 * @method static array getCpImageManipulationPresets()
 * @method static array manipulationPresets()
 * @method static array userManipulationPresets()
 * @method static array cpManipulationPresets()
 *
 * @see \Statamic\Imaging\Manager
 */
Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/Asset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
 'height' => $this->height(),
 'preview' => $this->previewUrl(),
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/FolderAsset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
 return [
 'is_image' => true,
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

18 changes: 1 addition & 17 deletions
src/Imaging/GlideServer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
 'response' => new LaravelResponseFactory(app('request')),
 'driver' => Config::get('statamic.assets.image_manipulation.driver'),
 'cache_with_file_extensions' => true,
 'presets' => $this->presets(),
 'presets' => Image::manipulationPresets(),
 ]);
 }

Expand All@@ -37,20 +37,4 @@ public function cachePath()
 ? Config::get('statamic.assets.image_manipulation.cache_path')
 : storage_path('statamic/glide');
 }

 /**
 * Get glide presets.
 *
 * @return array
 */
 private function presets()
 {
 $presets = Config::getImageManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, Image::getCpImageManipulationPresets());
 }

 return $presets;
 }
}

38 changes: 35 additions & 3 deletions
src/Imaging/Manager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
 return app(ImageManipulator::class);
 }

 /**
 * Get the image manipulation presets.
 *
 * @return array
 */
 public function manipulationPresets()
 {
 $presets = $this->userManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, $this->cpManipulationPresets());
 }

 return $presets;
 }

 /**
 * Get the user defined image manipulation presets.
 *
 * @return array
 */
 public function userManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 }

 /**
 * Get the image manipulation presets required by the control panel.
 *
 * @return array
 */
 public function getCpImageManipulationPresets()
 public function cpManipulationPresets()
 {
 return [
 'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
 'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
 ];
 }

 /**
 * @deprecated
 */
 public function getCpImageManipulationPresets()
 {
 return $this->cpManipulationPresets();
 }
}

3 changes: 2 additions & 1 deletion
src/Providers/GlideServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
 $this->app->bind(PresetGenerator::class, function ($app) {
 return new PresetGenerator(
 $app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
 );
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/Feature/Assets/BrowserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
 'data' => [
 'assets' => [
 ['id', 'size_formatted', 'last_modified_relative', 'actions'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
 ],
 'folder' => [
 'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Nov 24, 2020
 Merged


Throw out toenail clippings
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
df41915

Remove toenail thumbnail references, we no longer use them.


jasonvarga Nov 24, 2020
87643d7

Remove standalone small preset. There will always be an orientation s…


jasonvarga Nov 24, 2020
5b5e2f0

Tidy command


jasonvarga Nov 24, 2020
3622c83

Use method


jasonvarga Nov 24, 2020
86f8ef6

New simpler manipulator methods through Image facade. Deprecate the e…


jasonvarga Nov 24, 2020
906d620

Add missing parent construct


jasonvarga Nov 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
resources/js/components/fieldtypes/assets/Asset.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
 return this.asset.thumbnail;
 },

 toenail() {
 return this.asset.toenail;
 },

 label() {
 return this.asset.basename;
 }
Expand Down

5 changes: 4 additions & 1 deletion
src/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
 * Get the image manipulation presets.
 *
 * @return array
 * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
 * or Image::manipulationPresets() to get merged with CP presets.
 */
 public function getImageManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 return Image::userManipulationPresets();
 }
}

24 changes: 12 additions & 12 deletions
src/Console/Commands/AssetsGeneratePresets.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
 protected $description = 'Generate asset preset manipulations.';

 /**
 * @var ImageGenerator
 * @var PresetGenerator
 */
 protected $imageGenerator;
 protected $generator;

 /**
 * @var \Statamic\Assets\AssetCollection
 */
 protected $imageAssets;

 public function __construct(PresetGenerator $generator)
 {
 $this->generator = $generator;
 parent::__construct();
 }

 /**
 * Execute the console command.
 *
 * @param ImageGenerator $imageGenerator
 */
 public function handle(ImageGenerator $imageGenerator)
 public function handle()
 {
 $this->imageGenerator = $imageGenerator;

 $this->imageAssets = Asset::all()->filter(function ($asset) {
 return $asset->isImage();
 });
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
 */
 protected function generateUserPresets()
 {
 $presets = config('statamic.assets.image_manipulation.presets', []);
 $presets = Image::userManipulationPresets();

 if (empty($presets)) {
 return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
 */
 private function generatePresets($presets)
 {
 $generator = new PresetGenerator($this->imageGenerator, $presets);

 foreach ($presets as $preset => $params) {
 $bar = $this->output->createProgressBar($this->imageAssets->count());
 $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

 foreach ($this->imageAssets as $asset) {
 $bar->setMessage($asset->basename(), 'filename');
 $generator->generate($asset, $preset);
 $this->generator->generate($asset, $preset);
 $bar->advance();
 }

Expand Down

4 changes: 3 additions & 1 deletion
src/Facades/Image.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
 * @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
 * @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
 * @method static array getCpImageManipulationPresets()
 * @method static array manipulationPresets()
 * @method static array userManipulationPresets()
 * @method static array cpManipulationPresets()
 *
 * @see \Statamic\Imaging\Manager
 */
Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/Asset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
 'height' => $this->height(),
 'preview' => $this->previewUrl(),
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/FolderAsset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
 return [
 'is_image' => true,
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

18 changes: 1 addition & 17 deletions
src/Imaging/GlideServer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
 'response' => new LaravelResponseFactory(app('request')),
 'driver' => Config::get('statamic.assets.image_manipulation.driver'),
 'cache_with_file_extensions' => true,
 'presets' => $this->presets(),
 'presets' => Image::manipulationPresets(),
 ]);
 }

Expand All@@ -37,20 +37,4 @@ public function cachePath()
 ? Config::get('statamic.assets.image_manipulation.cache_path')
 : storage_path('statamic/glide');
 }

 /**
 * Get glide presets.
 *
 * @return array
 */
 private function presets()
 {
 $presets = Config::getImageManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, Image::getCpImageManipulationPresets());
 }

 return $presets;
 }
}

38 changes: 35 additions & 3 deletions
src/Imaging/Manager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
 return app(ImageManipulator::class);
 }

 /**
 * Get the image manipulation presets.
 *
 * @return array
 */
 public function manipulationPresets()
 {
 $presets = $this->userManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, $this->cpManipulationPresets());
 }

 return $presets;
 }

 /**
 * Get the user defined image manipulation presets.
 *
 * @return array
 */
 public function userManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 }

 /**
 * Get the image manipulation presets required by the control panel.
 *
 * @return array
 */
 public function getCpImageManipulationPresets()
 public function cpManipulationPresets()
 {
 return [
 'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
 'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
 ];
 }

 /**
 * @deprecated
 */
 public function getCpImageManipulationPresets()
 {
 return $this->cpManipulationPresets();
 }
}

3 changes: 2 additions & 1 deletion
src/Providers/GlideServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
 $this->app->bind(PresetGenerator::class, function ($app) {
 return new PresetGenerator(
 $app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
 );
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/Feature/Assets/BrowserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
 'data' => [
 'assets' => [
 ['id', 'size_formatted', 'last_modified_relative', 'actions'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
 ],
 'folder' => [
 'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Nov 24, 2020
 Merged


Throw out toenail clippings
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
df41915

Remove toenail thumbnail references, we no longer use them.


jasonvarga Nov 24, 2020
87643d7

Remove standalone small preset. There will always be an orientation s…


jasonvarga Nov 24, 2020
5b5e2f0

Tidy command


jasonvarga Nov 24, 2020
3622c83

Use method


jasonvarga Nov 24, 2020
86f8ef6

New simpler manipulator methods through Image facade. Deprecate the e…


jasonvarga Nov 24, 2020
906d620

Add missing parent construct


jasonvarga Nov 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
resources/js/components/fieldtypes/assets/Asset.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
 return this.asset.thumbnail;
 },

 toenail() {
 return this.asset.toenail;
 },

 label() {
 return this.asset.basename;
 }
Expand Down

5 changes: 4 additions & 1 deletion
src/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
 * Get the image manipulation presets.
 *
 * @return array
 * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
 * or Image::manipulationPresets() to get merged with CP presets.
 */
 public function getImageManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 return Image::userManipulationPresets();
 }
}

24 changes: 12 additions & 12 deletions
src/Console/Commands/AssetsGeneratePresets.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
 protected $description = 'Generate asset preset manipulations.';

 /**
 * @var ImageGenerator
 * @var PresetGenerator
 */
 protected $imageGenerator;
 protected $generator;

 /**
 * @var \Statamic\Assets\AssetCollection
 */
 protected $imageAssets;

 public function __construct(PresetGenerator $generator)
 {
 $this->generator = $generator;
 parent::__construct();
 }

 /**
 * Execute the console command.
 *
 * @param ImageGenerator $imageGenerator
 */
 public function handle(ImageGenerator $imageGenerator)
 public function handle()
 {
 $this->imageGenerator = $imageGenerator;

 $this->imageAssets = Asset::all()->filter(function ($asset) {
 return $asset->isImage();
 });
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
 */
 protected function generateUserPresets()
 {
 $presets = config('statamic.assets.image_manipulation.presets', []);
 $presets = Image::userManipulationPresets();

 if (empty($presets)) {
 return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
 */
 private function generatePresets($presets)
 {
 $generator = new PresetGenerator($this->imageGenerator, $presets);

 foreach ($presets as $preset => $params) {
 $bar = $this->output->createProgressBar($this->imageAssets->count());
 $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

 foreach ($this->imageAssets as $asset) {
 $bar->setMessage($asset->basename(), 'filename');
 $generator->generate($asset, $preset);
 $this->generator->generate($asset, $preset);
 $bar->advance();
 }

Expand Down

4 changes: 3 additions & 1 deletion
src/Facades/Image.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
 * @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
 * @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
 * @method static array getCpImageManipulationPresets()
 * @method static array manipulationPresets()
 * @method static array userManipulationPresets()
 * @method static array cpManipulationPresets()
 *
 * @see \Statamic\Imaging\Manager
 */
Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/Asset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
 'height' => $this->height(),
 'preview' => $this->previewUrl(),
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/FolderAsset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
 return [
 'is_image' => true,
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

18 changes: 1 addition & 17 deletions
src/Imaging/GlideServer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
 'response' => new LaravelResponseFactory(app('request')),
 'driver' => Config::get('statamic.assets.image_manipulation.driver'),
 'cache_with_file_extensions' => true,
 'presets' => $this->presets(),
 'presets' => Image::manipulationPresets(),
 ]);
 }

Expand All@@ -37,20 +37,4 @@ public function cachePath()
 ? Config::get('statamic.assets.image_manipulation.cache_path')
 : storage_path('statamic/glide');
 }

 /**
 * Get glide presets.
 *
 * @return array
 */
 private function presets()
 {
 $presets = Config::getImageManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, Image::getCpImageManipulationPresets());
 }

 return $presets;
 }
}

38 changes: 35 additions & 3 deletions
src/Imaging/Manager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
 return app(ImageManipulator::class);
 }

 /**
 * Get the image manipulation presets.
 *
 * @return array
 */
 public function manipulationPresets()
 {
 $presets = $this->userManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, $this->cpManipulationPresets());
 }

 return $presets;
 }

 /**
 * Get the user defined image manipulation presets.
 *
 * @return array
 */
 public function userManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 }

 /**
 * Get the image manipulation presets required by the control panel.
 *
 * @return array
 */
 public function getCpImageManipulationPresets()
 public function cpManipulationPresets()
 {
 return [
 'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
 'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
 ];
 }

 /**
 * @deprecated
 */
 public function getCpImageManipulationPresets()
 {
 return $this->cpManipulationPresets();
 }
}

3 changes: 2 additions & 1 deletion
src/Providers/GlideServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
 $this->app->bind(PresetGenerator::class, function ($app) {
 return new PresetGenerator(
 $app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
 );
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/Feature/Assets/BrowserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
 'data' => [
 'assets' => [
 ['id', 'size_formatted', 'last_modified_relative', 'actions'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
 ],
 'folder' => [
 'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Nov 24, 2020
 Merged


Throw out toenail clippings
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
df41915

Remove toenail thumbnail references, we no longer use them.


jasonvarga Nov 24, 2020
87643d7

Remove standalone small preset. There will always be an orientation s…


jasonvarga Nov 24, 2020
5b5e2f0

Tidy command


jasonvarga Nov 24, 2020
3622c83

Use method


jasonvarga Nov 24, 2020
86f8ef6

New simpler manipulator methods through Image facade. Deprecate the e…


jasonvarga Nov 24, 2020
906d620

Add missing parent construct


jasonvarga Nov 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
resources/js/components/fieldtypes/assets/Asset.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
 return this.asset.thumbnail;
 },

 toenail() {
 return this.asset.toenail;
 },

 label() {
 return this.asset.basename;
 }
Expand Down

5 changes: 4 additions & 1 deletion
src/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
 * Get the image manipulation presets.
 *
 * @return array
 * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
 * or Image::manipulationPresets() to get merged with CP presets.
 */
 public function getImageManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 return Image::userManipulationPresets();
 }
}

24 changes: 12 additions & 12 deletions
src/Console/Commands/AssetsGeneratePresets.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
 protected $description = 'Generate asset preset manipulations.';

 /**
 * @var ImageGenerator
 * @var PresetGenerator
 */
 protected $imageGenerator;
 protected $generator;

 /**
 * @var \Statamic\Assets\AssetCollection
 */
 protected $imageAssets;

 public function __construct(PresetGenerator $generator)
 {
 $this->generator = $generator;
 parent::__construct();
 }

 /**
 * Execute the console command.
 *
 * @param ImageGenerator $imageGenerator
 */
 public function handle(ImageGenerator $imageGenerator)
 public function handle()
 {
 $this->imageGenerator = $imageGenerator;

 $this->imageAssets = Asset::all()->filter(function ($asset) {
 return $asset->isImage();
 });
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
 */
 protected function generateUserPresets()
 {
 $presets = config('statamic.assets.image_manipulation.presets', []);
 $presets = Image::userManipulationPresets();

 if (empty($presets)) {
 return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
 */
 private function generatePresets($presets)
 {
 $generator = new PresetGenerator($this->imageGenerator, $presets);

 foreach ($presets as $preset => $params) {
 $bar = $this->output->createProgressBar($this->imageAssets->count());
 $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

 foreach ($this->imageAssets as $asset) {
 $bar->setMessage($asset->basename(), 'filename');
 $generator->generate($asset, $preset);
 $this->generator->generate($asset, $preset);
 $bar->advance();
 }

Expand Down

4 changes: 3 additions & 1 deletion
src/Facades/Image.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
 * @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
 * @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
 * @method static array getCpImageManipulationPresets()
 * @method static array manipulationPresets()
 * @method static array userManipulationPresets()
 * @method static array cpManipulationPresets()
 *
 * @see \Statamic\Imaging\Manager
 */
Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/Asset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
 'height' => $this->height(),
 'preview' => $this->previewUrl(),
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/FolderAsset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
 return [
 'is_image' => true,
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

18 changes: 1 addition & 17 deletions
src/Imaging/GlideServer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
 'response' => new LaravelResponseFactory(app('request')),
 'driver' => Config::get('statamic.assets.image_manipulation.driver'),
 'cache_with_file_extensions' => true,
 'presets' => $this->presets(),
 'presets' => Image::manipulationPresets(),
 ]);
 }

Expand All@@ -37,20 +37,4 @@ public function cachePath()
 ? Config::get('statamic.assets.image_manipulation.cache_path')
 : storage_path('statamic/glide');
 }

 /**
 * Get glide presets.
 *
 * @return array
 */
 private function presets()
 {
 $presets = Config::getImageManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, Image::getCpImageManipulationPresets());
 }

 return $presets;
 }
}

38 changes: 35 additions & 3 deletions
src/Imaging/Manager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
 return app(ImageManipulator::class);
 }

 /**
 * Get the image manipulation presets.
 *
 * @return array
 */
 public function manipulationPresets()
 {
 $presets = $this->userManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, $this->cpManipulationPresets());
 }

 return $presets;
 }

 /**
 * Get the user defined image manipulation presets.
 *
 * @return array
 */
 public function userManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 }

 /**
 * Get the image manipulation presets required by the control panel.
 *
 * @return array
 */
 public function getCpImageManipulationPresets()
 public function cpManipulationPresets()
 {
 return [
 'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
 'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
 ];
 }

 /**
 * @deprecated
 */
 public function getCpImageManipulationPresets()
 {
 return $this->cpManipulationPresets();
 }
}

3 changes: 2 additions & 1 deletion
src/Providers/GlideServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
 $this->app->bind(PresetGenerator::class, function ($app) {
 return new PresetGenerator(
 $app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
 );
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/Feature/Assets/BrowserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
 'data' => [
 'assets' => [
 ['id', 'size_formatted', 'last_modified_relative', 'actions'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
 ],
 'folder' => [
 'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Nov 24, 2020
 Merged


Throw out toenail clippings
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
df41915

Remove toenail thumbnail references, we no longer use them.


jasonvarga Nov 24, 2020
87643d7

Remove standalone small preset. There will always be an orientation s…


jasonvarga Nov 24, 2020
5b5e2f0

Tidy command


jasonvarga Nov 24, 2020
3622c83

Use method


jasonvarga Nov 24, 2020
86f8ef6

New simpler manipulator methods through Image facade. Deprecate the e…


jasonvarga Nov 24, 2020
906d620

Add missing parent construct


jasonvarga Nov 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
resources/js/components/fieldtypes/assets/Asset.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
 return this.asset.thumbnail;
 },

 toenail() {
 return this.asset.toenail;
 },

 label() {
 return this.asset.basename;
 }
Expand Down

5 changes: 4 additions & 1 deletion
src/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
 * Get the image manipulation presets.
 *
 * @return array
 * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
 * or Image::manipulationPresets() to get merged with CP presets.
 */
 public function getImageManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 return Image::userManipulationPresets();
 }
}

24 changes: 12 additions & 12 deletions
src/Console/Commands/AssetsGeneratePresets.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
 protected $description = 'Generate asset preset manipulations.';

 /**
 * @var ImageGenerator
 * @var PresetGenerator
 */
 protected $imageGenerator;
 protected $generator;

 /**
 * @var \Statamic\Assets\AssetCollection
 */
 protected $imageAssets;

 public function __construct(PresetGenerator $generator)
 {
 $this->generator = $generator;
 parent::__construct();
 }

 /**
 * Execute the console command.
 *
 * @param ImageGenerator $imageGenerator
 */
 public function handle(ImageGenerator $imageGenerator)
 public function handle()
 {
 $this->imageGenerator = $imageGenerator;

 $this->imageAssets = Asset::all()->filter(function ($asset) {
 return $asset->isImage();
 });
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
 */
 protected function generateUserPresets()
 {
 $presets = config('statamic.assets.image_manipulation.presets', []);
 $presets = Image::userManipulationPresets();

 if (empty($presets)) {
 return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
 */
 private function generatePresets($presets)
 {
 $generator = new PresetGenerator($this->imageGenerator, $presets);

 foreach ($presets as $preset => $params) {
 $bar = $this->output->createProgressBar($this->imageAssets->count());
 $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

 foreach ($this->imageAssets as $asset) {
 $bar->setMessage($asset->basename(), 'filename');
 $generator->generate($asset, $preset);
 $this->generator->generate($asset, $preset);
 $bar->advance();
 }

Expand Down

4 changes: 3 additions & 1 deletion
src/Facades/Image.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
 * @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
 * @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
 * @method static array getCpImageManipulationPresets()
 * @method static array manipulationPresets()
 * @method static array userManipulationPresets()
 * @method static array cpManipulationPresets()
 *
 * @see \Statamic\Imaging\Manager
 */
Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/Asset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
 'height' => $this->height(),
 'preview' => $this->previewUrl(),
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/FolderAsset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
 return [
 'is_image' => true,
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

18 changes: 1 addition & 17 deletions
src/Imaging/GlideServer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
 'response' => new LaravelResponseFactory(app('request')),
 'driver' => Config::get('statamic.assets.image_manipulation.driver'),
 'cache_with_file_extensions' => true,
 'presets' => $this->presets(),
 'presets' => Image::manipulationPresets(),
 ]);
 }

Expand All@@ -37,20 +37,4 @@ public function cachePath()
 ? Config::get('statamic.assets.image_manipulation.cache_path')
 : storage_path('statamic/glide');
 }

 /**
 * Get glide presets.
 *
 * @return array
 */
 private function presets()
 {
 $presets = Config::getImageManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, Image::getCpImageManipulationPresets());
 }

 return $presets;
 }
}

38 changes: 35 additions & 3 deletions
src/Imaging/Manager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
 return app(ImageManipulator::class);
 }

 /**
 * Get the image manipulation presets.
 *
 * @return array
 */
 public function manipulationPresets()
 {
 $presets = $this->userManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, $this->cpManipulationPresets());
 }

 return $presets;
 }

 /**
 * Get the user defined image manipulation presets.
 *
 * @return array
 */
 public function userManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 }

 /**
 * Get the image manipulation presets required by the control panel.
 *
 * @return array
 */
 public function getCpImageManipulationPresets()
 public function cpManipulationPresets()
 {
 return [
 'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
 'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
 ];
 }

 /**
 * @deprecated
 */
 public function getCpImageManipulationPresets()
 {
 return $this->cpManipulationPresets();
 }
}

3 changes: 2 additions & 1 deletion
src/Providers/GlideServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
 $this->app->bind(PresetGenerator::class, function ($app) {
 return new PresetGenerator(
 $app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
 );
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/Feature/Assets/BrowserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
 'data' => [
 'assets' => [
 ['id', 'size_formatted', 'last_modified_relative', 'actions'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
 ],
 'folder' => [
 'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Nov 24, 2020
 Merged


Throw out toenail clippings
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
df41915

Remove toenail thumbnail references, we no longer use them.


jasonvarga Nov 24, 2020
87643d7

Remove standalone small preset. There will always be an orientation s…


jasonvarga Nov 24, 2020
5b5e2f0

Tidy command


jasonvarga Nov 24, 2020
3622c83

Use method


jasonvarga Nov 24, 2020
86f8ef6

New simpler manipulator methods through Image facade. Deprecate the e…


jasonvarga Nov 24, 2020
906d620

Add missing parent construct


jasonvarga Nov 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
resources/js/components/fieldtypes/assets/Asset.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
 return this.asset.thumbnail;
 },

 toenail() {
 return this.asset.toenail;
 },

 label() {
 return this.asset.basename;
 }
Expand Down

5 changes: 4 additions & 1 deletion
src/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
 * Get the image manipulation presets.
 *
 * @return array
 * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
 * or Image::manipulationPresets() to get merged with CP presets.
 */
 public function getImageManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 return Image::userManipulationPresets();
 }
}

24 changes: 12 additions & 12 deletions
src/Console/Commands/AssetsGeneratePresets.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
 protected $description = 'Generate asset preset manipulations.';

 /**
 * @var ImageGenerator
 * @var PresetGenerator
 */
 protected $imageGenerator;
 protected $generator;

 /**
 * @var \Statamic\Assets\AssetCollection
 */
 protected $imageAssets;

 public function __construct(PresetGenerator $generator)
 {
 $this->generator = $generator;
 parent::__construct();
 }

 /**
 * Execute the console command.
 *
 * @param ImageGenerator $imageGenerator
 */
 public function handle(ImageGenerator $imageGenerator)
 public function handle()
 {
 $this->imageGenerator = $imageGenerator;

 $this->imageAssets = Asset::all()->filter(function ($asset) {
 return $asset->isImage();
 });
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
 */
 protected function generateUserPresets()
 {
 $presets = config('statamic.assets.image_manipulation.presets', []);
 $presets = Image::userManipulationPresets();

 if (empty($presets)) {
 return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
 */
 private function generatePresets($presets)
 {
 $generator = new PresetGenerator($this->imageGenerator, $presets);

 foreach ($presets as $preset => $params) {
 $bar = $this->output->createProgressBar($this->imageAssets->count());
 $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

 foreach ($this->imageAssets as $asset) {
 $bar->setMessage($asset->basename(), 'filename');
 $generator->generate($asset, $preset);
 $this->generator->generate($asset, $preset);
 $bar->advance();
 }

Expand Down

4 changes: 3 additions & 1 deletion
src/Facades/Image.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
 * @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
 * @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
 * @method static array getCpImageManipulationPresets()
 * @method static array manipulationPresets()
 * @method static array userManipulationPresets()
 * @method static array cpManipulationPresets()
 *
 * @see \Statamic\Imaging\Manager
 */
Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/Asset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
 'height' => $this->height(),
 'preview' => $this->previewUrl(),
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/FolderAsset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
 return [
 'is_image' => true,
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

18 changes: 1 addition & 17 deletions
src/Imaging/GlideServer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
 'response' => new LaravelResponseFactory(app('request')),
 'driver' => Config::get('statamic.assets.image_manipulation.driver'),
 'cache_with_file_extensions' => true,
 'presets' => $this->presets(),
 'presets' => Image::manipulationPresets(),
 ]);
 }

Expand All@@ -37,20 +37,4 @@ public function cachePath()
 ? Config::get('statamic.assets.image_manipulation.cache_path')
 : storage_path('statamic/glide');
 }

 /**
 * Get glide presets.
 *
 * @return array
 */
 private function presets()
 {
 $presets = Config::getImageManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, Image::getCpImageManipulationPresets());
 }

 return $presets;
 }
}

38 changes: 35 additions & 3 deletions
src/Imaging/Manager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
 return app(ImageManipulator::class);
 }

 /**
 * Get the image manipulation presets.
 *
 * @return array
 */
 public function manipulationPresets()
 {
 $presets = $this->userManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, $this->cpManipulationPresets());
 }

 return $presets;
 }

 /**
 * Get the user defined image manipulation presets.
 *
 * @return array
 */
 public function userManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 }

 /**
 * Get the image manipulation presets required by the control panel.
 *
 * @return array
 */
 public function getCpImageManipulationPresets()
 public function cpManipulationPresets()
 {
 return [
 'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
 'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
 ];
 }

 /**
 * @deprecated
 */
 public function getCpImageManipulationPresets()
 {
 return $this->cpManipulationPresets();
 }
}

3 changes: 2 additions & 1 deletion
src/Providers/GlideServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
 $this->app->bind(PresetGenerator::class, function ($app) {
 return new PresetGenerator(
 $app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
 );
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/Feature/Assets/BrowserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
 'data' => [
 'assets' => [
 ['id', 'size_formatted', 'last_modified_relative', 'actions'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
 ],
 'folder' => [
 'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Throw out toenail clippings#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 6 commits into

from

Nov 24, 2020
 Merged


Throw out toenail clippings
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
df41915

Remove toenail thumbnail references, we no longer use them.


jasonvarga Nov 24, 2020
87643d7

Remove standalone small preset. There will always be an orientation s…


jasonvarga Nov 24, 2020
5b5e2f0

Tidy command


jasonvarga Nov 24, 2020
3622c83

Use method


jasonvarga Nov 24, 2020
86f8ef6

New simpler manipulator methods through Image facade. Deprecate the e…


jasonvarga Nov 24, 2020
906d620

Add missing parent construct


jasonvarga Nov 24, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 0 additions & 4 deletions
resources/js/components/fieldtypes/assets/Asset.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,6 @@ export default {
 return this.asset.thumbnail;
 },

 toenail() {
 return this.asset.toenail;
 },

 label() {
 return this.asset.basename;
 }
Expand Down

5 changes: 4 additions & 1 deletion
src/Config.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

namespace Statamic;

use Statamic\Facades\Image;
use Statamic\Facades\Site;

/**
Expand DownExpand Up@@ -156,9 +157,11 @@ public function getSiteUrl($locale = null)
 * Get the image manipulation presets.
 *
 * @return array
 * @deprecated Use Statamic\Facades\Image::userManipulationPresets()
 * or Image::manipulationPresets() to get merged with CP presets.
 */
 public function getImageManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 return Image::userManipulationPresets();
 }
}

24 changes: 12 additions & 12 deletions
src/Console/Commands/AssetsGeneratePresets.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
use Illuminate\Console\Command;
use Statamic\Console\RunsInPlease;
use Statamic\Facades\Asset;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\ImageGenerator;
use Statamic\Imaging\PresetGenerator;

class AssetsGeneratePresets extends Command
Expand All@@ -28,24 +28,26 @@ class AssetsGeneratePresets extends Command
 protected $description = 'Generate asset preset manipulations.';

 /**
 * @var ImageGenerator
 * @var PresetGenerator
 */
 protected $imageGenerator;
 protected $generator;

 /**
 * @var \Statamic\Assets\AssetCollection
 */
 protected $imageAssets;

 public function __construct(PresetGenerator $generator)
 {
 $this->generator = $generator;
 parent::__construct();
 }

 /**
 * Execute the console command.
 *
 * @param ImageGenerator $imageGenerator
 */
 public function handle(ImageGenerator $imageGenerator)
 public function handle()
 {
 $this->imageGenerator = $imageGenerator;

 $this->imageAssets = Asset::all()->filter(function ($asset) {
 return $asset->isImage();
 });
Expand All@@ -62,7 +64,7 @@ public function handle(ImageGenerator $imageGenerator)
 */
 protected function generateUserPresets()
 {
 $presets = config('statamic.assets.image_manipulation.presets', []);
 $presets = Image::userManipulationPresets();

 if (empty($presets)) {
 return $this->line('<fg=red>[✗]</> No user defined presets.');
Expand DownExpand Up@@ -93,15 +95,13 @@ private function generateCpThumbnails()
 */
 private function generatePresets($presets)
 {
 $generator = new PresetGenerator($this->imageGenerator, $presets);

 foreach ($presets as $preset => $params) {
 $bar = $this->output->createProgressBar($this->imageAssets->count());
 $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");

 foreach ($this->imageAssets as $asset) {
 $bar->setMessage($asset->basename(), 'filename');
 $generator->generate($asset, $preset);
 $this->generator->generate($asset, $preset);
 $bar->advance();
 }

Expand Down

4 changes: 3 additions & 1 deletion
src/Facades/Image.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,9 @@
/**
 * @method static string|\Statamic\Contracts\Imaging\ImageManipulator manipulate($item = null, $params = null)
 * @method static \Statamic\Contracts\Imaging\ImageManipulator manipulator()
 * @method static array getCpImageManipulationPresets()
 * @method static array manipulationPresets()
 * @method static array userManipulationPresets()
 * @method static array cpManipulationPresets()
 *
 * @see \Statamic\Imaging\Manager
 */
Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/Asset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@ public function toArray($request)
 'height' => $this->height(),
 'preview' => $this->previewUrl(),
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

1 change: 0 additions & 1 deletion
src/Http/Resources/CP/Assets/FolderAsset.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function toArray($request)
 return [
 'is_image' => true,
 'thumbnail' => $this->thumbnailUrl('small'),
 'toenail' => $this->thumbnailUrl('large'),
 ];
 }),

Expand Down

18 changes: 1 addition & 17 deletions
src/Imaging/GlideServer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ public function create()
 'response' => new LaravelResponseFactory(app('request')),
 'driver' => Config::get('statamic.assets.image_manipulation.driver'),
 'cache_with_file_extensions' => true,
 'presets' => $this->presets(),
 'presets' => Image::manipulationPresets(),
 ]);
 }

Expand All@@ -37,20 +37,4 @@ public function cachePath()
 ? Config::get('statamic.assets.image_manipulation.cache_path')
 : storage_path('statamic/glide');
 }

 /**
 * Get glide presets.
 *
 * @return array
 */
 private function presets()
 {
 $presets = Config::getImageManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, Image::getCpImageManipulationPresets());
 }

 return $presets;
 }
}

38 changes: 35 additions & 3 deletions
src/Imaging/Manager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,19 +40,51 @@ public function manipulator()
 return app(ImageManipulator::class);
 }

 /**
 * Get the image manipulation presets.
 *
 * @return array
 */
 public function manipulationPresets()
 {
 $presets = $this->userManipulationPresets();

 if (config('statamic.cp.enabled')) {
 $presets = array_merge($presets, $this->cpManipulationPresets());
 }

 return $presets;
 }

 /**
 * Get the user defined image manipulation presets.
 *
 * @return array
 */
 public function userManipulationPresets()
 {
 return config('statamic.assets.image_manipulation.presets', []);
 }

 /**
 * Get the image manipulation presets required by the control panel.
 *
 * @return array
 */
 public function getCpImageManipulationPresets()
 public function cpManipulationPresets()
 {
 return [
 'cp_thumbnail_small' => ['w' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_landscape' => ['w' => '400', 'h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_portrait' => ['h' => '300', 'fit' => 'crop'],
 'cp_thumbnail_small_square' => ['w' => '300', 'h' => '300'],
 'cp_thumbnail_large' => ['w' => '1000', 'h' => '1000'],
 ];
 }

 /**
 * @deprecated
 */
 public function getCpImageManipulationPresets()
 {
 return $this->cpManipulationPresets();
 }
}

3 changes: 2 additions & 1 deletion
src/Providers/GlideServiceProvider.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Statamic\Contracts\Imaging\ImageManipulator;
use Statamic\Contracts\Imaging\UrlBuilder;
use Statamic\Facades\Config;
use Statamic\Facades\Image;
use Statamic\Imaging\GlideImageManipulator;
use Statamic\Imaging\GlideUrlBuilder;
use Statamic\Imaging\ImageGenerator;
Expand DownExpand Up@@ -38,7 +39,7 @@ public function register()
 $this->app->bind(PresetGenerator::class, function ($app) {
 return new PresetGenerator(
 $app->make(ImageGenerator::class),
Config::getImageManipulationPresets()
Image::manipulationPresets()
 );
 });
 }
Expand Down

2 changes: 1 addition & 1 deletion
tests/Feature/Assets/BrowserTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -268,7 +268,7 @@ private function jsonStructure()
 'data' => [
 'assets' => [
 ['id', 'size_formatted', 'last_modified_relative', 'actions'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail', 'toenail'],
 ['id', 'size_formatted', 'last_modified_relative', 'actions', 'thumbnail'],
 ],
 'folder' => [
 'title', 'path', 'parent_path', 'actions', 'folders',
Expand Down