open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
pull/1645/merge
Leonardo Galli 8 years ago
parent 705b233819 295536ae30
commit 5238b78813
2 changed files with 57 additions and 67 deletions
Show Stats Download Patch File Download Diff File

0
src/UI/Content/bootstrap.tagsinput.less
Unescape View File

116
src/UI/JsLibraries/bootstrap.tagsinput.js
Unescape View File

@ -11,11 +11,17 @@
itemText: function(item) { itemText: function(item) {
return this.itemValue(item); return this.itemValue(item);
}, },
itemTitle: function(item) {
return null;
},
freeInput: true, freeInput: true,
addOnBlur: true, addOnBlur: true,
maxTags: undefined, maxTags: undefined,
maxChars: undefined, maxChars: undefined,
confirmKeys: [13, 44], confirmKeys: [13, 44],
delimiter: ',',
delimiterRegex: null,
cancelConfirmKeysOnEmpty: true,
onTagExists: function(item, $tag) { onTagExists: function(item, $tag) {
$tag.hide().fadeIn(); $tag.hide().fadeIn();
}, },
@ -41,10 +47,8 @@
this.$container = $('<div class="bootstrap-tagsinput"></div>'); this.$container = $('<div class="bootstrap-tagsinput"></div>');
this.$input = $('<input type="text" placeholder="' + this.placeholderText + '"/>').appendTo(this.$container); this.$input = $('<input type="text" placeholder="' + this.placeholderText + '"/>').appendTo(this.$container);
this.$element.after(this.$container); this.$element.before(this.$container);
// var inputWidth = (this.inputSize < 3 ? 3 : this.inputSize) + "em";
// this.$input.get(0).style.cssText = "width: " + inputWidth + " !important;";
this.build(options); this.build(options);
} }
@ -55,7 +59,7 @@
* Adds the given item as a new tag. Pass true to dontPushVal to prevent * Adds the given item as a new tag. Pass true to dontPushVal to prevent
* updating the elements val() * updating the elements val()
*/ */
add: function(item, dontPushVal) { add: function(item, dontPushVal, options) {
var self = this; var self = this;
if (self.options.maxTags && self.itemsArray.length >= self.options.maxTags) if (self.options.maxTags && self.itemsArray.length >= self.options.maxTags)
@ -83,7 +87,8 @@
self.remove(self.itemsArray[0]); self.remove(self.itemsArray[0]);
if (typeof item === "string" && this.$element[0].tagName === 'INPUT') { if (typeof item === "string" && this.$element[0].tagName === 'INPUT') {
var items = item.split(','); var delimiter = (self.options.delimiterRegex) ? self.options.delimiterRegex : self.options.delimiter;
var items = item.split(delimiter);
if (items.length > 1) { if (items.length > 1) {
for (var i = 0; i < items.length; i++) { for (var i = 0; i < items.length; i++) {
this.add(items[i], true); this.add(items[i], true);
@ -95,10 +100,10 @@
} }
} }
/*
var itemValue = self.options.itemValue(item), var itemValue = self.options.itemValue(item),
itemText = self.options.itemText(item), itemText = self.options.itemText(item),
tagClass = self.options.tagClass(item); tagClass = self.options.tagClass(item),
itemTitle = self.options.itemTitle(item);
// Ignore items allready added // Ignore items allready added
var existing = $.grep(self.itemsArray, function(item) { return self.options.itemValue(item) === itemValue; } )[0]; var existing = $.grep(self.itemsArray, function(item) { return self.options.itemValue(item) === itemValue; } )[0];
@ -114,56 +119,19 @@
// if length greater than limit // if length greater than limit
if (self.items().toString().length + item.length + 1 > self.options.maxInputLength) if (self.items().toString().length + item.length + 1 > self.options.maxInputLength)
return; return;
*/
// raise beforeItemAdd arg // raise beforeItemAdd arg
var beforeItemAddEvent = $.Event('beforeItemAdd', { item: item, cancel: false }); var beforeItemAddEvent = $.Event('beforeItemAdd', { item: item, cancel: false, options: options});
self.$element.trigger(beforeItemAddEvent); self.$element.trigger(beforeItemAddEvent);
if (beforeItemAddEvent.cancel) if (beforeItemAddEvent.cancel)
return; return;
// register item in internal array and map // register item in internal array and map
//self.itemsArray.push(item);
// read var beforeItemAddEvent with new value
var item = beforeItemAddEvent.item; // Get text from event (BeforeItemAddEvent)
var itemValue = self.options.itemValue(item),
itemText = self.options.itemText(item),
tagClass = self.options.tagClass(item);
// Ignore items allready added
var existing = $.grep(self.itemsArray, function(item) { return self.options.itemValue(item) === itemValue; } )[0];
if (existing && !self.options.allowDuplicates) {
// Invoke onTagExists
if (self.options.onTagExists) {
var $existingTag = $(".tag", self.$container).filter(function() { return $(this).data("item") === existing; });
self.options.onTagExists(item, $existingTag);
}
return;
}
// if length greater than limit
if (self.items().toString().length + item.length + 1 > self.options.maxInputLength)
return;
// register item in internal array and map
self.itemsArray.push(item); self.itemsArray.push(item);
if (beforeItemAddEvent.tagClass !== undefined){ var tagClass = beforeItemAddEvent.tagClass; }
if (item != undefined){
var items = item.toString().split(',');
if (items.length > 1) {
for (var i = 0; i < items.length; i++) {
this.add(items[i], true);
}
if (!dontPushVal)
self.pushVal(self.options.triggerChange);
return;
}
}
// add a tag element // add a tag element
var $tag = $('<span class="tag ' + htmlEncode(tagClass) + '">' + htmlEncode(itemText) + '<span data-role="remove"></span></span>');
var $tag = $('<span class="tag ' + htmlEncode(tagClass) + (itemTitle !== null ? ('" title="' + itemTitle) : '') + '">' + htmlEncode(itemText) + '<span data-role="remove"></span></span>');
$tag.data('item', item); $tag.data('item', item);
self.findInputWrapper().before($tag); self.findInputWrapper().before($tag);
$tag.after(' '); $tag.after(' ');
@ -183,14 +151,14 @@
if (self.options.maxTags === self.itemsArray.length || self.items().toString().length === self.options.maxInputLength) if (self.options.maxTags === self.itemsArray.length || self.items().toString().length === self.options.maxInputLength)
self.$container.addClass('bootstrap-tagsinput-max'); self.$container.addClass('bootstrap-tagsinput-max');
self.$element.trigger($.Event('itemAdded', { item: item })); self.$element.trigger($.Event('itemAdded', { item: item, options: options }));
}, },
/** /**
* Removes the given item. Pass true to dontPushVal to prevent updating the * Removes the given item. Pass true to dontPushVal to prevent updating the
* elements val() * elements val()
*/ */
remove: function(item, dontPushVal) { remove: function(item, dontPushVal, options) {
var self = this; var self = this;
if (self.objectItems) { if (self.objectItems) {
@ -203,7 +171,7 @@
} }
if (item) { if (item) {
var beforeItemRemoveEvent = $.Event('beforeItemRemove', { item: item, cancel: false }); var beforeItemRemoveEvent = $.Event('beforeItemRemove', { item: item, cancel: false, options: options });
self.$element.trigger(beforeItemRemoveEvent); self.$element.trigger(beforeItemRemoveEvent);
if (beforeItemRemoveEvent.cancel) if (beforeItemRemoveEvent.cancel)
return; return;
@ -221,7 +189,7 @@
if (self.options.maxTags > self.itemsArray.length) if (self.options.maxTags > self.itemsArray.length)
self.$container.removeClass('bootstrap-tagsinput-max'); self.$container.removeClass('bootstrap-tagsinput-max');
self.$element.trigger($.Event('itemRemoved', { item: item })); self.$element.trigger($.Event('itemRemoved', { item: item, options: options }));
}, },
/** /**
@ -338,6 +306,7 @@
}, },
updater: function (text) { updater: function (text) {
self.add(this.map[text]); self.add(this.map[text]);
return this.map[text];
}, },
matcher: function (text) { matcher: function (text) {
return (text.toLowerCase().indexOf(this.query.trim().toLowerCase()) !== -1); return (text.toLowerCase().indexOf(this.query.trim().toLowerCase()) !== -1);
@ -354,11 +323,21 @@
// typeahead.js // typeahead.js
if (self.options.typeaheadjs) { if (self.options.typeaheadjs) {
var typeaheadjs = self.options.typeaheadjs || {}; var typeaheadConfig = null;
var typeaheadDatasets = {};
// Determine if main configurations were passed or simply a dataset
var typeaheadjs = self.options.typeaheadjs;
if ($.isArray(typeaheadjs)) {
typeaheadConfig = typeaheadjs[0];
typeaheadDatasets = typeaheadjs[1];
} else {
typeaheadDatasets = typeaheadjs;
}
self.$input.typeahead(null, typeaheadjs).on('typeahead:selected', $.proxy(function (obj, datum) { self.$input.typeahead(typeaheadConfig, typeaheadDatasets).on('typeahead:selected', $.proxy(function (obj, datum) {
if (typeaheadjs.valueKey) if (typeaheadDatasets.valueKey)
self.add(datum[typeaheadjs.valueKey]); self.add(datum[typeaheadDatasets.valueKey]);
else else
self.add(datum); self.add(datum);
self.$input.typeahead('val', ''); self.$input.typeahead('val', '');
@ -398,7 +377,7 @@
case 8: case 8:
if (doGetCaretPosition($input[0]) === 0) { if (doGetCaretPosition($input[0]) === 0) {
var prev = $inputWrapper.prev(); var prev = $inputWrapper.prev();
if (prev) { if (prev.length) {
self.remove(prev.data('item')); self.remove(prev.data('item'));
} }
} }
@ -408,7 +387,7 @@
case 46: case 46:
if (doGetCaretPosition($input[0]) === 0) { if (doGetCaretPosition($input[0]) === 0) {
var next = $inputWrapper.next(); var next = $inputWrapper.next();
if (next) { if (next.length) {
self.remove(next.data('item')); self.remove(next.data('item'));
} }
} }
@ -454,9 +433,16 @@
var text = $input.val(), var text = $input.val(),
maxLengthReached = self.options.maxChars && text.length >= self.options.maxChars; maxLengthReached = self.options.maxChars && text.length >= self.options.maxChars;
if (self.options.freeInput && (keyCombinationInList(event, self.options.confirmKeys) || maxLengthReached)) { if (self.options.freeInput && (keyCombinationInList(event, self.options.confirmKeys) || maxLengthReached)) {
self.add(maxLengthReached ? text.substr(0, self.options.maxChars) : text); // Only attempt to add a tag if there is data in the field
$input.val(''); if (text.length !== 0) {
event.preventDefault(); self.add(maxLengthReached ? text.substr(0, self.options.maxChars) : text);
$input.val('');
}
// If the field is empty, let the event triggered fire as usual
if (self.options.cancelConfirmKeysOnEmpty === false) {
event.preventDefault();
}
} }
// Reset internal input's size // Reset internal input's size
@ -532,7 +518,7 @@
/** /**
* Register JQuery plugin * Register JQuery plugin
*/ */
$.fn.tagsinput = function(arg1, arg2) { $.fn.tagsinput = function(arg1, arg2, arg3) {
var results = []; var results = [];
this.each(function() { this.each(function() {
@ -555,7 +541,11 @@
results.push(tagsinput); results.push(tagsinput);
} else if(tagsinput[arg1] !== undefined) { } else if(tagsinput[arg1] !== undefined) {
// Invoke function on existing tags input // Invoke function on existing tags input
var retVal = tagsinput[arg1](arg2); if(tagsinput[arg1].length === 3 && arg3 !== undefined){
var retVal = tagsinput[arg1](arg2, null, arg3);
}else{
var retVal = tagsinput[arg1](arg2);
}
if (retVal !== undefined) if (retVal !== undefined)
results.push(retVal); results.push(retVal);
} }

Write Preview
Loading…
Cancel
Save