X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fimage%2Fjs%2Feditors%2Fimage.js;fp=web%2Fcore%2Fmodules%2Fimage%2Fjs%2Feditors%2Fimage.js;h=7075b49b59a70cb2914bcfa0645f011254dedcec;hp=dea08df59ee883d6e30140eed1e256096a82cf97;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5
diff --git a/web/core/modules/image/js/editors/image.js b/web/core/modules/image/js/editors/image.js
index dea08df59..7075b49b5 100644
--- a/web/core/modules/image/js/editors/image.js
+++ b/web/core/modules/image/js/editors/image.js
@@ -1,28 +1,17 @@
/**
- * @file
- * Drag+drop based in-place editor for images.
- */
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
(function ($, _, Drupal) {
-
- 'use strict';
-
- Drupal.quickedit.editors.image = Drupal.quickedit.EditorView.extend(/** @lends Drupal.quickedit.editors.image# */{
-
- /**
- * @constructs
- *
- * @augments Drupal.quickedit.EditorView
- *
- * @param {object} options
- * Options for the image editor.
- */
- initialize: function (options) {
+ Drupal.quickedit.editors.image = Drupal.quickedit.EditorView.extend({
+ initialize: function initialize(options) {
Drupal.quickedit.EditorView.prototype.initialize.call(this, options);
- // Set our original value to our current HTML (for reverting).
+
this.model.set('originalValue', this.$el.html().trim());
- // $.val() callback function for copying input from our custom form to
- // the Quick Edit Field Form.
+
this.model.set('currentValue', function (index, value) {
var matches = $(this).attr('name').match(/(alt|title)]$/);
if (matches) {
@@ -35,18 +24,7 @@
}
});
},
-
- /**
- * @inheritdoc
- *
- * @param {Drupal.quickedit.FieldModel} fieldModel
- * The field model that holds the state.
- * @param {string} state
- * The state to change to.
- * @param {object} options
- * State options, if needed by the state change.
- */
- stateChange: function (fieldModel, state, options) {
+ stateChange: function stateChange(fieldModel, state, options) {
var from = fieldModel.previous('state');
switch (state) {
case 'inactive':
@@ -66,8 +44,6 @@
break;
case 'activating':
- // Defer updating the field model until the current state change has
- // propagated, to not trigger a nested state change event.
_.defer(function () {
fieldModel.set('state', 'active');
});
@@ -76,11 +52,8 @@
case 'active':
var self = this;
- // Indicate that this element is being edited by Quick Edit Image.
this.$el.addClass('quickedit-image-element');
- // Render our initial dropzone element. Once the user reverts changes
- // or saves a new image, this element is removed.
var $dropzone = this.renderDropzone('upload', Drupal.t('Drop file here or click to upload'));
$dropzone.on('dragenter', function (e) {
@@ -91,7 +64,6 @@
});
$dropzone.on('drop', function (e) {
- // Only respond when a file is dropped (could be another element).
if (e.originalEvent.dataTransfer && e.originalEvent.dataTransfer.files.length) {
$(this).removeClass('hover');
self.uploadImage(e.originalEvent.dataTransfer.files[0]);
@@ -99,20 +71,13 @@
});
$dropzone.on('click', function (e) {
- // Create an element without appending it to the DOM, and
- // trigger a click event. This is the easiest way to arbitrarily
- // open the browser's upload dialog.
- $('')
- .trigger('click')
- .on('change', function () {
- if (this.files.length) {
- self.uploadImage(this.files[0]);
- }
- });
+ $('').trigger('click').on('change', function () {
+ if (this.files.length) {
+ self.uploadImage(this.files[0]);
+ }
+ });
});
- // Prevent the browser's default behavior when dragging files onto
- // the document (usually opens them in the same tab).
$dropzone.on('dragover dragenter dragleave drop click', function (e) {
e.preventDefault();
e.stopPropagation();
@@ -140,78 +105,40 @@
break;
}
},
+ uploadImage: function uploadImage(file) {
+ this.renderDropzone('upload loading', Drupal.t('Uploading @fileâ¦', { '@file': file.name }));
- /**
- * Validates/uploads a given file.
- *
- * @param {File} file
- * The file to upload.
- */
- uploadImage: function (file) {
- // Indicate loading by adding a special class to our icon.
- this.renderDropzone('upload loading', Drupal.t('Uploading @fileâ¦', {'@file': file.name}));
-
- // Build a valid URL for our endpoint.
var fieldID = this.fieldModel.get('fieldID');
var url = Drupal.quickedit.util.buildUrl(fieldID, Drupal.url('quickedit/image/upload/!entity_type/!id/!field_name/!langcode/!view_mode'));
- // Construct form data that our endpoint can consume.
var data = new FormData();
data.append('files[image]', file);
- // Construct a POST request to our endpoint.
var self = this;
this.ajax({
type: 'POST',
url: url,
data: data,
- success: function (response) {
+ success: function success(response) {
var $el = $(self.fieldModel.get('el'));
- // Indicate that the field has changed - this enables the
- // "Save" button.
+
self.fieldModel.set('state', 'changed');
self.fieldModel.get('entity').set('inTempStore', true);
self.removeValidationErrors();
- // Replace our html with the new image. If we replaced our entire
- // element with data.html, we would have to implement complicated logic
- // like what's in Drupal.quickedit.AppView.renderUpdatedField.
var $content = $(response.html).closest('[data-quickedit-field-id]').children();
$el.empty().append($content);
}
});
},
-
- /**
- * Utility function to make an AJAX request to the server.
- *
- * In addition to formatting the correct request, this also handles error
- * codes and messages by displaying them visually inline with the image.
- *
- * Drupal.ajax is not called here as the Form API is unused by this
- * in-place editor, and our JSON requests/responses try to be
- * editor-agnostic. Ideally similar logic and routes could be used by
- * modules like CKEditor for drag+drop file uploads as well.
- *
- * @param {object} options
- * Ajax options.
- * @param {string} options.type
- * The type of request (i.e. GET, POST, PUT, DELETE, etc.)
- * @param {string} options.url
- * The URL for the request.
- * @param {*} options.data
- * The data to send to the server.
- * @param {function} options.success
- * A callback function used when a request is successful, without errors.
- */
- ajax: function (options) {
+ ajax: function ajax(options) {
var defaultOptions = {
context: this,
dataType: 'json',
cache: false,
contentType: false,
processData: false,
- error: function () {
+ error: function error() {
this.renderDropzone('error', Drupal.t('A server error has occurred.'));
}
};
@@ -219,7 +146,6 @@
var ajaxOptions = $.extend(defaultOptions, options);
var successCallback = ajaxOptions.success;
- // Handle the success callback.
ajaxOptions.success = function (response) {
if (response.main_error) {
this.renderDropzone('error', response.main_error);
@@ -227,67 +153,41 @@
this.model.set('validationErrors', response.errors);
}
this.showValidationErrors();
- }
- else {
+ } else {
successCallback(response);
}
};
$.ajax(ajaxOptions);
},
-
- /**
- * Renders our toolbar form for editing metadata.
- *
- * @param {Drupal.quickedit.FieldModel} fieldModel
- * The current Field Model.
- */
- renderToolbar: function (fieldModel) {
+ renderToolbar: function renderToolbar(fieldModel) {
var $toolgroup = $('#' + fieldModel.toolbarView.getMainWysiwygToolgroupId());
var $toolbar = $toolgroup.find('.quickedit-image-field-info');
if ($toolbar.length === 0) {
- // Perform an AJAX request for extra image info (alt/title).
var fieldID = fieldModel.get('fieldID');
var url = Drupal.quickedit.util.buildUrl(fieldID, Drupal.url('quickedit/image/info/!entity_type/!id/!field_name/!langcode/!view_mode'));
var self = this;
self.ajax({
type: 'GET',
url: url,
- success: function (response) {
+ success: function success(response) {
$toolbar = $(Drupal.theme.quickeditImageToolbar(response));
$toolgroup.append($toolbar);
$toolbar.on('keyup paste', function () {
fieldModel.set('state', 'changed');
});
- // Re-position the toolbar, which could have changed size.
+
fieldModel.get('entity').toolbarView.position();
}
});
}
},
-
- /**
- * Renders our dropzone element.
- *
- * @param {string} state
- * The current state of our editor. Only used for visual styling.
- * @param {string} text
- * The text to display in the dropzone area.
- *
- * @return {jQuery}
- * The rendered dropzone.
- */
- renderDropzone: function (state, text) {
+ renderDropzone: function renderDropzone(state, text) {
var $dropzone = this.$el.find('.quickedit-image-dropzone');
- // If the element already exists, modify its contents.
+
if ($dropzone.length) {
- $dropzone
- .removeClass('upload error hover loading')
- .addClass('.quickedit-image-dropzone ' + state)
- .children('.quickedit-image-text')
- .html(text);
- }
- else {
+ $dropzone.removeClass('upload error hover loading').addClass('.quickedit-image-dropzone ' + state).children('.quickedit-image-text').html(text);
+ } else {
$dropzone = $(Drupal.theme('quickeditImageDropzone', {
state: state,
text: text
@@ -297,46 +197,24 @@
return $dropzone;
},
-
- /**
- * @inheritdoc
- */
- revert: function () {
+ revert: function revert() {
this.$el.html(this.model.get('originalValue'));
},
-
- /**
- * @inheritdoc
- */
- getQuickEditUISettings: function () {
- return {padding: false, unifiedToolbar: true, fullWidthToolbar: true, popup: false};
+ getQuickEditUISettings: function getQuickEditUISettings() {
+ return { padding: false, unifiedToolbar: true, fullWidthToolbar: true, popup: false };
},
-
- /**
- * @inheritdoc
- */
- showValidationErrors: function () {
+ showValidationErrors: function showValidationErrors() {
var errors = Drupal.theme('quickeditImageErrors', {
errors: this.model.get('validationErrors')
});
- $('#' + this.fieldModel.toolbarView.getMainWysiwygToolgroupId())
- .append(errors);
- this.getEditedElement()
- .addClass('quickedit-validation-error');
- // Re-position the toolbar, which could have changed size.
+ $('#' + this.fieldModel.toolbarView.getMainWysiwygToolgroupId()).append(errors);
+ this.getEditedElement().addClass('quickedit-validation-error');
+
this.fieldModel.get('entity').toolbarView.position();
},
-
- /**
- * @inheritdoc
- */
- removeValidationErrors: function () {
- $('#' + this.fieldModel.toolbarView.getMainWysiwygToolgroupId())
- .find('.quickedit-image-errors').remove();
- this.getEditedElement()
- .removeClass('quickedit-validation-error');
+ removeValidationErrors: function removeValidationErrors() {
+ $('#' + this.fieldModel.toolbarView.getMainWysiwygToolgroupId()).find('.quickedit-image-errors').remove();
+ this.getEditedElement().removeClass('quickedit-validation-error');
}
-
});
-
-})(jQuery, _, Drupal);
+})(jQuery, _, Drupal);
\ No newline at end of file