';
html += '
';
html += settings.loadingMsg;
html += '
';
diff --git a/core/modules/edit/js/util.js b/core/modules/quickedit/js/util.js
similarity index 75%
rename from core/modules/edit/js/util.js
rename to core/modules/quickedit/js/util.js
index 6883d7e..6eefa98 100644
--- a/core/modules/edit/js/util.js
+++ b/core/modules/quickedit/js/util.js
@@ -1,16 +1,16 @@
/**
* @file
- * Provides utility functions for Edit.
+ * Provides utility functions for Quick Edit.
*/
(function ($, Drupal) {
"use strict";
- Drupal.edit.util = Drupal.edit.util || {};
+ Drupal.quickedit.util = Drupal.quickedit.util || {};
- Drupal.edit.util.constants = {};
- Drupal.edit.util.constants.transitionEnd = "transitionEnd.edit webkitTransitionEnd.edit transitionend.edit msTransitionEnd.edit oTransitionEnd.edit";
+ Drupal.quickedit.util.constants = {};
+ Drupal.quickedit.util.constants.transitionEnd = "transitionEnd.quickedit webkitTransitionEnd.quickedit transitionend.quickedit msTransitionEnd.quickedit oTransitionEnd.quickedit";
/**
* Converts a field id into a formatted url path.
@@ -19,9 +19,9 @@
* The id of an editable field. For example, 'node/1/body/und/full'.
* @param String urlFormat
* The Controller route for field processing. For example,
- * '/edit/form/%21entity_type/%21id/%21field_name/%21langcode/%21view_mode'.
+ * '/quickedit/form/!entity_type/!id/!field_name/!langcode/!view_mode'.
*/
- Drupal.edit.util.buildUrl = function (id, urlFormat) {
+ Drupal.quickedit.util.buildUrl = function (id, urlFormat) {
var parts = id.split('/');
return Drupal.formatString(decodeURIComponent(urlFormat), {
'!entity_type': parts[0],
@@ -40,11 +40,11 @@
* @param String message
* The message to use in the modal dialog.
*/
- Drupal.edit.util.networkErrorModal = function (title, message) {
+ Drupal.quickedit.util.networkErrorModal = function (title, message) {
var $message = $('
' + message + '
');
var networkErrorModal = Drupal.dialog($message.get(0), {
title: title,
- dialogClass: 'edit-network-error',
+ dialogClass: 'quickedit-network-error',
buttons: [
{
text: Drupal.t('OK'),
@@ -64,7 +64,7 @@
networkErrorModal.showModal();
};
- Drupal.edit.util.form = {
+ Drupal.quickedit.util.form = {
/**
* Loads a form, calls a callback to insert.
@@ -93,35 +93,35 @@
// Create a Drupal.ajax instance to load the form.
var formLoaderAjax = new Drupal.ajax(fieldID, $el, {
- url: Drupal.edit.util.buildUrl(fieldID, Drupal.url('edit/form/!entity_type/!id/!field_name/!langcode/!view_mode')),
- event: 'edit-internal.edit',
+ url: Drupal.quickedit.util.buildUrl(fieldID, Drupal.url('quickedit/form/!entity_type/!id/!field_name/!langcode/!view_mode')),
+ event: 'quickedit-internal.quickedit',
submit: {
nocssjs: options.nocssjs,
reset: options.reset
},
progress: { type: null }, // No progress indicator.
error: function (xhr, url) {
- $el.off('edit-internal.edit');
+ $el.off('quickedit-internal.quickedit');
// Show a modal to inform the user of the network error.
- var fieldLabel = Drupal.edit.metadata.get(fieldID, 'label');
+ var fieldLabel = Drupal.quickedit.metadata.get(fieldID, 'label');
var message = Drupal.t('Could not load the form for
@field-label
, either due to a website problem or a network connection problem.
Please try again.', { '@field-label': fieldLabel });
- Drupal.edit.util.networkErrorModal(Drupal.t('Sorry!'), message);
+ Drupal.quickedit.util.networkErrorModal(Drupal.t('Sorry!'), message);
// Change the state back to "candidate", to allow the user to start
// in-place editing of the field again.
- var fieldModel = Drupal.edit.app.model.get('activeField');
+ var fieldModel = Drupal.quickedit.app.model.get('activeField');
fieldModel.set('state', 'candidate');
}
});
- // Implement a scoped editFieldForm AJAX command: calls the callback.
- formLoaderAjax.commands.editFieldForm = function (ajax, response, status) {
+ // Implement a scoped quickeditFieldForm AJAX command: calls the callback.
+ formLoaderAjax.commands.quickeditFieldForm = function (ajax, response, status) {
callback(response.data, ajax);
- $el.off('edit-internal.edit');
+ $el.off('quickedit-internal.quickedit');
formLoaderAjax = null;
};
- // This will ensure our scoped editFieldForm AJAX command gets called.
- $el.trigger('edit-internal.edit');
+ // This will ensure our scoped quickeditFieldForm AJAX command gets called.
+ $el.trigger('quickedit-internal.quickedit');
},
/**
@@ -141,7 +141,7 @@
var settings = {
url: $submit.closest('form').attr('action'),
setClick: true,
- event: 'click.edit',
+ event: 'click.quickedit',
progress: { type: null },
submit: {
nocssjs: options.nocssjs,
@@ -165,10 +165,11 @@
* Cleans up the Drupal.ajax instance that is used to save the form.
*
* @param Drupal.ajax ajax
- * A Drupal.ajax that was returned by Drupal.edit.form.ajaxifySaving().
+ * A Drupal.ajax instance that was returned by
+ * Drupal.quickedit.form.ajaxifySaving().
*/
unajaxifySaving: function (ajax) {
- $(ajax.element).off('click.edit');
+ $(ajax.element).off('click.quickedit');
}
};
diff --git a/core/modules/edit/js/views/AppView.js b/core/modules/quickedit/js/views/AppView.js
similarity index 92%
rename from core/modules/edit/js/views/AppView.js
rename to core/modules/quickedit/js/views/AppView.js
index 73ab7f8..c8ed95b 100644
--- a/core/modules/edit/js/views/AppView.js
+++ b/core/modules/quickedit/js/views/AppView.js
@@ -2,7 +2,7 @@
* @file
* A Backbone View that controls the overall "in-place editing application".
*
- * @see Drupal.edit.AppModel
+ * @see Drupal.quickedit.AppModel
*/
(function ($, _, Backbone, Drupal) {
@@ -14,23 +14,24 @@
// edited fields if in-place editing has been canceled and one or more of the
// entity's fields were saved to TempStore: one of them may have been changed to
// the empty value and hence may have been rerendered as the empty string, which
- // makes it impossible for Edit to know where to restore the original HTML.
+ // makes it impossible for Quick Edit to know where to restore the original
+ // HTML.
var reload = false;
- Drupal.edit.AppView = Backbone.View.extend({
+ Drupal.quickedit.AppView = Backbone.View.extend({
/**
* {@inheritdoc}
*
* @param Object options
* An object with the following keys:
- * - Drupal.edit.AppModel model: the application state model
- * - Drupal.edit.EntityCollection entitiesCollection: all on-page entities
- * - Drupal.edit.FieldCollection fieldsCollection: all on-page fields
+ * - Drupal.quickedit.AppModel model: the application state model
+ * - Drupal.quickedit.EntityCollection entitiesCollection: all on-page entities
+ * - Drupal.quickedit.FieldCollection fieldsCollection: all on-page fields
*/
initialize: function (options) {
// AppView's configuration for handling states.
- // @see Drupal.edit.FieldModel.states
+ // @see Drupal.quickedit.FieldModel.states
this.activeFieldStates = ['activating', 'active'];
this.singleFieldStates = ['highlighted', 'activating', 'active'];
this.changedFieldStates = ['changed', 'saving', 'saved', 'invalid'];
@@ -56,10 +57,10 @@
/**
* Handles setup/teardown and state changes when the active entity changes.
*
- * @param Drupal.edit.EntityModel entityModel
+ * @param Drupal.quickedit.EntityModel entityModel
* An instance of the EntityModel class.
* @param String state
- * The state of the associated field. One of Drupal.edit.EntityModel.states.
+ * The state of the associated field. One of Drupal.quickedit.EntityModel.states.
*/
appStateChange: function (entityModel, state) {
var app = this;
@@ -68,7 +69,7 @@
case 'launching':
reload = false;
// First, create an entity toolbar view.
- entityToolbarView = new Drupal.edit.EntityToolbarView({
+ entityToolbarView = new Drupal.quickedit.EntityToolbarView({
model: entityModel,
appModel: this.model
});
@@ -117,7 +118,7 @@
* The new state.
* @param null|Object context
* The context that is trying to trigger the state change.
- * @param Drupal.edit.FieldModel fieldModel
+ * @param Drupal.quickedit.FieldModel fieldModel
* The fieldModel to which this change applies.
*/
acceptEditorStateChange: function (from, to, context, fieldModel) {
@@ -135,7 +136,7 @@
// In general, enforce the states sequence. Disallow going back from a
// "later" state to an "earlier" state, except in explicitly allowed
// cases.
- if (!Drupal.edit.FieldModel.followsStateSequence(from, to)) {
+ if (!Drupal.quickedit.FieldModel.followsStateSequence(from, to)) {
accept = false;
// Allow: activating/active -> candidate.
// Necessary to stop editing a field.
@@ -244,7 +245,7 @@
*
* Must happen before the fieldModel's state is changed to 'candidate'.
*
- * @param Drupal.edit.FieldModel fieldModel
+ * @param Drupal.quickedit.FieldModel fieldModel
* The field for which an in-place editor must be set up.
*/
setupEditor: function (fieldModel) {
@@ -255,8 +256,8 @@
var fieldToolbarRoot = entityToolbarView.getToolbarRoot();
// Create in-place editor.
var editorName = fieldModel.get('metadata').editor;
- var editorModel = new Drupal.edit.EditorModel();
- var editorView = new Drupal.edit.editors[editorName]({
+ var editorModel = new Drupal.quickedit.EditorModel();
+ var editorView = new Drupal.quickedit.editors[editorName]({
el: $(fieldModel.get('el')),
model: editorModel,
fieldModel: fieldModel
@@ -265,7 +266,7 @@
// Create in-place editor's toolbar for this field — stored inside the
// entity toolbar, the entity toolbar will position itself appropriately
// above (or below) the edited element.
- var toolbarView = new Drupal.edit.FieldToolbarView({
+ var toolbarView = new Drupal.quickedit.FieldToolbarView({
el: fieldToolbarRoot,
model: fieldModel,
$editedElement: $(editorView.getEditedElement()),
@@ -275,7 +276,7 @@
// Create decoration for edited element: padding if necessary, sets classes
// on the element to style it according to the current state.
- var decorationView = new Drupal.edit.FieldDecorationView({
+ var decorationView = new Drupal.quickedit.FieldDecorationView({
el: $(editorView.getEditedElement()),
model: fieldModel,
editorView: editorView
@@ -293,7 +294,7 @@
*
* Must happen after the fieldModel's state is changed to 'inactive'.
*
- * @param Drupal.edit.FieldModel fieldModel
+ * @param Drupal.quickedit.FieldModel fieldModel
* The field for which an in-place editor must be torn down.
*/
teardownEditor: function (fieldModel) {
@@ -353,7 +354,7 @@
var $unsavedChanges = $('
' + Drupal.t('You have unsaved changes') + '
');
discardDialog = Drupal.dialog($unsavedChanges.get(0), {
title: Drupal.t('Discard changes?'),
- dialogClass: 'edit-discard-modal',
+ dialogClass: 'quickedit-discard-modal',
resizable: false,
buttons: [
{
@@ -390,9 +391,9 @@
/**
* Reacts to field state changes; tracks global state.
*
- * @param Drupal.edit.FieldModel fieldModel
+ * @param Drupal.quickedit.FieldModel fieldModel
* @param String state
- * The state of the associated field. One of Drupal.edit.FieldModel.states.
+ * The state of the associated field. One of Drupal.quickedit.FieldModel.states.
*/
editorStateChange: function (fieldModel, state) {
var from = fieldModel.previous('state');
@@ -422,7 +423,7 @@
/**
* Render an updated field (a field whose 'html' attribute changed).
*
- * @param Drupal.edit.FieldModel fieldModel
+ * @param Drupal.quickedit.FieldModel fieldModel
* The FieldModel whose 'html' attribute changed.
* @param String html
* The updated 'html' attribute.
@@ -484,7 +485,7 @@
/**
* Propagates the changes to an updated field to all instances of that field.
*
- * @param Drupal.edit.FieldModel updatedField
+ * @param Drupal.quickedit.FieldModel updatedField
* The FieldModel whose 'html' attribute changed.
* @param String html
* The updated 'html' attribute.
@@ -494,7 +495,7 @@
* occurred because of the propagation of changes to another instance of
* this field.
*
- * @see Drupal.edit.AppView.renderUpdatedField()
+ * @see Drupal.quickedit.AppView.renderUpdatedField()
*/
propagateUpdatedField: function (updatedField, html, options) {
// Don't propagate field updates that themselves were caused by propagation.
@@ -503,7 +504,7 @@
}
var htmlForOtherViewModes = updatedField.get('htmlForOtherViewModes');
- Drupal.edit.collections.fields
+ Drupal.quickedit.collections.fields
// Find all instances of fields that display the same logical field (same
// entity, same field, just a different instance and maybe a different
// view mode).
@@ -537,11 +538,11 @@
*
* This happens when a field was modified, saved and hence rerendered.
*
- * @param Drupal.edit.FieldModel fieldModel
+ * @param Drupal.quickedit.FieldModel fieldModel
* A field that was just added to the collection of fields.
*/
rerenderedFieldToCandidate: function (fieldModel) {
- var activeEntity = Drupal.edit.collections.entities.findWhere({isActive: true});
+ var activeEntity = Drupal.quickedit.collections.entities.findWhere({isActive: true});
// Early-return if there is no active entity.
if (!activeEntity) {
@@ -559,7 +560,7 @@
* EntityModel Collection change handler, called on change:isActive, enforces
* a single active entity.
*
- * @param Drupal.edit.EntityModel
+ * @param Drupal.quickedit.EntityModel
* The entityModel instance whose active state has changed.
*/
enforceSingleActiveEntity: function (changedEntityModel) {
diff --git a/core/modules/edit/js/views/ContextualLinkView.js b/core/modules/quickedit/js/views/ContextualLinkView.js
similarity index 86%
rename from core/modules/edit/js/views/ContextualLinkView.js
rename to core/modules/quickedit/js/views/ContextualLinkView.js
index 6c21348..6e73be1 100644
--- a/core/modules/edit/js/views/ContextualLinkView.js
+++ b/core/modules/quickedit/js/views/ContextualLinkView.js
@@ -7,7 +7,7 @@
"use strict";
- Drupal.edit.ContextualLinkView = Backbone.View.extend({
+ Drupal.quickedit.ContextualLinkView = Backbone.View.extend({
events: function () {
// Prevents delay and simulated mouse events.
@@ -29,8 +29,8 @@
*
* @param Object options
* An object with the following keys:
- * - Drupal.edit.EntityModel model: the associated entity's model
- * - Drupal.edit.AppModel appModel: the application state model
+ * - Drupal.quickedit.EntityModel model: the associated entity's model
+ * - Drupal.quickedit.AppModel appModel: the application state model
* - strings: the strings for the "Quick edit" link
*/
initialize: function (options) {
diff --git a/core/modules/edit/js/views/EditorView.js b/core/modules/quickedit/js/views/EditorView.js
similarity index 76%
rename from core/modules/edit/js/views/EditorView.js
rename to core/modules/quickedit/js/views/EditorView.js
index 5108fcf..46bc424 100644
--- a/core/modules/edit/js/views/EditorView.js
+++ b/core/modules/quickedit/js/views/EditorView.js
@@ -13,12 +13,12 @@
* Specific in-place editor implementations should subclass (extend) this View
* and override whichever method they deem necessary to override.
*
- * Look at Drupal.edit.editors.form and Drupal.edit.editors.plain_text for
- * examples.
+ * Look at Drupal.quickedit.editors.form and
+ * Drupal.quickedit.editors.plain_text for examples.
*
- * @see Drupal.edit.EditorModel
+ * @see Drupal.quickedit.EditorModel
*/
- Drupal.edit.EditorView = Backbone.View.extend({
+ Drupal.quickedit.EditorView = Backbone.View.extend({
/**
* {@inheritdoc}
@@ -29,14 +29,14 @@
*
* If you override this method, you should call this method (the parent
* class' initialize()) first, like this:
- * Drupal.edit.EditorView.prototype.initialize.call(this, options);
+ * Drupal.quickedit.EditorView.prototype.initialize.call(this, options);
*
- * For an example, @see Drupal.edit.editors.plain_text.
+ * For an example, @see Drupal.quickedit.editors.plain_text.
*
* @param Object options
* An object with the following keys:
- * - Drupal.edit.EditorModel model: the in-place editor state model
- * - Drupal.edit.FieldModel fieldModel: the field model
+ * - Drupal.quickedit.EditorModel model: the in-place editor state model
+ * - Drupal.quickedit.FieldModel fieldModel: the field model
*/
initialize: function (options) {
this.fieldModel = options.fieldModel;
@@ -58,12 +58,12 @@
*
* For some single cardinality fields, it may be necessary or useful to
* not in-place edit (and hence decorate) the DOM element with the
- * data-edit-field-id attribute (which is the field's wrapper), but a specific
- * element within the field's wrapper.
+ * data-quickedit-field-id attribute (which is the field's wrapper), but a
+ * specific element within the field's wrapper.
* e.g. using a WYSIWYG editor on a body field should happen on the DOM
* element containing the text itself, not on the field wrapper.
*
- * For example, @see Drupal.edit.editors.plain_text.
+ * For example, @see Drupal.quickedit.editors.plain_text.
*
* @return jQuery
* A jQuery-wrapped DOM element.
@@ -73,25 +73,26 @@
},
/**
- * Returns 3 Edit UI settings that depend on the in-place editor:
+ * Returns 3 Quick Edit UI settings that depend on the in-place editor:
* - Boolean padding: indicates whether padding should be applied to the
* edited element, to guarantee legibility of text.
- * - Boolean unifiedToolbar: provides the in-place editor with the ability to
- * insert its own toolbar UI into Edit's tightly integrated toolbar.
- * - Boolean fullWidthToolbar: indicates whether Edit's tightly integrated
- * toolbar should consume the full width of the element, rather than being
- * just long enough to accommodate a label.
+ * - Boolean unifiedToolbar: provides the in-place editor with the ability
+ * to insert its own toolbar UI into Quick Edit's tightly integrated
+ * toolbar.
+ * - Boolean fullWidthToolbar: indicates whether Quick Edit's tightly
+ * integrated toolbar should consume the full width of the element,
+ * rather than being just long enough to accommodate a label.
*/
- getEditUISettings: function () {
+ getQuickEditUISettings: function () {
return { padding: false, unifiedToolbar: false, fullWidthToolbar: false, popup: false };
},
/**
* Determines the actions to take given a change of state.
*
- * @param Drupal.edit.FieldModel fieldModel
+ * @param Drupal.quickedit.FieldModel fieldModel
* @param String state
- * The state of the associated field. One of Drupal.edit.FieldModel.states.
+ * The state of the associated field. One of Drupal.quickedit.FieldModel.states.
*/
stateChange: function (fieldModel, state) {
var from = fieldModel.previous('state');
@@ -178,7 +179,7 @@
save: function () {
var fieldModel = this.fieldModel;
var editorModel = this.model;
- var backstageId = 'edit_backstage-' + this.fieldModel.id.replace(/[\/\[\]\_\s]/g, '-');
+ var backstageId = 'quickedit_backstage-' + this.fieldModel.id.replace(/[\/\[\]\_\s]/g, '-');
function fillAndSubmitForm(value) {
var $form = $('#' + backstageId).find('form');
@@ -188,7 +189,7 @@
// Don't mess with the node summary.
.not('[name$="\\[summary\\]"]').val(value);
// Submit the form.
- $form.find('.edit-form-submit').trigger('click.edit');
+ $form.find('.quickedit-form-submit').trigger('click.quickedit');
}
var formOptions = {
@@ -206,11 +207,11 @@
};
var self = this;
- Drupal.edit.util.form.load(formOptions, function (form, ajax) {
+ Drupal.quickedit.util.form.load(formOptions, function (form, ajax) {
// Create a backstage area for storing forms that are hidden from view
// (hence "backstage" — since the editing doesn't happen in the form, it
// happens "directly" in the content, the form is only used for saving).
- var $backstage = $(Drupal.theme('editBackstage', { id: backstageId })).appendTo('body');
+ var $backstage = $(Drupal.theme('quickeditBackstage', { id: backstageId })).appendTo('body');
// Hidden forms are stuffed into the backstage container for this field.
var $form = $(form).appendTo($backstage);
// Disable the browser's HTML5 validation; we only care about server-
@@ -218,17 +219,17 @@
// because browsers don't like to set HTML5 validation errors on hidden
// forms.)
$form.prop('novalidate', true);
- var $submit = $form.find('.edit-form-submit');
- self.formSaveAjax = Drupal.edit.util.form.ajaxifySaving(formOptions, $submit);
+ var $submit = $form.find('.quickedit-form-submit');
+ self.formSaveAjax = Drupal.quickedit.util.form.ajaxifySaving(formOptions, $submit);
function removeHiddenForm() {
- Drupal.edit.util.form.unajaxifySaving(self.formSaveAjax);
+ Drupal.quickedit.util.form.unajaxifySaving(self.formSaveAjax);
delete self.formSaveAjax;
$backstage.remove();
}
// Successfully saved.
- self.formSaveAjax.commands.editFieldFormSaved = function (ajax, response, status) {
+ self.formSaveAjax.commands.quickeditFieldFormSaved = function (ajax, response, status) {
removeHiddenForm();
// First, transition the state to 'saved'.
fieldModel.set('state', 'saved');
@@ -242,18 +243,19 @@
};
// Unsuccessfully saved; validation errors.
- self.formSaveAjax.commands.editFieldFormValidationErrors = function (ajax, response, status) {
+ self.formSaveAjax.commands.quickeditFieldFormValidationErrors = function (ajax, response, status) {
removeHiddenForm();
editorModel.set('validationErrors', response.data);
fieldModel.set('state', 'invalid');
};
- // The editFieldForm AJAX command is only called upon loading the form
- // for the first time, and when there are validation errors in the form;
- // Form API then marks which form items have errors. This is useful for
- // the form-based in-place editor, but pointless for any other: the form
- // itself won't be visible at all anyway! So, we just ignore it.
- self.formSaveAjax.commands.editFieldForm = function () {};
+ // The quickeditFieldForm AJAX command is only called upon loading the
+ // form for the first time, and when there are validation errors in the
+ // form; Form API then marks which form items have errors. This is
+ // useful for the form-based in-place editor, but pointless for any
+ // other: the form itself won't be visible at all anyway! So, we just
+ // ignore it.
+ self.formSaveAjax.commands.quickeditFieldForm = function () {};
fillAndSubmitForm(editorModel.get('currentValue'));
});
@@ -265,10 +267,10 @@
* Should be called when the state is changed to 'invalid'.
*/
showValidationErrors: function () {
- var $errors = $('
')
+ var $errors = $('
')
.append(this.model.get('validationErrors'));
this.getEditedElement()
- .addClass('edit-validation-error')
+ .addClass('quickedit-validation-error')
.after($errors);
},
@@ -282,8 +284,8 @@
*/
removeValidationErrors: function () {
this.getEditedElement()
- .removeClass('edit-validation-error')
- .next('.edit-validation-errors')
+ .removeClass('quickedit-validation-error')
+ .next('.quickedit-validation-errors')
.remove();
}
diff --git a/core/modules/edit/js/views/EntityDecorationView.js b/core/modules/quickedit/js/views/EntityDecorationView.js
similarity index 80%
rename from core/modules/edit/js/views/EntityDecorationView.js
rename to core/modules/quickedit/js/views/EntityDecorationView.js
index 309718f..69a4767 100644
--- a/core/modules/edit/js/views/EntityDecorationView.js
+++ b/core/modules/quickedit/js/views/EntityDecorationView.js
@@ -7,7 +7,7 @@
"use strict";
- Drupal.edit.EntityDecorationView = Backbone.View.extend({
+ Drupal.quickedit.EntityDecorationView = Backbone.View.extend({
/**
* {@inheritdoc}
@@ -22,7 +22,7 @@
* {@inheritdoc}
*/
render: function () {
- this.$el.toggleClass('edit-entity-active', this.model.get('isActive'));
+ this.$el.toggleClass('quickedit-entity-active', this.model.get('isActive'));
},
/**
diff --git a/core/modules/edit/js/views/EntityToolbarView.js b/core/modules/quickedit/js/views/EntityToolbarView.js
similarity index 87%
rename from core/modules/edit/js/views/EntityToolbarView.js
rename to core/modules/quickedit/js/views/EntityToolbarView.js
index 064c6cd..c9abd94 100644
--- a/core/modules/edit/js/views/EntityToolbarView.js
+++ b/core/modules/quickedit/js/views/EntityToolbarView.js
@@ -7,7 +7,7 @@
"use strict";
- Drupal.edit.EntityToolbarView = Backbone.View.extend({
+ Drupal.quickedit.EntityToolbarView = Backbone.View.extend({
_fieldToolbarRoot: null,
@@ -37,11 +37,11 @@
// Reposition the entity toolbar as the viewport and the position within the
// viewport changes.
- $(window).on('resize.edit scroll.edit', debounce($.proxy(this.windowChangeHandler, this), 150));
+ $(window).on('resize.quickedit scroll.quickedit', debounce($.proxy(this.windowChangeHandler, this), 150));
// Adjust the fence placement within which the entity toolbar may be
// positioned.
- $(document).on('drupalViewportOffsetChange.edit', function (event, offsets) {
+ $(document).on('drupalViewportOffsetChange.quickedit', function (event, offsets) {
if (that.$fence) {
that.$fence.css(offsets);
}
@@ -50,7 +50,7 @@
// Set the entity toolbar DOM element as the el for this view.
var $toolbar = this.buildToolbarEl();
this.setElement($toolbar);
- this._fieldToolbarRoot = $toolbar.find('.edit-toolbar-field').get(0);
+ this._fieldToolbarRoot = $toolbar.find('.quickedit-toolbar-field').get(0);
// Initial render.
this.render();
@@ -63,13 +63,13 @@
if (this.model.get('isActive')) {
// If the toolbar container doesn't exist, create it.
var $body = $('body');
- if ($body.children('#edit-entity-toolbar').length === 0) {
+ if ($body.children('#quickedit-entity-toolbar').length === 0) {
$body.append(this.$el);
}
// The fence will define a area on the screen that the entity toolbar
// will be position within.
- if ($body.children('#edit-toolbar-fence').length === 0) {
- this.$fence = $(Drupal.theme('editEntityToolbarFence'))
+ if ($body.children('#quickedit-toolbar-fence').length === 0) {
+ this.$fence = $(Drupal.theme('quickeditEntityToolbarFence'))
.css(Drupal.displace())
.appendTo($body);
}
@@ -84,7 +84,7 @@
}
// The save button text and state varies with the state of the entity model.
- var $button = this.$el.find('.edit-button.action-save');
+ var $button = this.$el.find('.quickedit-button.action-save');
var isDirty = this.model.get('isDirty');
// Adjust the save button according to the state of the model.
switch (this.model.get('state')) {
@@ -121,8 +121,8 @@
this.$fence.remove();
// Stop listening to additional events.
- $(window).off('resize.edit scroll.edit');
- $(document).off('drupalViewportOffsetChange.edit');
+ $(window).off('resize.quickedit scroll.quickedit');
+ $(document).off('drupalViewportOffsetChange.quickedit');
Backbone.View.prototype.remove.call(this);
},
@@ -139,9 +139,9 @@
/**
* Determines the actions to take given a change of state.
*
- * @param Drupal.edit.FieldModel model
+ * @param Drupal.quickedit.FieldModel model
* @param String state
- * The state of the associated field. One of Drupal.edit.FieldModel.states.
+ * The state of the associated field. One of Drupal.quickedit.FieldModel.states.
*/
fieldStateChange: function (model, state) {
switch (state) {
@@ -186,19 +186,19 @@
break;
case 1:
// Position against a form container.
- activeField = Drupal.edit.app.model.get('activeField');
- of = activeField && activeField.editorView && activeField.editorView.$formContainer && activeField.editorView.$formContainer.find('.edit-form');
+ activeField = Drupal.quickedit.app.model.get('activeField');
+ of = activeField && activeField.editorView && activeField.editorView.$formContainer && activeField.editorView.$formContainer.find('.quickedit-form');
break;
case 2:
// Position against an active field.
of = activeField && activeField.editorView && activeField.editorView.getEditedElement();
- if (activeField && activeField.editorView && activeField.editorView.getEditUISettings().padding) {
+ if (activeField && activeField.editorView && activeField.editorView.getQuickEditUISettings().padding) {
horizontalPadding = 5;
}
break;
case 3:
// Position against a highlighted field.
- highlightedField = Drupal.edit.app.model.get('highlightedField');
+ highlightedField = Drupal.quickedit.app.model.get('highlightedField');
of = highlightedField && highlightedField.editorView && highlightedField.editorView.getEditedElement();
delay = 250;
break;
@@ -234,13 +234,13 @@
function refinePosition(view, suggested, info) {
// Determine if the pointer should be on the top or bottom.
var isBelow = suggested.top > info.target.top;
- info.element.element.toggleClass('edit-toolbar-pointer-top', isBelow);
+ info.element.element.toggleClass('quickedit-toolbar-pointer-top', isBelow);
// Don't position the toolbar past the first or last editable field if
// the entity is the target.
if (view.$entity[0] === info.target.element[0]) {
// Get the first or last field according to whether the toolbar is above
// or below the entity.
- var $field = view.$entity.find('.edit-editable').eq((isBelow) ? -1 : 0);
+ var $field = view.$entity.find('.quickedit-editable').eq((isBelow) ? -1 : 0);
if ($field.length > 0) {
suggested.top = (isBelow) ? ($field.offset().top + $field.outerHeight(true)) : $field.offset().top - info.element.element.outerHeight(true);
}
@@ -339,27 +339,27 @@
* Builds the entity toolbar HTML; attaches to DOM; sets starting position.
*/
buildToolbarEl: function () {
- var $toolbar = $(Drupal.theme('editEntityToolbar', {
- id: 'edit-entity-toolbar'
+ var $toolbar = $(Drupal.theme('quickeditEntityToolbar', {
+ id: 'quickedit-entity-toolbar'
}));
$toolbar
- .find('.edit-toolbar-entity')
+ .find('.quickedit-toolbar-entity')
// Append the "ops" toolgroup into the toolbar.
- .prepend(Drupal.theme('editToolgroup', {
+ .prepend(Drupal.theme('quickeditToolgroup', {
classes: ['ops'],
buttons: [
{
label: Drupal.t('Save'),
type: 'submit',
- classes: 'action-save edit-button icon',
+ classes: 'action-save quickedit-button icon',
attributes: {
'aria-hidden': true
}
},
{
label: Drupal.t('Close'),
- classes: 'action-cancel edit-button icon icon-close icon-only'
+ classes: 'action-cancel quickedit-button icon icon-close icon-only'
}
]
}));
@@ -394,20 +394,20 @@
var entityLabel = this.model.get('label');
// Label of an active field, if it exists.
- var activeField = Drupal.edit.app.model.get('activeField');
+ var activeField = Drupal.quickedit.app.model.get('activeField');
var activeFieldLabel = activeField && activeField.get('metadata').label;
// Label of a highlighted field, if it exists.
- var highlightedField = Drupal.edit.app.model.get('highlightedField');
+ var highlightedField = Drupal.quickedit.app.model.get('highlightedField');
var highlightedFieldLabel = highlightedField && highlightedField.get('metadata').label;
// The label is constructed in a priority order.
if (activeFieldLabel) {
- label = Drupal.theme('editEntityToolbarLabel', {
+ label = Drupal.theme('quickeditEntityToolbarLabel', {
entityLabel: entityLabel,
fieldLabel: activeFieldLabel
});
}
else if (highlightedFieldLabel) {
- label = Drupal.theme('editEntityToolbarLabel', {
+ label = Drupal.theme('quickeditEntityToolbarLabel', {
entityLabel: entityLabel,
fieldLabel: highlightedFieldLabel
});
@@ -417,7 +417,7 @@
}
this.$el
- .find('.edit-toolbar-label')
+ .find('.quickedit-toolbar-label')
.html(label);
},
@@ -456,7 +456,7 @@
* The toolgroup DOM element.
*/
_find: function (toolgroup) {
- return this.$el.find('.edit-toolbar .edit-toolgroup.' + toolgroup);
+ return this.$el.find('.quickedit-toolbar .quickedit-toolgroup.' + toolgroup);
},
/**
@@ -466,7 +466,7 @@
* A toolgroup name.
*/
show: function (toolgroup) {
- this.$el.removeClass('edit-animate-invisible');
+ this.$el.removeClass('quickedit-animate-invisible');
}
});
diff --git a/core/modules/edit/js/views/FieldDecorationView.js b/core/modules/quickedit/js/views/FieldDecorationView.js
similarity index 83%
rename from core/modules/edit/js/views/FieldDecorationView.js
rename to core/modules/quickedit/js/views/FieldDecorationView.js
index e873e45..9e85c02 100644
--- a/core/modules/edit/js/views/FieldDecorationView.js
+++ b/core/modules/quickedit/js/views/FieldDecorationView.js
@@ -7,16 +7,16 @@
"use strict";
- Drupal.edit.FieldDecorationView = Backbone.View.extend({
+ Drupal.quickedit.FieldDecorationView = Backbone.View.extend({
_widthAttributeIsEmpty: null,
events: {
- 'mouseenter.edit': 'onMouseEnter',
- 'mouseleave.edit': 'onMouseLeave',
+ 'mouseenter.quickedit': 'onMouseEnter',
+ 'mouseleave.quickedit': 'onMouseLeave',
'click': 'onClick',
- 'tabIn.edit': 'onMouseEnter',
- 'tabOut.edit': 'onMouseLeave'
+ 'tabIn.quickedit': 'onMouseEnter',
+ 'tabOut.quickedit': 'onMouseLeave'
},
/**
@@ -24,7 +24,7 @@
*
* @param Object options
* An object with the following keys:
- * - Drupal.edit.EditorView editorView: the editor object view.
+ * - Drupal.quickedit.EditorView editorView: the editor object view.
*/
initialize: function (options) {
this.editorView = options.editorView;
@@ -46,9 +46,9 @@
/**
* Determines the actions to take given a change of state.
*
- * @param Drupal.edit.FieldModel model
+ * @param Drupal.quickedit.FieldModel model
* @param String state
- * The state of the associated field. One of Drupal.edit.FieldModel.states.
+ * The state of the associated field. One of Drupal.quickedit.FieldModel.states.
*/
stateChange: function (model, state) {
var from = model.previous('state');
@@ -80,7 +80,7 @@
if (from !== 'activating') {
this.prepareEdit();
}
- if (this.editorView.getEditUISettings().padding) {
+ if (this.editorView.getQuickEditUISettings().padding) {
this._pad();
}
break;
@@ -102,7 +102,7 @@
* changed and stored before by the user (i.e. remotely, stored in TempStore).
*/
renderChanged: function () {
- this.$el.toggleClass('edit-changed', this.model.get('isChanged') || this.model.get('inTempStore'));
+ this.$el.toggleClass('quickedit-changed', this.model.get('isChanged') || this.model.get('inTempStore'));
},
/**
@@ -142,14 +142,14 @@
* Adds classes used to indicate an elements editable state.
*/
decorate: function () {
- this.$el.addClass('edit-candidate edit-editable');
+ this.$el.addClass('quickedit-candidate quickedit-editable');
},
/**
* Removes classes used to indicate an elements editable state.
*/
undecorate: function () {
- this.$el.removeClass('edit-candidate edit-editable edit-highlighted edit-editing');
+ this.$el.removeClass('quickedit-candidate quickedit-editable quickedit-highlighted quickedit-editing');
},
/**
@@ -159,26 +159,26 @@
// Animations.
var that = this;
// Use a timeout to grab the next available animation frame.
- that.$el.addClass('edit-highlighted');
+ that.$el.addClass('quickedit-highlighted');
},
/**
* Removes the class that indicates that an element is highlighted.
*/
stopHighlight: function () {
- this.$el.removeClass('edit-highlighted');
+ this.$el.removeClass('quickedit-highlighted');
},
/**
* Removes the class that indicates that an element as editable.
*/
prepareEdit: function () {
- this.$el.addClass('edit-editing');
+ this.$el.addClass('quickedit-editing');
// Allow the field to be styled differently while editing in a pop-up
// in-place editor.
- if (this.editorView.getEditUISettings().popup) {
- this.$el.addClass('edit-editor-is-popup');
+ if (this.editorView.getQuickEditUISettings().popup) {
+ this.$el.addClass('quickedit-editor-is-popup');
}
},
@@ -189,15 +189,15 @@
* again available to be edited.
*/
stopEdit: function () {
- this.$el.removeClass('edit-highlighted edit-editing');
+ this.$el.removeClass('quickedit-highlighted quickedit-editing');
// Done editing in a pop-up in-place editor; remove the class.
- if (this.editorView.getEditUISettings().popup) {
- this.$el.removeClass('edit-editor-is-popup');
+ if (this.editorView.getQuickEditUISettings().popup) {
+ this.$el.removeClass('quickedit-editor-is-popup');
}
// Make the other editors show up again.
- $('.edit-candidate').addClass('edit-editable');
+ $('.quickedit-candidate').addClass('quickedit-editable');
},
/**
@@ -205,7 +205,7 @@
*/
_pad: function () {
// Early return if the element has already been padded.
- if (this.$el.data('edit-padded')) {
+ if (this.$el.data('quickedit-padded')) {
return;
}
var self = this;
@@ -217,7 +217,7 @@
if (this.$el[0].style.width === "") {
this._widthAttributeIsEmpty = true;
this.$el
- .addClass('edit-animate-disable-width')
+ .addClass('quickedit-animate-disable-width')
.css('width', this.$el.width())
.css('background-color', this._getBgColor(this.$el));
}
@@ -226,7 +226,7 @@
var posProp = this._getPositionProperties(this.$el);
setTimeout(function () {
// Re-enable width animations (padding changes affect width too!).
- self.$el.removeClass('edit-animate-disable-width');
+ self.$el.removeClass('quickedit-animate-disable-width');
// Pad the editable.
self.$el
@@ -240,7 +240,7 @@
'padding-bottom': posProp['padding-bottom'] + 5 + 'px',
'margin-bottom': posProp['margin-bottom'] - 10 + 'px'
})
- .data('edit-padded', true);
+ .data('quickedit-padded', true);
}, 0);
},
@@ -249,7 +249,7 @@
*/
_unpad: function () {
// Early return if the element has not been padded.
- if (!this.$el.data('edit-padded')) {
+ if (!this.$el.data('quickedit-padded')) {
return;
}
var self = this;
@@ -257,7 +257,7 @@
// 1) Set the empty width again.
if (this._widthAttributeIsEmpty) {
this.$el
- .addClass('edit-animate-disable-width')
+ .addClass('quickedit-animate-disable-width')
.css('width', '')
.css('background-color', '');
}
@@ -267,7 +267,7 @@
var posProp = this._getPositionProperties(this.$el);
setTimeout(function () {
// Re-enable width animations (padding changes affect width too!).
- self.$el.removeClass('edit-animate-disable-width');
+ self.$el.removeClass('quickedit-animate-disable-width');
// Unpad the editable.
self.$el
@@ -286,7 +286,7 @@
// done outside the timed out function above so that we don't get numerous
// queued functions that will remove padding before the data marker has
// been removed.
- this.$el.removeData('edit-padded');
+ this.$el.removeData('quickedit-padded');
},
/**
diff --git a/core/modules/edit/js/views/FieldToolbarView.js b/core/modules/quickedit/js/views/FieldToolbarView.js
similarity index 74%
rename from core/modules/edit/js/views/FieldToolbarView.js
rename to core/modules/quickedit/js/views/FieldToolbarView.js
index 55fcf37..24676ed 100644
--- a/core/modules/edit/js/views/FieldToolbarView.js
+++ b/core/modules/quickedit/js/views/FieldToolbarView.js
@@ -7,7 +7,7 @@
"use strict";
- Drupal.edit.FieldToolbarView = Backbone.View.extend({
+ Drupal.quickedit.FieldToolbarView = Backbone.View.extend({
// The edited element, as indicated by EditorView.getEditedElement().
$editedElement: null,
@@ -26,7 +26,7 @@
this.$root = this.$el;
// Generate a DOM-compatible ID for the form container DOM element.
- this._id = 'edit-toolbar-for-' + this.model.id.replace(/[\/\[\]]/g, '_');
+ this._id = 'quickedit-toolbar-for-' + this.model.id.replace(/[\/\[\]]/g, '_');
this.listenTo(this.model, 'change:state', this.stateChange);
},
@@ -36,7 +36,7 @@
*/
render: function () {
// Render toolbar and set it as the view's element.
- this.setElement($(Drupal.theme('editFieldToolbar', {
+ this.setElement($(Drupal.theme('quickeditFieldToolbar', {
id: this._id
})));
@@ -49,9 +49,9 @@
/**
* Determines the actions to take given a change of state.
*
- * @param Drupal.edit.FieldModel model
+ * @param Drupal.quickedit.FieldModel model
* @param String state
- * The state of the associated field. One of Drupal.edit.FieldModel.states.
+ * The state of the associated field. One of Drupal.quickedit.FieldModel.states.
*/
stateChange: function (model, state) {
var from = model.previous('state');
@@ -73,11 +73,11 @@
case 'activating':
this.render();
- if (this.editorView.getEditUISettings().fullWidthToolbar) {
- this.$el.addClass('edit-toolbar-fullwidth');
+ if (this.editorView.getQuickEditUISettings().fullWidthToolbar) {
+ this.$el.addClass('quickedit-toolbar-fullwidth');
}
- if (this.editorView.getEditUISettings().unifiedToolbar) {
+ if (this.editorView.getQuickEditUISettings().unifiedToolbar) {
this.insertWYSIWYGToolGroups();
}
break;
@@ -99,14 +99,14 @@
*/
insertWYSIWYGToolGroups: function () {
this.$el
- .append(Drupal.theme('editToolgroup', {
+ .append(Drupal.theme('quickeditToolgroup', {
id: this.getFloatedWysiwygToolgroupId(),
- classes: ['wysiwyg-floated', 'edit-animate-slow', 'edit-animate-invisible', 'edit-animate-delay-veryfast'],
+ classes: ['wysiwyg-floated', 'quickedit-animate-slow', 'quickedit-animate-invisible', 'quickedit-animate-delay-veryfast'],
buttons: []
}))
- .append(Drupal.theme('editToolgroup', {
+ .append(Drupal.theme('quickeditToolgroup', {
id: this.getMainWysiwygToolgroupId(),
- classes: ['wysiwyg-main', 'edit-animate-slow', 'edit-animate-invisible', 'edit-animate-delay-veryfast'],
+ classes: ['wysiwyg-main', 'quickedit-animate-slow', 'quickedit-animate-invisible', 'quickedit-animate-delay-veryfast'],
buttons: []
}));
@@ -124,7 +124,7 @@
* A string that can be used as the ID for this toolbar's container.
*/
getId: function () {
- return 'edit-toolbar-for-' + this._id;
+ return 'quickedit-toolbar-for-' + this._id;
},
/**
@@ -136,7 +136,7 @@
* A string that can be used as the ID.
*/
getFloatedWysiwygToolgroupId: function () {
- return 'edit-wysiwyg-floated-toolgroup-for-' + this._id;
+ return 'quickedit-wysiwyg-floated-toolgroup-for-' + this._id;
},
/**
@@ -148,7 +148,7 @@
* A string that can be used as the ID.
*/
getMainWysiwygToolgroupId: function () {
- return 'edit-wysiwyg-main-toolgroup-for-' + this._id;
+ return 'quickedit-wysiwyg-main-toolgroup-for-' + this._id;
},
/**
@@ -159,7 +159,7 @@
* @return jQuery
*/
_find: function (toolgroup) {
- return this.$el.find('.edit-toolgroup.' + toolgroup);
+ return this.$el.find('.quickedit-toolgroup.' + toolgroup);
},
/**
@@ -172,14 +172,14 @@
var $group = this._find(toolgroup);
// Attach a transitionEnd event handler to the toolbar group so that update
// events can be triggered after the animations have ended.
- $group.on(Drupal.edit.util.constants.transitionEnd, function (event) {
- $group.off(Drupal.edit.util.constants.transitionEnd);
+ $group.on(Drupal.quickedit.util.constants.transitionEnd, function (event) {
+ $group.off(Drupal.quickedit.util.constants.transitionEnd);
});
// The call to remove the class and start the animation must be started in
// the next animation frame or the event handler attached above won't be
// triggered.
window.setTimeout(function () {
- $group.removeClass('edit-animate-invisible');
+ $group.removeClass('quickedit-animate-invisible');
}, 0);
}
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheck.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheck.php
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheck.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheck.php
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheckInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheckInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/BaseCommand.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/BaseCommand.php
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/EntitySavedCommand.php
similarity index 89%
rename from core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/EntitySavedCommand.php
index 6b6cc59..bd202a8 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/EntitySavedCommand.php
@@ -22,7 +22,7 @@ class EntitySavedCommand extends BaseCommand {
* The data to pass on to the client side.
*/
public function __construct($data) {
- parent::__construct('editEntitySaved', $data);
+ parent::__construct('quickeditEntitySaved', $data);
}
}
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormCommand.php
similarity index 72%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormCommand.php
index 781e2ff..c6db7dc 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormCommand.php
@@ -10,7 +10,8 @@
use Drupal\Core\Ajax\CommandInterface;
/**
- * AJAX command for passing a rendered field form to Edit's JavaScript app.
+ * AJAX command for passing a rendered field form to Quick Edit's JavaScript
+ * app.
*/
class FieldFormCommand extends BaseCommand {
@@ -21,7 +22,7 @@ class FieldFormCommand extends BaseCommand {
* The data to pass on to the client side.
*/
public function __construct($data) {
- parent::__construct('editFieldForm', $data);
+ parent::__construct('quickeditFieldForm', $data);
}
}
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormSavedCommand.php
similarity index 89%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormSavedCommand.php
index 7e2b57f..40b3f57 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormSavedCommand.php
@@ -11,7 +11,7 @@
/**
* AJAX command to indicate a field was saved into TempStore without validation
- * errors and pass the rerendered field to Edit's JavaScript app.
+ * errors and pass the rerendered field to Quick Edit's JavaScript app.
*/
class FieldFormSavedCommand extends BaseCommand {
@@ -32,7 +32,7 @@ class FieldFormSavedCommand extends BaseCommand {
* instances of the same field on the user's page. Keyed by view mode.
*/
public function __construct($data, $other_view_modes = array()) {
- parent::__construct('editFieldFormSaved', $data);
+ parent::__construct('quickeditFieldFormSaved', $data);
$this->other_view_modes = $other_view_modes;
}
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormValidationErrorsCommand.php
similarity index 88%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormValidationErrorsCommand.php
index a44be4b..5004161 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormValidationErrorsCommand.php
@@ -22,7 +22,7 @@ class FieldFormValidationErrorsCommand extends BaseCommand {
* The data to pass on to the client side.
*/
public function __construct($data) {
- parent::__construct('editFieldFormValidationErrors', $data);
+ parent::__construct('quickeditFieldFormValidationErrors', $data);
}
}
diff --git a/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Annotation/InPlaceEditor.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Annotation/InPlaceEditor.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelector.php b/core/modules/quickedit/lib/Drupal/quickedit/EditorSelector.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/EditorSelector.php
rename to core/modules/quickedit/lib/Drupal/quickedit/EditorSelector.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/EditorSelectorInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/EditorSelectorInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/quickedit/lib/Drupal/quickedit/Form/QuickEditFieldForm.php
similarity index 99%
rename from core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Form/QuickEditFieldForm.php
index d292107..56e3757 100644
--- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Form/QuickEditFieldForm.php
@@ -104,7 +104,7 @@ public function buildForm(array $form, array &$form_state, EntityInterface $enti
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => t('Save'),
- '#attributes' => array('class' => array('edit-form-submit')),
+ '#attributes' => array('class' => array('quickedit-form-submit')),
);
// Simplify it for optimal in-place use.
diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php b/core/modules/quickedit/lib/Drupal/quickedit/MetadataGenerator.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/MetadataGenerator.php
rename to core/modules/quickedit/lib/Drupal/quickedit/MetadataGenerator.php
diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/MetadataGeneratorInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/MetadataGeneratorInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/PlainTextEditor.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/PlainTextEditor.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorBase.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorBase.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorBase.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorBase.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorManager.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorManager.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/quickedit/lib/Drupal/quickedit/QuickEditController.php
similarity index 99%
rename from core/modules/edit/lib/Drupal/edit/EditController.php
rename to core/modules/quickedit/lib/Drupal/quickedit/QuickEditController.php
index c977f31..99beecf 100644
--- a/core/modules/edit/lib/Drupal/edit/EditController.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/QuickEditController.php
@@ -22,7 +22,7 @@
use Drupal\user\TempStoreFactory;
/**
- * Returns responses for Edit module routes.
+ * Returns responses for Quick Edit module routes.
*/
class EditController extends ControllerBase {
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
similarity index 99%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
index edd1089..392163b 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
@@ -46,7 +46,7 @@ protected function setUp() {
}
/**
- * Returns the in-place editor that Edit selects.
+ * Returns the in-place editor that Quick Edit selects.
*/
protected function getSelectedEditor($entity_id, $field_name, $view_mode = 'default') {
$entity = entity_load('entity_test', $entity_id, TRUE);
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditAutocompleteTermTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php
similarity index 91%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditAutocompleteTermTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php
index 803b0e3..347d918 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/EditAutocompleteTermTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php
@@ -135,14 +135,14 @@ protected function setUp() {
}
/**
- * Tests Edit autocomplete term behavior.
+ * Tests Quick Edit autocomplete term behavior.
*/
public function testAutocompleteEdit() {
$this->drupalLogin($this->editor_user);
- $edit_uri = 'edit/form/node/'. $this->node->id() . '/' . $this->field_name . '/und/full';
+ $quickedit_uri = 'quickedit/form/node/'. $this->node->id() . '/' . $this->field_name . '/und/full';
$post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
- $response = $this->drupalPost($edit_uri, 'application/vnd.drupal-ajax', $post);
+ $response = $this->drupalPost($quickedit_uri, 'application/vnd.drupal-ajax', $post);
$ajax_commands = Json::decode($response);
// Prepare form values for submission. drupalPostAJAX() is not suitable for
@@ -160,7 +160,7 @@ public function testAutocompleteEdit() {
);
// Submit field form and check response. Should render back all the terms.
- $response = $this->drupalPost($edit_uri, 'application/vnd.drupal-ajax', $post);
+ $response = $this->drupalPost($quickedit_uri, 'application/vnd.drupal-ajax', $post);
$this->assertResponse(200);
$ajax_commands = Json::decode($response);
$this->drupalSetContent($ajax_commands[0]['data']);
@@ -170,9 +170,9 @@ public function testAutocompleteEdit() {
$this->assertNoLink('new term');
// Load the form again, which should now get it back from TempStore.
- $edit_uri = 'edit/form/node/'. $this->node->id() . '/' . $this->field_name . '/und/full';
+ $quickedit_uri = 'quickedit/form/node/'. $this->node->id() . '/' . $this->field_name . '/und/full';
$post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
- $response = $this->drupalPost($edit_uri, 'application/vnd.drupal-ajax', $post);
+ $response = $this->drupalPost($quickedit_uri, 'application/vnd.drupal-ajax', $post);
$ajax_commands = Json::decode($response);
// The AjaxResponse's first command is an InsertCommand which contains
@@ -184,7 +184,7 @@ public function testAutocompleteEdit() {
// Save the entity.
$post = array('nocssjs' => 'true');
- $response = $this->drupalPost('edit/entity/node/' . $this->node->id(), 'application/json', $post);
+ $response = $this->drupalPost('quickedit/entity/node/' . $this->node->id(), 'application/json', $post);
$this->assertResponse(200);
// The full node display should now link to all entities, with the new
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php
similarity index 78%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php
index 6ee7cee..bc9dcbc 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php
@@ -14,7 +14,7 @@
use Drupal\Component\Utility\Unicode;
/**
- * Tests loading of Edit and lazy-loading of in-place editors.
+ * Tests loading of Quick Edit and lazy-loading of in-place editors.
*/
class EditLoadingTest extends WebTestBase {
@@ -71,7 +71,7 @@ protected function setUp() {
}
/**
- * Test the loading of Edit when a user doesn't have access to it.
+ * Test the loading of Quick Edit when a user doesn't have access to it.
*/
public function testUserWithoutPermission() {
$this->drupalLogin($this->author_user);
@@ -79,29 +79,29 @@ public function testUserWithoutPermission() {
// Library and in-place editors.
$settings = $this->drupalGetSettings();
- $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/edit/js/edit.js']), 'Edit library not loaded.');
+ $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/edit/js/edit.js']), 'Quick Edit library not loaded.');
$this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/edit/js/editors/formEditor.js']), "'form' in-place editor not loaded.");
// HTML annotation must always exist (to not break the render cache).
- $this->assertRaw('data-edit-entity-id="node/1"');
- $this->assertRaw('data-edit-field-id="node/1/body/und/full"');
+ $this->assertRaw('data-quickedit-entity-id="node/1"');
+ $this->assertRaw('data-quickedit-field-id="node/1/body/und/full"');
// Retrieving the metadata should result in an empty 403 response.
$post = array('fields[0]' => 'node/1/body/und/full');
- $response = $this->drupalPost('edit/metadata', 'application/json', $post);
+ $response = $this->drupalPost('quickedit/metadata', 'application/json', $post);
$this->assertIdentical('{}', $response);
$this->assertResponse(403);
- // Edit's JavaScript would never hit these endpoints if the metadata was
- // empty as above, but we need to make sure that malicious users aren't able
- // to use any of the other endpoints either.
+ // Quick Edit's JavaScript would never hit these endpoints if the metadata
+ // was empty as above, but we need to make sure that malicious users aren't
+ // able to use any of the other endpoints either.
$post = array('editors[0]' => 'form') + $this->getAjaxPageStatePostData();
- $response = $this->drupalPost('edit/attachments', 'application/vnd.drupal-ajax', $post);
+ $response = $this->drupalPost('quickedit/attachments', 'application/vnd.drupal-ajax', $post);
// @todo Uncomment the below once https://drupal.org/node/2063303 is fixed.
// $this->assertIdentical('[]', $response);
$this->assertResponse(403);
$post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
- $response = $this->drupalPost('edit/form/' . 'node/1/body/und/full', 'application/vnd.drupal-ajax', $post);
+ $response = $this->drupalPost('quickedit/form/' . 'node/1/body/und/full', 'application/vnd.drupal-ajax', $post);
// @todo Uncomment the below once https://drupal.org/node/2063303 is fixed.
// $this->assertIdentical('[]', $response);
$this->assertResponse(403);
@@ -113,19 +113,19 @@ public function testUserWithoutPermission() {
$edit['body[0][value]'] = '
Malicious content.
';
$edit['body[0][format]'] = 'filtered_html';
$edit['op'] = t('Save');
- $response = $this->drupalPost('edit/form/' . 'node/1/body/und/full', 'application/vnd.drupal-ajax', $edit);
+ $response = $this->drupalPost('quickedit/form/' . 'node/1/body/und/full', 'application/vnd.drupal-ajax', $edit);
// @todo Uncomment the below once https://drupal.org/node/2063303 is fixed.
// $this->assertIdentical('[]', $response);
$this->assertResponse(403);
$post = array('nocssjs' => 'true');
- $response = $this->drupalPost('edit/entity/' . 'node/1', 'application/json', $post);
+ $response = $this->drupalPost('quickedit/entity/' . 'node/1', 'application/json', $post);
// @todo Uncomment the below once https://drupal.org/node/2063303 is fixed.
// $this->assertIdentical('[]', $response);
$this->assertResponse(403);
}
/**
- * Tests the loading of Edit when a user does have access to it.
+ * Tests the loading of Quick Edit when a user does have access to it.
*
* Also ensures lazy loading of in-place editors works.
*/
@@ -135,12 +135,12 @@ public function testUserWithPermission() {
// Library and in-place editors.
$settings = $this->drupalGetSettings();
- $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/edit/js/edit.js']), 'Edit library loaded.');
+ $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/edit/js/edit.js']), 'Quick Edit library loaded.');
$this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/edit/js/editors/formEditor.js']), "'form' in-place editor not loaded.");
// HTML annotation must always exist (to not break the render cache).
- $this->assertRaw('data-edit-entity-id="node/1"');
- $this->assertRaw('data-edit-field-id="node/1/body/und/full"');
+ $this->assertRaw('data-quickedit-entity-id="node/1"');
+ $this->assertRaw('data-quickedit-field-id="node/1/body/und/full"');
// There should be only one revision so far.
$revisions = node_revision_list(node_load(1));
@@ -150,7 +150,7 @@ public function testUserWithPermission() {
// Retrieving the metadata should result in a 200 JSON response.
$htmlPageDrupalSettings = $this->drupalSettings;
$post = array('fields[0]' => 'node/1/body/und/full');
- $response = $this->drupalPost('edit/metadata', 'application/json', $post);
+ $response = $this->drupalPost('quickedit/metadata', 'application/json', $post);
$this->assertResponse(200);
$expected = array(
'node/1/body/und/full' => array(
@@ -169,7 +169,7 @@ public function testUserWithPermission() {
// 1. a settings command with useless metadata: AjaxController is dumb
// 2. an insert command that loads the required in-place editors
$post = array('editors[0]' => 'form') + $this->getAjaxPageStatePostData();
- $response = $this->drupalPost('edit/attachments', 'application/vnd.drupal-ajax', $post);
+ $response = $this->drupalPost('quickedit/attachments', 'application/vnd.drupal-ajax', $post);
$ajax_commands = Json::decode($response);
$this->assertIdentical(2, count($ajax_commands), 'The attachments HTTP request results in two AJAX commands.');
// First command: settings.
@@ -180,14 +180,14 @@ public function testUserWithPermission() {
$this->assertIdentical($command->render(), $ajax_commands[1], 'The append command contains the expected data.');
// Retrieving the form for this field should result in a 200 response,
- // containing only an editFieldForm command.
+ // containing only a quickeditFieldForm command.
$post = array('nocssjs' => 'true', 'reset' => 'true') + $this->getAjaxPageStatePostData();
- $response = $this->drupalPost('edit/form/' . 'node/1/body/und/full', 'application/vnd.drupal-ajax', $post);
+ $response = $this->drupalPost('quickedit/form/' . 'node/1/body/und/full', 'application/vnd.drupal-ajax', $post);
$this->assertResponse(200);
$ajax_commands = Json::decode($response);
$this->assertIdentical(1, count($ajax_commands), 'The field form HTTP request results in one AJAX command.');
- $this->assertIdentical('editFieldForm', $ajax_commands[0]['command'], 'The first AJAX command is an editFieldForm command.');
- $this->assertIdentical('