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

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
sites/all/modules/custom_search/js/custom_search.js
View File

@@ -5,15 +5,16 @@
if (!Drupal.settings.custom_search.solr) {
// Check if the search box is not empty on submit
$('form.search-form', context).submit(function(){
var box = $(this).find('input.custom-search-box');
var $this = $(this);
var box = $this.find('input.custom-search-box');
if (box.val() != undefined && box.val() == '') {
$(this).find('input.custom-search-box').addClass('error');
$this.find('input.custom-search-box').addClass('error');
return false;
}
// If basic search is hidden, copy or value to the keys
if ($(this).find('#edit-keys').parents('div.element-invisible').attr('class') == 'element-invisible') {
$(this).find('#edit-keys').val($(this).find('#edit-or').val());
$(this).find('#edit-or').val('');
if ($this.find('#edit-keys').parents('div.element-invisible').attr('class') == 'element-invisible') {
$this.find('#edit-keys').val($this.find('#edit-or').val());
$this.find('#edit-or').val('');
}
return true;
});
@@ -24,11 +25,12 @@
// Displays Popup.
$('form.search-form input.custom-search-box', context).bind('click focus', function(e){
$this = $(this);
$parentForm = $this.parents('form');
var $parentForm = $(this).parents('form');
// check if there's something in the popup and displays it
var popup = $parentForm.find('fieldset.custom_search-popup');
if (popup.find('input,select').length && !popup.hasClass('opened')) popup.fadeIn().addClass('opened');
if (popup.find('input,select').length && !popup.hasClass('opened')) {
popup.fadeIn().addClass('opened');
}
e.stopPropagation();
});
$(document).bind('click focus', function(){
@@ -47,52 +49,61 @@
if (el.val().substr(0,2) == 'c-') {
el.change(function(){
$('.custom-search-selector input:checkbox').each(function(){
if ($(this).val().substr(0,2) == 'o-') $(this).attr('checked', false);
if ($(this).val().substr(0,2) == 'o-') {
$(this).attr('checked', false);
}
});
$(this).parents('.custom-search-selector').find('input:checkbox[value=c-all]').attr('checked', false);
});
} else {
el.change(function(){
$(this).parents('.custom-search-selector').find('input:checkbox[value!='+el.val()+']').attr('checked', false);
$(this).parents('.custom-search-selector').find('input:checkbox[value!=' + el.val() + ']').attr('checked', false);
});
}
}
});
// Reselect types and terms in advanced search
var edit_keys = $('#edit-keys').val();
if(edit_keys) {
var edit_keys = encodeURIComponent($('#edit-keys').val());
if (edit_keys) {
// types
var pos = edit_keys.indexOf('type:');
if (pos) {
var pos2 = edit_keys.indexOf(' ',pos);
if (pos2==-1) pos2 = edit_keys.length;
var types = edit_keys.substring(pos+5,pos2);
if (pos != -1) {
var pos2 = edit_keys.indexOf(' ', pos);
if (pos2 == -1) {
pos2 = edit_keys.length;
}
var types = edit_keys.substring(pos + 5,pos2);
types = types.split(',');
for (var i=0; i<types.length; i++) {
$('.search-form input:checkbox[value='+types[i]+']').attr('checked', true);
for (var i = 0; i < types.length; i++) {
$('.search-form input:checkbox[value=' + types[i] + ']').attr('checked', true);
}
}
// terms
var pos = edit_keys.indexOf('term:');
if (pos) {
var pos2 = edit_keys.indexOf(' ',pos);
if (pos2==-1) pos2 = edit_keys.length;
var terms = edit_keys.substring(pos+5,pos2);
if (pos != -1) {
var pos2 = edit_keys.indexOf(' ', pos);
if (pos2 == -1) {
pos2 = edit_keys.length;
}
var terms = edit_keys.substring(pos + 5, pos2);
terms = terms.split(',');
for (var i=0; i<terms.length; i++) {
$('#edit-term option[value='+terms[i]+']').attr('selected', true);
for (var i = 0; i < terms.length; i++) {
$('#edit-term option[value=' + terms[i] + ']').attr('selected', true);
}
}
// languages
var pos = edit_keys.indexOf('language:');
if (pos) {
var pos2 = edit_keys.indexOf(' ',pos);
if (pos2==-1) pos2 = edit_keys.length;
var languages = edit_keys.substring(pos+9,pos2);
if (pos != -1) {
var pos2 = edit_keys.indexOf(' ', pos);
if (pos2 == -1) {
pos2 = edit_keys.length;
}
var languages = edit_keys.substring(pos + 9,pos2);
languages = languages.split(',');
for (var i=0; i<languages.length; i++) {
$('.search-advanced #edit-language-'+languages[i]).attr('checked', true);
for (var i = 0; i < languages.length; i++) {
$('.search-advanced #edit-language-' + languages[i]).attr('checked', true);
}
}
}
@@ -109,4 +120,4 @@
}
}
})(jQuery);
})(jQuery);

3
sites/all/modules/custom_search/js/custom_search_sort.js
View File

@@ -14,7 +14,8 @@ Drupal.behaviors.customSearchSort = {
}
var table = $('table#elements');
var tableDrag = Drupal.tableDrag.elements; // Get the blocks tableDrag object.
// Get the blocks tableDrag object.
var tableDrag = Drupal.tableDrag.elements;
// Add a handler for when a row is swapped, update empty regions.
tableDrag.row.prototype.onSwap = function (swappedRow) {