more module updates
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
span.autocomplete-deluxe-value-delete {
|
||||
float: left;
|
||||
}
|
||||
div.autocomplete-deluxe-multiple {
|
||||
padding: 4px 5px;
|
||||
}
|
||||
|
||||
input.autocomplete-deluxe-form.autocomplete-deluxe-multiple {
|
||||
margin-left: 0;
|
||||
margin-right: 5px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
div.autocomplete-deluxe-throbber {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.autocomplete-deluxe-closed {
|
||||
background-position: 0 6px;
|
||||
}
|
||||
|
||||
.autocomplete-deluxe-open {
|
||||
background-position: 0 -14px;
|
||||
}
|
||||
|
||||
.autocomplete-deluxe-item {
|
||||
float: right;
|
||||
margin: 3px 5px 3px 0;
|
||||
padding: 3px 5px 3px 20px;
|
||||
}
|
||||
|
||||
.autocomplete-deluxe-item-delete {
|
||||
position: absolute;
|
||||
right: auto;
|
||||
left: 3px;
|
||||
}
|
@@ -114,7 +114,7 @@ div.autocomplete-deluxe-multiple {
|
||||
background: no-repeat -38px -22px, -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
|
||||
background: no-repeat -38px -22px, -ms-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
|
||||
background: no-repeat -38px -22px, linear-gradient(top, #eeeeee 1%, #ffffff 15%);
|
||||
padding: 4px 5px 4px 20px;
|
||||
padding: 4px 5px;
|
||||
border: 1px solid #AAAAAA;
|
||||
cursor: text;
|
||||
height: auto !important;
|
||||
|
@@ -5,9 +5,9 @@ core = 7.x
|
||||
files[] = autocomplete_deluxe.module
|
||||
dependencies[] = taxonomy
|
||||
|
||||
; Information added by drupal.org packaging script on 2013-08-05
|
||||
version = "7.x-2.0-beta3"
|
||||
; Information added by Drupal.org packaging script on 2015-03-16
|
||||
version = "7.x-2.1"
|
||||
core = "7.x"
|
||||
project = "autocomplete_deluxe"
|
||||
datestamp = "1375695669"
|
||||
datestamp = "1426503185"
|
||||
|
||||
|
@@ -82,7 +82,10 @@
|
||||
return this;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* If there is no result this label will be shown.
|
||||
* @type {{label: string, value: string}}
|
||||
*/
|
||||
Drupal.autocomplete_deluxe.empty = {label: '- ' + Drupal.t('None') + ' -', value: "" };
|
||||
|
||||
/**
|
||||
@@ -105,6 +108,9 @@
|
||||
Drupal.autocomplete_deluxe.Widget = function() {
|
||||
};
|
||||
|
||||
/**
|
||||
* Url for the callback.
|
||||
*/
|
||||
Drupal.autocomplete_deluxe.Widget.prototype.uri = null;
|
||||
|
||||
/**
|
||||
@@ -119,7 +125,7 @@
|
||||
};
|
||||
|
||||
Drupal.autocomplete_deluxe.Widget.prototype.init = function(settings) {
|
||||
if ($.browser.msie && $.browser.version === "6.0") {
|
||||
if(navigator.appVersion.indexOf("MSIE 6.") != -1) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -131,6 +137,7 @@
|
||||
this.required = settings.required;
|
||||
this.limit = settings.limit;
|
||||
this.synonyms = typeof settings.use_synonyms == 'undefined' ? false : settings.use_synonyms;
|
||||
this.not_found_message = typeof settings.use_synonyms == 'undefined' ? "The term '@term' will be added." : settings.not_found_message;
|
||||
|
||||
this.wrapper = '""';
|
||||
|
||||
@@ -140,7 +147,6 @@
|
||||
this.delimiter = settings.delimiter.charCodeAt(0);
|
||||
}
|
||||
|
||||
|
||||
this.items = {};
|
||||
|
||||
var self = this;
|
||||
@@ -163,7 +169,7 @@
|
||||
}
|
||||
if ($.isEmptyObject(result)) {
|
||||
result.push({
|
||||
label: Drupal.t("The term '@term' will be added.", {'@term' : term}),
|
||||
label: Drupal.t(self.not_found_message, {'@term' : term}),
|
||||
value: term,
|
||||
newTerm: true
|
||||
});
|
||||
@@ -203,6 +209,9 @@
|
||||
});
|
||||
|
||||
var jqObject = this.jqObject;
|
||||
|
||||
var autocompleteDataKey = typeof(this.jqObject.data('autocomplete')) === 'object' ? 'item.autocomplete' : 'ui-autocomplete';
|
||||
|
||||
var throbber = $('<div class="autocomplete-deluxe-throbber autocomplete-deluxe-closed"> </div>').insertAfter(jqObject);
|
||||
|
||||
this.jqObject.bind("autocompletesearch", function(event, ui) {
|
||||
@@ -224,8 +233,9 @@
|
||||
var re = new RegExp('()*""' + escapedValue + '""|' + escapedValue + '()*', 'gi');
|
||||
var t = item.label.replace(re,"<span class='autocomplete-deluxe-highlight-char'>$&</span>");
|
||||
}
|
||||
|
||||
return $( "<li></li>" )
|
||||
.data( "item.autocomplete", item )
|
||||
.data(autocompleteDataKey, item)
|
||||
.append( "<a>" + t + "</a>" )
|
||||
.appendTo( ul );
|
||||
};
|
||||
@@ -304,23 +314,25 @@
|
||||
this.element.remove();
|
||||
var values = this.widget.valueForm.val();
|
||||
var escapedValue = Drupal.autocomplete_deluxe.escapeRegex( this.item.value );
|
||||
var regex = new RegExp('()*""' + escapedValue + '""|' + escapedValue + '()*', 'gi');
|
||||
var regex = new RegExp('()*""' + escapedValue + '""()*', 'gi');
|
||||
this.widget.valueForm.val(values.replace(regex, ''));
|
||||
delete this.widget.items[this.value];
|
||||
};
|
||||
|
||||
Drupal.autocomplete_deluxe.MultipleWidget.prototype.setup = function() {
|
||||
var jqObject = this.jqObject;
|
||||
var parent = jqObject.parent();
|
||||
var value_container = jqObject.parent().parent().children('.autocomplete-deluxe-value-container');
|
||||
var value_input = value_container.children().children();
|
||||
var parent = jqObject.parents('.autocomplete-deluxe-container');
|
||||
var value_container = parent.next();
|
||||
var value_input = value_container.find('input');
|
||||
var items = this.items;
|
||||
var self = this;
|
||||
this.valueForm = value_input;
|
||||
|
||||
// Override the resize function, so that the suggestion list doesn't resizes
|
||||
// all the time.
|
||||
jqObject.data("autocomplete")._resizeMenu = function() {};
|
||||
var autocompleteDataKey = typeof(this.jqObject.data('autocomplete')) === 'object' ? 'autocomplete' : 'ui-autocomplete';
|
||||
|
||||
jqObject.data(autocompleteDataKey)._resizeMenu = function() {};
|
||||
|
||||
jqObject.show();
|
||||
|
||||
|
@@ -27,7 +27,7 @@ function autocomplete_deluxe_field_widget_info() {
|
||||
/**
|
||||
* Custom taxonomy callback, which also accepts an empty string search.
|
||||
*/
|
||||
function taxonomy_autocomplete_deluxe($field_name, $tags_typed = '', $limit = 10) {
|
||||
function autocomplete_deluxe_taxonomy_callback($field_name, $tags_typed = '', $limit = 10) {
|
||||
$field = field_info_field($field_name);
|
||||
$use_synonyms = !empty($_GET['synonyms']);
|
||||
|
||||
@@ -163,6 +163,12 @@ function autocomplete_deluxe_field_widget_settings_form($field, $instance) {
|
||||
'#default_value' => isset($settings['delimiter']) ? $settings['delimiter'] : '',
|
||||
'#size' => 1,
|
||||
);
|
||||
$form['not_found_message'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => t('Term not found message.'),
|
||||
'#description' => t('A message text which will be displayed, if the entered term was not found.'),
|
||||
'#default_value' => isset($settings['not_found_message']) ? $settings['not_found_message'] : "The term '@term' will be added.",
|
||||
);
|
||||
|
||||
if (module_exists('synonyms')) {
|
||||
$form['use_synonyms'] = array(
|
||||
@@ -219,6 +225,7 @@ function autocomplete_deluxe_field_widget_form(&$form, &$form_state, $field, $in
|
||||
'#min_length' => isset($instance['widget']['settings']['min_length']) ? $instance['widget']['settings']['min_length'] : 0,
|
||||
'#use_synonyms' =>isset($instance['widget']['settings']['use_synonyms']) ? $instance['widget']['settings']['use_synonyms'] : 0,
|
||||
'#delimiter' =>isset($instance['widget']['settings']['delimiter']) ? $instance['widget']['settings']['delimiter'] : '',
|
||||
'#not_found_message' =>isset($instance['widget']['settings']['not_found_message']) ? $instance['widget']['settings']['not_found_message'] : "The term '@term' will be added.",
|
||||
);
|
||||
|
||||
$multiple = $field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED ? TRUE : FALSE;
|
||||
@@ -276,6 +283,7 @@ function autocomplete_deluxe_element_process($element) {
|
||||
'min_length' => isset($element['#min_length']) ? $element['#min_length'] : 0,
|
||||
'use_synonyms' => isset($element['#use_synonyms']) ? $element['#use_synonyms'] : 0,
|
||||
'delimiter' => isset($element['#delimiter']) ? $element['#delimiter'] : '',
|
||||
'not_found_message' => isset($element['#not_found_message']) ? $element['#not_found_message'] : "The term '@term' will be added.",
|
||||
);
|
||||
|
||||
if (isset($element['#autocomplete_deluxe_path'])) {
|
||||
@@ -384,7 +392,7 @@ function autocomplete_deluxe_element_info() {
|
||||
function autocomplete_deluxe_menu() {
|
||||
$items['autocomplete_deluxe/taxonomy'] = array(
|
||||
'title' => 'Autocomplete deluxe taxonomy',
|
||||
'page callback' => 'taxonomy_autocomplete_deluxe',
|
||||
'page callback' => 'autocomplete_deluxe_taxonomy_callback',
|
||||
'access arguments' => array('access content'),
|
||||
'type' => MENU_CALLBACK,
|
||||
);
|
||||
|
Reference in New Issue
Block a user