Update to Drupal 8.0.0-beta15. For more information, see: https://www.drupal.org/node/2563023
This commit is contained in:
parent
2720a9ec4b
commit
f3791f1da3
1898 changed files with 54300 additions and 11481 deletions
|
@ -11,10 +11,10 @@
|
|||
var escapeAdminPath = sessionStorage.getItem('escapeAdminPath');
|
||||
var windowLocation = window.location;
|
||||
|
||||
// Saves the last non-administrative page in the browser to be able to link back
|
||||
// to it when browsing administrative pages. If there is a destination parameter
|
||||
// there is not need to save the current path because the page is loaded within
|
||||
// an existing "workflow".
|
||||
// Saves the last non-administrative page in the browser to be able to link
|
||||
// back to it when browsing administrative pages. If there is a destination
|
||||
// parameter there is not need to save the current path because the page is
|
||||
// loaded within an existing "workflow".
|
||||
if (!pathInfo.currentPathIsAdmin && !/destination=/.test(windowLocation.search)) {
|
||||
sessionStorage.setItem('escapeAdminPath', windowLocation);
|
||||
}
|
||||
|
@ -22,10 +22,13 @@
|
|||
/**
|
||||
* Replaces the "Home" link with "Back to site" link.
|
||||
*
|
||||
* Back to site link points to the last non-administrative page the user visited
|
||||
* within the same browser tab.
|
||||
* Back to site link points to the last non-administrative page the user
|
||||
* visited within the same browser tab.
|
||||
*
|
||||
* @type {Drupal~behavior}
|
||||
*
|
||||
* @prop {Drupal~behaviorAttach} attach
|
||||
* Attaches the replacement functionality to the toolbar-escape-admin element.
|
||||
*/
|
||||
Drupal.behaviors.escapeAdmin = {
|
||||
attach: function () {
|
||||
|
|
|
@ -138,9 +138,12 @@
|
|||
* @inheritdoc
|
||||
*
|
||||
* @param {object} attributes
|
||||
* Attributes for the toolbar.
|
||||
* @param {object} options
|
||||
* Options for the toolbar.
|
||||
*
|
||||
* @return {string}
|
||||
* @return {string|undefined}
|
||||
* Returns an error message if validation failed.
|
||||
*/
|
||||
validate: function (attributes, options) {
|
||||
// Prevent the orientation being set to horizontal if it is locked, unless
|
||||
|
|
|
@ -35,6 +35,9 @@
|
|||
* Modules register tabs with hook_toolbar().
|
||||
*
|
||||
* @type {Drupal~behavior}
|
||||
*
|
||||
* @prop {Drupal~behaviorAttach} attach
|
||||
* Attaches the toolbar rendering functionality to the toolbar element.
|
||||
*/
|
||||
Drupal.behaviors.toolbar = {
|
||||
attach: function (context) {
|
||||
|
@ -131,7 +134,7 @@
|
|||
// not the first 'Home' toolbar tab).
|
||||
if (Drupal.toolbar.models.toolbarModel.get('orientation') === 'horizontal' && Drupal.toolbar.models.toolbarModel.get('activeTab') === null) {
|
||||
Drupal.toolbar.models.toolbarModel.set({
|
||||
'activeTab': $('.toolbar-bar .toolbar-tab:not(.home-toolbar-tab) a').get(0)
|
||||
activeTab: $('.toolbar-bar .toolbar-tab:not(.home-toolbar-tab) a').get(0)
|
||||
});
|
||||
}
|
||||
});
|
||||
|
@ -181,38 +184,41 @@
|
|||
* Respond to configured narrow media query changes.
|
||||
*
|
||||
* @param {Drupal.toolbar.ToolbarModel} model
|
||||
* A toolbar model
|
||||
* @param {string} label
|
||||
* Media query label.
|
||||
* @param {object} mql
|
||||
* A MediaQueryList object.
|
||||
*/
|
||||
mediaQueryChangeHandler: function (model, label, mql) {
|
||||
switch (label) {
|
||||
case 'toolbar.narrow':
|
||||
model.set({
|
||||
'isOriented': mql.matches,
|
||||
'isTrayToggleVisible': false
|
||||
isOriented: mql.matches,
|
||||
isTrayToggleVisible: false
|
||||
});
|
||||
// If the toolbar doesn't have an explicit orientation yet, or if the
|
||||
// narrow media query doesn't match then set the orientation to
|
||||
// vertical.
|
||||
if (!mql.matches || !model.get('orientation')) {
|
||||
model.set({'orientation': 'vertical'}, {validate: true});
|
||||
model.set({orientation: 'vertical'}, {validate: true});
|
||||
}
|
||||
break;
|
||||
|
||||
case 'toolbar.standard':
|
||||
model.set({
|
||||
'isFixed': mql.matches
|
||||
isFixed: mql.matches
|
||||
});
|
||||
break;
|
||||
|
||||
case 'toolbar.wide':
|
||||
model.set({
|
||||
'orientation': ((mql.matches) ? 'horizontal' : 'vertical')
|
||||
orientation: ((mql.matches) ? 'horizontal' : 'vertical')
|
||||
}, {validate: true});
|
||||
// The tray orientation toggle visibility does not need to be
|
||||
// validated.
|
||||
model.set({
|
||||
'isTrayToggleVisible': mql.matches
|
||||
isTrayToggleVisible: mql.matches
|
||||
});
|
||||
break;
|
||||
|
||||
|
@ -238,8 +244,11 @@
|
|||
* Ajax command to set the toolbar subtrees.
|
||||
*
|
||||
* @param {Drupal.Ajax} ajax
|
||||
* {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
|
||||
* @param {object} response
|
||||
* JSON response from the Ajax request.
|
||||
* @param {number} [status]
|
||||
* XMLHttpRequest status.
|
||||
*/
|
||||
Drupal.AjaxCommands.prototype.setToolbarSubtrees = function (ajax, response, status) {
|
||||
Drupal.toolbar.setSubtrees.resolve(response.subtrees);
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
$.fn.drupalToolbarMenu = function () {
|
||||
|
||||
var ui = {
|
||||
'handleOpen': Drupal.t('Extend'),
|
||||
'handleClose': Drupal.t('Collapse')
|
||||
handleOpen: Drupal.t('Extend'),
|
||||
handleClose: Drupal.t('Collapse')
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -97,9 +97,9 @@
|
|||
*/
|
||||
function initItems($menu) {
|
||||
var options = {
|
||||
'class': 'toolbar-icon toolbar-handle',
|
||||
'action': ui.handleOpen,
|
||||
'text': ''
|
||||
class: 'toolbar-icon toolbar-handle',
|
||||
action: ui.handleOpen,
|
||||
text: ''
|
||||
};
|
||||
// Initialize items and their links.
|
||||
$menu.find('li > a').wrap('<div class="toolbar-box">');
|
||||
|
@ -179,9 +179,13 @@
|
|||
* A toggle is an interactive element often bound to a click handler.
|
||||
*
|
||||
* @param {object} options
|
||||
* Options for the button.
|
||||
* @param {string} options.class
|
||||
* Class to set on the button.
|
||||
* @param {string} options.action
|
||||
* Action for the button.
|
||||
* @param {string} options.text
|
||||
* Used as label for the button.
|
||||
*
|
||||
* @return {string}
|
||||
* A string representing a DOM fragment.
|
||||
|
|
|
@ -17,7 +17,9 @@
|
|||
* @augments Backbone.View
|
||||
*
|
||||
* @param {object} options
|
||||
* Options for the view.
|
||||
* @param {object} options.strings
|
||||
* Various strings to use in the view.
|
||||
*/
|
||||
initialize: function (options) {
|
||||
this.strings = options.strings;
|
||||
|
@ -30,6 +32,7 @@
|
|||
* Announces an orientation change.
|
||||
*
|
||||
* @param {Drupal.toolbar.ToolbarModel} model
|
||||
* The toolbar model in question.
|
||||
* @param {string} orientation
|
||||
* The new value of the orientation attribute in the model.
|
||||
*/
|
||||
|
@ -43,6 +46,7 @@
|
|||
* Announces a changed active tray.
|
||||
*
|
||||
* @param {Drupal.toolbar.ToolbarModel} model
|
||||
* The toolbar model in question.
|
||||
* @param {HTMLElement} tray
|
||||
* The new value of the tray attribute in the model.
|
||||
*/
|
||||
|
|
|
@ -10,7 +10,10 @@
|
|||
Drupal.toolbar.ToolbarVisualView = Backbone.View.extend(/** @lends Drupal.toolbar.ToolbarVisualView# */{
|
||||
|
||||
/**
|
||||
* Event map for the `ToolbarVisualView`.
|
||||
*
|
||||
* @return {object}
|
||||
* A map of events.
|
||||
*/
|
||||
events: function () {
|
||||
// Prevents delay and simulated mouse events.
|
||||
|
@ -35,7 +38,9 @@
|
|||
* @augments Backbone.View
|
||||
*
|
||||
* @param {object} options
|
||||
* Options for the view object.
|
||||
* @param {object} options.strings
|
||||
* Various strings to use in the view.
|
||||
*/
|
||||
initialize: function (options) {
|
||||
this.strings = options.strings;
|
||||
|
@ -58,6 +63,7 @@
|
|||
* @inheritdoc
|
||||
*
|
||||
* @return {Drupal.toolbar.ToolbarVisualView}
|
||||
* The `ToolbarVisualView` instance.
|
||||
*/
|
||||
render: function () {
|
||||
this.updateTabs();
|
||||
|
@ -91,6 +97,7 @@
|
|||
* Responds to a toolbar tab click.
|
||||
*
|
||||
* @param {jQuery.Event} event
|
||||
* The event triggered.
|
||||
*/
|
||||
onTabClick: function (event) {
|
||||
// If this tab has a tray associated with it, it is considered an
|
||||
|
@ -111,6 +118,7 @@
|
|||
* Toggles the orientation of a toolbar tray.
|
||||
*
|
||||
* @param {jQuery.Event} event
|
||||
* The event triggered.
|
||||
*/
|
||||
onOrientationToggleClick: function (event) {
|
||||
var orientation = this.model.get('orientation');
|
||||
|
@ -238,13 +246,13 @@
|
|||
adjustPlacement: function () {
|
||||
var $trays = this.$el.find('.toolbar-tray');
|
||||
if (!this.model.get('isOriented')) {
|
||||
$trays.css('padding-top', 0);
|
||||
$trays.css('margin-top', 0);
|
||||
$trays.removeClass('toolbar-tray-horizontal').addClass('toolbar-tray-vertical');
|
||||
}
|
||||
else {
|
||||
// The toolbar container is invisible. Its placement is used to
|
||||
// determine the container for the trays.
|
||||
$trays.css('padding-top', this.$el.find('.toolbar-bar').outerHeight());
|
||||
$trays.css('margin-top', this.$el.find('.toolbar-bar').outerHeight());
|
||||
}
|
||||
},
|
||||
|
||||
|
|
Reference in a new issue