Issue #3265140 by Spokje, bnjmnm, lauriii, mstrelan, dww, Wim Leers, xjm,... (de19aefa) · Commits · project / drupal

core/modules/image/image.libraries.yml

+2 −8

Original line number	Diff line number	Diff line
		@@ -6,16 +6,10 @@ admin:

		quickedit.inPlaceEditor.image:
		version: VERSION
		js:
		js/editors/image.js: {}
		js/theme.js: {}
		css:
		component:
		css/editors/image.css: {}
		theme:
		css/editors/image.theme.css: {}
		dependencies:
		- core/jquery
		- core/drupal
		- core/internal.underscore
		- quickedit/quickedit
		- quickedit/quickedit.inPlaceEditor.image
		deprecated: The image/quickedit.inPlaceEditor.image asset library is deprecated in Drupal 9.4.0 and will be removed in Drupal 10.0.0. Instead use quickedit/quickedit.inPlaceEditor.image. See https://www.drupal.org/node/3280366

core/modules/image/image.routing.yml

+0 −26

Original line number	Diff line number	Diff line
		@@ -71,29 +71,3 @@ image.effect_edit_form:

		route_callbacks:
		- '\Drupal\image\Routing\ImageStyleRoutes::routes'

		image.upload:
		path: '/quickedit/image/upload/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
		defaults:
		_controller: '\Drupal\image\Controller\QuickEditImageController::upload'
		options:
		parameters:
		entity:
		type: entity:{entity_type}
		requirements:
		_permission: 'access in-place editing'
		_access_quickedit_entity_field: 'TRUE'
		_method: 'POST'

		image.info:
		path: '/quickedit/image/info/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
		defaults:
		_controller: '\Drupal\image\Controller\QuickEditImageController::getInfo'
		options:
		parameters:
		entity:
		type: entity:{entity_type}
		requirements:
		_permission: 'access in-place editing'
		_access_quickedit_entity_field: 'TRUE'
		_method: 'GET'

core/modules/image/js/theme.es6.js

deleted100644 → 0

+0 −92

Original line number	Diff line number	Diff line
		/**
		* @file
		* Provides theme functions for image Quick Edit's client-side HTML.
		*/

		(function (Drupal) {
		/**
		* Theme function for validation errors of the Image in-place editor.
		*
		* @param {object} settings
		* Settings object used to construct the markup.
		* @param {string} settings.errors
		* Already escaped HTML representing error messages.
		*
		* @return {string}
		* The corresponding HTML.
		*/
		Drupal.theme.quickeditImageErrors = function (settings) {
		return `<div class="quickedit-image-errors">${settings.errors}</div>`;
		};

		/**
		* Theme function for the dropzone element of the Image module's in-place
		* editor.
		*
		* @param {object} settings
		* Settings object used to construct the markup.
		* @param {string} settings.state
		* State of the upload.
		* @param {string} settings.text
		* Text to display inline with the dropzone element.
		*
		* @return {string}
		* The corresponding HTML.
		*/
		Drupal.theme.quickeditImageDropzone = function (settings) {
		return (
		`<div class="quickedit-image-dropzone ${settings.state}">` +
		' <i class="quickedit-image-icon"></i>' +
		` <span class="quickedit-image-text">${settings.text}</span>` +
		'</div>'
		);
		};

		/**
		* Theme function for the toolbar of the Image module's in-place editor.
		*
		* @param {object} settings
		* Settings object used to construct the markup.
		* @param {bool} settings.alt_field
		* Whether or not the "Alt" field is enabled for this field.
		* @param {bool} settings.alt_field_required
		* Whether or not the "Alt" field is required for this field.
		* @param {string} settings.alt
		* The current value for the "Alt" field.
		* @param {bool} settings.title_field
		* Whether or not the "Title" field is enabled for this field.
		* @param {bool} settings.title_field_required
		* Whether or not the "Title" field is required for this field.
		* @param {string} settings.title
		* The current value for the "Title" field.
		*
		* @return {string}
		* The corresponding HTML.
		*/
		Drupal.theme.quickeditImageToolbar = function (settings) {
		let html = '<form class="quickedit-image-field-info">';
		if (settings.alt_field) {
		html +=
		`<div><label for="alt" class="${
		settings.alt_field_required ? 'required' : ''
		}">${Drupal.t('Alternative text')}</label>` +
		`<input type="text" placeholder="${settings.alt}" value="${
		settings.alt
		}" name="alt" ${settings.alt_field_required ? 'required' : ''}/>` +
		' </div>';
		}
		if (settings.title_field) {
		html +=
		`<div><label for="title" class="${
		settings.title_field_required ? 'form-required' : ''
		}">${Drupal.t('Title')}</label>` +
		`<input type="text" placeholder="${settings.title}" value="${
		settings.title
		}" name="title" ${settings.title_field_required ? 'required' : ''}/>` +
		'</div>';
		}
		html += '</form>';

		return html;
		};
		})(Drupal);

core/modules/image/js/theme.js

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		/**
		* DO NOT EDIT THIS FILE.
		* See the following change record for more information,
		* https://www.drupal.org/node/2815083
		* @preserve
		**/

		(function (Drupal) {
		Drupal.theme.quickeditImageErrors = function (settings) {
		return "<div class=\"quickedit-image-errors\">".concat(settings.errors, "</div>");
		};

		Drupal.theme.quickeditImageDropzone = function (settings) {
		return "<div class=\"quickedit-image-dropzone ".concat(settings.state, "\">") + ' <i class="quickedit-image-icon"></i>' + " <span class=\"quickedit-image-text\">".concat(settings.text, "</span>") + '</div>';
		};

		Drupal.theme.quickeditImageToolbar = function (settings) {
		var html = '<form class="quickedit-image-field-info">';

		if (settings.alt_field) {
		html += "<div><label for=\"alt\" class=\"".concat(settings.alt_field_required ? 'required' : '', "\">").concat(Drupal.t('Alternative text'), "</label>") + "<input type=\"text\" placeholder=\"".concat(settings.alt, "\" value=\"").concat(settings.alt, "\" name=\"alt\" ").concat(settings.alt_field_required ? 'required' : '', "/>") + ' </div>';
		}

		if (settings.title_field) {
		html += "<div><label for=\"title\" class=\"".concat(settings.title_field_required ? 'form-required' : '', "\">").concat(Drupal.t('Title'), "</label>") + "<input type=\"text\" placeholder=\"".concat(settings.title, "\" value=\"").concat(settings.title, "\" name=\"title\" ").concat(settings.title_field_required ? 'required' : '', "/>") + '</div>';
		}

		html += '</form>';
		return html;
		};
		})(Drupal);
		No newline at end of file

core/modules/image/src/Controller/QuickEditImageController.php

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,8 @@

		namespace Drupal\image\Controller;

		use Drupal\Core\Cache\CacheableJsonResponse;
		@trigger_error(__NAMESPACE__ . '\QuickEditImageController is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Instead, use Drupal\quickedit\QuickEditImageController. See https://www.drupal.org/node/3271848', E_USER_DEPRECATED);

		use Drupal\Core\Controller\ControllerBase;
		use Drupal\Core\Entity\ContentEntityInterface;
		use Drupal\Core\Entity\EntityDisplayRepositoryInterface;