bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib modules security updates

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2016-10-13 12:10:40 +02:00
parent ffd758abc9
commit 747127f643
732 changed files with 67976 additions and 23207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
sites/all/modules/features/features.js
View File

@@ -100,33 +100,6 @@ jQuery.fn.sortElements = (function(){
}).trigger('change');
});
// Export form machine-readable JS
$('.feature-name:not(.processed)', context).each(function() {
$('.feature-name')
.addClass('processed')
.after(' <small class="feature-module-name-suffix">&nbsp;</small>');
if ($('.feature-module-name').val() === $('.feature-name').val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_') || $('.feature-module-name').val() === '') {
$('.feature-module-name').parents('.form-item').hide();
$('.feature-name').bind('keyup change', function() {
var machine = $(this).val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_');
if (machine !== '_' && machine !== '') {
$('.feature-module-name').val(machine);
$('.feature-module-name-suffix').empty().append(' Machine name: ' + machine + ' [').append($('<a href="#">'+ Drupal.t('Edit') +'</a>').click(function() {
$('.feature-module-name').parents('.form-item').show();
$('.feature-module-name-suffix').hide();
$('.feature-name').unbind('keyup');
return false;
})).append(']');
}
else {
$('.feature-module-name').val(machine);
$('.feature-module-name-suffix').text('');
}
});
$('.feature-name').keyup();
}
});
//View info dialog
var infoDialog = $('#features-info-file');
if (infoDialog.length != 0) {
@@ -155,10 +128,12 @@ jQuery.fn.sortElements = (function(){
if (!$(this).hasClass('features-checkall')) {
var key = $(this).attr('name');
var matches = key.match(/^([^\[]+)(\[.+\])?\[(.+)\]\[(.+)\]$/);
var component = matches[1];
var item = matches[4];
if ((component in moduleConflicts) && (moduleConflicts[component].indexOf(item) != -1)) {
$(this).parent().addClass('features-conflict');
if (matches != null) {
var component = matches[1];
var item = matches[4];
if ((component in moduleConflicts) && (moduleConflicts[component].indexOf(item) != -1)) {
$(this).parent().addClass('features-conflict');
}
}
}
});
@@ -183,7 +158,26 @@ jQuery.fn.sortElements = (function(){
}
}
function updateComponentCountInfo(item, section) {
switch (section) {
case 'select':
var parent = $(item).closest('.features-export-list').siblings('.features-export-component');
$('.component-count', parent).text(function (index, text) {
return +text + 1;
}
);
break;
case 'added':
case 'detected':
var parent = $(item).closest('.features-export-component');
$('.component-count', parent).text(function (index, text) {
return text - 1;
});
}
}
function moveCheckbox(item, section, value) {
updateComponentCountInfo(item, section);
var curParent = item;
if ($(item).hasClass('form-type-checkbox')) {
item = $(item).children('input[type=checkbox]');
@@ -298,7 +292,7 @@ jQuery.fn.sortElements = (function(){
}
// Handle component selection UI
$('#features-export-wrapper input[type=checkbox]', context).click(function() {
$('#features-export-wrapper input[type=checkbox]:not(.processed)', context).addClass('processed').click(function() {
_resetTimeout();
if ($(this).hasClass('component-select')) {
moveCheckbox(this, 'added', true);
@@ -353,30 +347,30 @@ jQuery.fn.sortElements = (function(){
// collapse fieldsets
var newState = {};
var currentState = {};
$('#features-export-wrapper .component-select label', context).each(function() {
$('#features-export-wrapper fieldset.features-export-component', context).each(function() {
// expand parent fieldset
var section = '';
$(this).parents('fieldset.features-export-component').each(function() {
section = $(this).attr('id');
currentState[section] = !($(this).hasClass('collapsed'));
if (!(section in newState)) {
newState[section] = false;
var section = $(this).attr('id');
currentState[section] = !($(this).hasClass('collapsed'));
if (!(section in newState)) {
newState[section] = false;
}
$(this).find('div.component-select label').each(function() {
if (filter == '') {
if (currentState[section]) {
Drupal.toggleFieldset($('#'+section));
currentState[section] = false;
}
$(this).parent().show();
}
else if ($(this).text().match(regex)) {
$(this).parent().show();
newState[section] = true;
}
else {
$(this).parent().hide();
}
});
if (filter == '') {
if (currentState[section]) {
Drupal.toggleFieldset($('#'+section));
currentState[section] = false;
}
$(this).parent().show();
}
else if ($(this).text().match(regex)) {
$(this).parent().show();
newState[section] = true;
}
else {
$(this).parent().hide();
}
});
for (section in newState) {
if (currentState[section] != newState[section]) {