');
$this->assertIdentical($json[$ids[3]], '');
// Authenticated user: can access contextual links, cannot edit articles.
diff --git a/core/modules/edit/js/edit.js b/core/modules/edit/js/edit.js
index dab4522..37eab08 100644
--- a/core/modules/edit/js/edit.js
+++ b/core/modules/edit/js/edit.js
@@ -16,7 +16,7 @@
* - contextualLinksQueue: queue of contextual links on entities for which it
* is not yet known whether the user has permission to edit at >=1 of them.
*/
-(function ($, _, Backbone, Drupal, drupalSettings) {
+(function ($, _, Backbone, Drupal, drupalSettings, JSON, storage) {
"use strict";
@@ -59,15 +59,28 @@ Drupal.behaviors.edit = {
// Initialize the Edit app once per page load.
$('body').once('edit-init', initEdit);
+ // Find all in-place editable fields, if any.
+ var $fields = $(context).find('[data-edit-id]').once('edit');
+ if ($fields.length === 0) {
+ return;
+ }
+
// Process each field element: queue to be used or to fetch metadata.
// When a field is being rerendered after editing, it will be processed
// immediately. New fields will be unable to be processed immediately, but
// will instead be queued to have their metadata fetched, which occurs below
// in fetchMissingMetaData().
- $(context).find('[data-edit-id]').once('edit').each(function (index, fieldElement) {
+ $fields.each(function (index, fieldElement) {
processField(fieldElement);
});
+ // Entities and fields on the page have been detected, try to set up the
+ // contextual links for those entities that already have the necessary meta-
+ // data in the client-side cache.
+ contextualLinksQueue = _.filter(contextualLinksQueue, function (contextualLink) {
+ return !initializeEntityContextualLink(contextualLink);
+ });
+
// Fetch metadata for any fields that are queued to retrieve it.
fetchMissingMetadata(function (fieldElementsWithFreshMetadata) {
// Metadata has been fetched, reprocess fields whose metadata was missing.
@@ -103,17 +116,47 @@ Drupal.edit = {
// Per-field metadata that indicates whether in-place editing is allowed,
// which in-place editor should be used, etc.
metadata: {
- has: function (fieldID) { return _.has(this.data, fieldID); },
- add: function (fieldID, metadata) { this.data[fieldID] = metadata; },
+ has: function (fieldID) {
+ return storage.getItem(this._prefixFieldID(fieldID)) !== null;
+ },
+ add: function (fieldID, metadata) {
+ storage.setItem(this._prefixFieldID(fieldID), JSON.stringify(metadata));
+ },
get: function (fieldID, key) {
- return (key === undefined) ? this.data[fieldID] : this.data[fieldID][key];
+ var metadata = JSON.parse(storage.getItem(this._prefixFieldID(fieldID)));
+ return (key === undefined) ? metadata : metadata[key];
+ },
+ _prefixFieldID: function (fieldID) {
+ return 'Drupal.edit.metadata.' + fieldID;
},
- intersection: function (fieldIDs) { return _.intersection(fieldIDs, _.keys(this.data)); },
- // Contains the actual metadata, keyed by field ID.
- data: {}
+ _unprefixFieldID: function (fieldID) {
+ // Strip "Drupal.edit.metadata.", which is 21 characters long.
+ return fieldID.substring(21);
+ },
+ intersection: function (fieldIDs) {
+ var prefixedFieldIDs = _.map(fieldIDs, this._prefixFieldID);
+ var intersection = _.intersection(prefixedFieldIDs, _.keys(sessionStorage));
+ return _.map(intersection, this._unprefixFieldID);
+ }
}
};
+// Clear the Edit metadata cache whenever the current user's set of permissions
+// changes.
+var permissionsHashKey = Drupal.edit.metadata._prefixFieldID('permissionsHash');
+var permissionsHashValue = storage.getItem(permissionsHashKey);
+var permissionsHash = drupalSettings.user.permissionsHash;
+if (permissionsHashValue !== permissionsHash) {
+ if (typeof permissionsHash === 'string') {
+ _.chain(storage).keys().each(function (key) {
+ if (key.substring(0, 21) === 'Drupal.edit.metadata.') {
+ storage.removeItem(key);
+ }
+ });
+ }
+ storage.setItem(permissionsHashKey, permissionsHash);
+}
+
/**
* Detect contextual links on entities annotated by Edit; queue these to be
* processed.
@@ -244,7 +287,7 @@ function fetchMissingMetadata (callback) {
var fieldElementsWithoutMetadata = _.pluck(fieldsMetadataQueue, 'el');
var entityIDs = _.uniq(_.pluck(fieldsMetadataQueue, 'entityID'), true);
// Ensure we only request entityIDs for which we don't have metadata yet.
- entityIDs = _.difference(entityIDs, _.keys(Drupal.edit.metadata.data));
+ entityIDs = _.difference(entityIDs, Drupal.edit.metadata.intersection(entityIDs));
fieldsMetadataQueue = [];
$.ajax({
@@ -465,4 +508,4 @@ function deleteContainedModelsAndQueues($context) {
});
}
-})(jQuery, _, Backbone, Drupal, drupalSettings);
+})(jQuery, _, Backbone, Drupal, drupalSettings, window.JSON, window.sessionStorage);
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index f4f9e53..48baaa1 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -418,7 +418,7 @@ public function testBlockContextualLinks() {
$response = $this->drupalPost('contextual/render', 'application/json', $post, array('query' => array('destination' => 'test-page')));
$this->assertResponse(200);
$json = drupal_json_decode($response);
- $this->assertIdentical($json[$id], '