Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue #2617224 by Wim Leers: Move around/fix some documentation.
This commit is contained in:
parent
4afb23bbd3
commit
7784f4c23d
929 changed files with 19798 additions and 5304 deletions
|
@ -735,9 +735,36 @@
|
|||
}
|
||||
$(this.element).prop('disabled', false);
|
||||
|
||||
// Save element's ancestors tree so if the element is removed from the dom
|
||||
// we can try to refocus one of its parents. Using addBack reverse the
|
||||
// result array, meaning that index 0 is the highest parent in the hierarchy
|
||||
// in this situation it is usually a <form> element.
|
||||
var elementParents = $(this.element).parents('[data-drupal-selector]').addBack().toArray();
|
||||
|
||||
// Track if any command is altering the focus so we can avoid changing the
|
||||
// focus set by the Ajax command.
|
||||
var focusChanged = false;
|
||||
for (var i in response) {
|
||||
if (response.hasOwnProperty(i) && response[i].command && this.commands[response[i].command]) {
|
||||
this.commands[response[i].command](this, response[i], status);
|
||||
if (response[i].command === 'invoke' && response[i].method === 'focus') {
|
||||
focusChanged = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If the focus hasn't be changed by the ajax commands, try to refocus the
|
||||
// triggering element or one of its parents if that element does not exist
|
||||
// anymore.
|
||||
if (!focusChanged && this.element && !$(this.element).data('disable-refocus')) {
|
||||
var target = false;
|
||||
|
||||
for (var n = elementParents.length - 1; !target && n > 0; n--) {
|
||||
target = document.querySelector('[data-drupal-selector="' + elementParents[n].getAttribute('data-drupal-selector') + '"]');
|
||||
}
|
||||
|
||||
if (target) {
|
||||
$(target).trigger('focus');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
|
||||
'use strict';
|
||||
|
||||
var settingsElement = document.querySelector('script[type="application/json"][data-drupal-selector="drupal-settings-json"]');
|
||||
// Use direct child elements to harden against XSS exploits when CSP is on.
|
||||
var settingsElement = document.querySelector('head > script[type="application/json"][data-drupal-selector="drupal-settings-json"], body > script[type="application/json"][data-drupal-selector="drupal-settings-json"]');
|
||||
|
||||
/**
|
||||
* Variable generated by Drupal with all the configuration created from PHP.
|
||||
|
|
|
@ -120,6 +120,7 @@
|
|||
type: this.method,
|
||||
url: uri,
|
||||
data: '',
|
||||
dataType: 'json',
|
||||
success: function (progress) {
|
||||
// Display errors.
|
||||
if (progress.status === 0) {
|
||||
|
|
|
@ -236,14 +236,10 @@
|
|||
|
||||
// Add event bindings to the document. The self variable is passed along
|
||||
// as event handlers do not have direct access to the tableDrag object.
|
||||
if (Modernizr.touchevents) {
|
||||
$(document).on('touchmove', function (event) { return self.dragRow(event.originalEvent.touches[0], self); });
|
||||
$(document).on('touchend', function (event) { return self.dropRow(event.originalEvent.touches[0], self); });
|
||||
}
|
||||
else {
|
||||
$(document).on('mousemove', function (event) { return self.dragRow(event, self); });
|
||||
$(document).on('mouseup', function (event) { return self.dropRow(event, self); });
|
||||
}
|
||||
$(document).on('touchmove', function (event) { return self.dragRow(event.originalEvent.touches[0], self); });
|
||||
$(document).on('touchend', function (event) { return self.dropRow(event.originalEvent.touches[0], self); });
|
||||
$(document).on('mousemove pointermove', function (event) { return self.dragRow(event, self); });
|
||||
$(document).on('mouseup pointerup', function (event) { return self.dropRow(event, self); });
|
||||
|
||||
// React to localStorage event showing or hiding weight columns.
|
||||
$(window).on('storage', $.proxy(function (e) {
|
||||
|
@ -460,19 +456,13 @@
|
|||
$item.find('td').eq(0).prepend(handle);
|
||||
}
|
||||
|
||||
if (Modernizr.touchevents) {
|
||||
handle.on('touchstart', function (event) {
|
||||
event.preventDefault();
|
||||
handle.on('mousedown touchstart pointerdown', function (event) {
|
||||
event.preventDefault();
|
||||
if (event.originalEvent.type === 'touchstart') {
|
||||
event = event.originalEvent.touches[0];
|
||||
self.dragStart(event, self, item);
|
||||
});
|
||||
}
|
||||
else {
|
||||
handle.on('mousedown', function (event) {
|
||||
event.preventDefault();
|
||||
self.dragStart(event, self, item);
|
||||
});
|
||||
}
|
||||
}
|
||||
self.dragStart(event, self, item);
|
||||
});
|
||||
|
||||
// Prevent the anchor tag from jumping us to the top of the page.
|
||||
handle.on('click', function (e) {
|
||||
|
|
Reference in a new issue