updated core to 8.6.1 via composer

This commit is contained in:
2018-09-12 13:58:26 +02:00
parent a9a219f2ed
commit ea56b9fba3
4443 changed files with 112098 additions and 40708 deletions
+9 -6
View File
@@ -3,7 +3,7 @@
* Defines Javascript behaviors for the media form.
*/
(function ($, Drupal) {
(function($, Drupal) {
/**
* Behaviors for summaries for tabs in the media edit form.
*
@@ -16,21 +16,24 @@
attach(context) {
const $context = $(context);
$context.find('.media-form-author').drupalSetSummary((context) => {
$context.find('.media-form-author').drupalSetSummary(context => {
const $authorContext = $(context);
const name = $authorContext.find('.field--name-uid input').val();
const date = $authorContext.find('.field--name-created input').val();
if (name && date) {
return Drupal.t('By @name on @date', { '@name': name, '@date': date });
return Drupal.t('By @name on @date', {
'@name': name,
'@date': date,
});
}
else if (name) {
if (name) {
return Drupal.t('By @name', { '@name': name });
}
else if (date) {
if (date) {
return Drupal.t('Authored on @date', { '@date': date });
}
});
},
};
}(jQuery, Drupal));
})(jQuery, Drupal);
+8 -3
View File
@@ -16,10 +16,15 @@
var date = $authorContext.find('.field--name-created input').val();
if (name && date) {
return Drupal.t('By @name on @date', { '@name': name, '@date': date });
} else if (name) {
return Drupal.t('By @name on @date', {
'@name': name,
'@date': date
});
}
if (name) {
return Drupal.t('By @name', { '@name': name });
} else if (date) {
}
if (date) {
return Drupal.t('Authored on @date', { '@date': date });
}
});
+39 -15
View File
@@ -3,7 +3,7 @@
* Defines JavaScript behaviors for the media type form.
*/
(function ($, Drupal) {
(function($, Drupal) {
/**
* Behaviors for setting summaries on media type form.
*
@@ -16,27 +16,51 @@
attach(context) {
const $context = $(context);
// Provide the vertical tab summaries.
$context.find('#edit-workflow').drupalSetSummary((context) => {
$context.find('#edit-workflow').drupalSetSummary(context => {
const vals = [];
$(context).find('input[name^="options"]:checked').parent().each(function () {
vals.push(Drupal.checkPlain($(this).find('label').text()));
});
if (!$(context).find('#edit-options-status').is(':checked')) {
$(context)
.find('input[name^="options"]:checked')
.parent()
.each(function() {
vals.push(
Drupal.checkPlain(
$(this)
.find('label')
.text(),
),
);
});
if (
!$(context)
.find('#edit-options-status')
.is(':checked')
) {
vals.unshift(Drupal.t('Not published'));
}
return vals.join(', ');
});
$(context).find('#edit-language').drupalSetSummary((context) => {
const vals = [];
$(context)
.find('#edit-language')
.drupalSetSummary(context => {
const vals = [];
vals.push($(context).find('.js-form-item-language-configuration-langcode select option:selected').text());
vals.push(
$(context)
.find(
'.js-form-item-language-configuration-langcode select option:selected',
)
.text(),
);
$(context).find('input:checked').next('label').each(function () {
vals.push(Drupal.checkPlain($(this).text()));
$(context)
.find('input:checked')
.next('label')
.each(function() {
vals.push(Drupal.checkPlain($(this).text()));
});
return vals.join(', ');
});
return vals.join(', ');
});
},
};
}(jQuery, Drupal));
})(jQuery, Drupal);