ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimalization: some JS tweaks

Browse source 
- Removed redundant function
- Using .preventDefault instead of return calls in some places
This commit is contained in:
Marcin Kurczewski 2013-11-30 00:09:15 +01:00
parent d570bc1790
commit 518311ff61
1 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
public_html/media/js/core.js
View file

@ -38,23 +38,6 @@ $.fn.hasAttr = function(name)
return this.attr(name) !== undefined; return this.attr(name) !== undefined;
}; };
if ($.when.all === undefined)
{
$.when.all = function(deferreds)
{
var deferred = new $.Deferred();
$.when.apply($, deferreds).then(function()
{
deferred.resolve(Array.prototype.slice.call(arguments, 0));
}, function()
{
deferred.fail(Array.prototype.slice.call(arguments, 0));
});
return deferred;
}
}
//safety trigger //safety trigger
@ -220,19 +203,19 @@ $(function()
response($.map(data.tags, function(tag) { return { label: tag.name + ' (' + tag.count + ')', value: tag.name }; })); response($.map(data.tags, function(tag) { return { label: tag.name + ' (' + tag.count + ')', value: tag.name }; }));
}); });
}, },
focus: function() focus: function(e)
{ {
// prevent value inserted on focus // prevent value inserted on focus
return false; e.preventDefault();
}, },
select: function(event, ui) select: function(e, ui)
{ {
e.preventDefault();
var terms = split(this.value); var terms = split(this.value);
terms.pop(); terms.pop();
terms.push(ui.item.value); terms.push(ui.item.value);
terms.push(''); terms.push('');
this.value = terms.join(' '); this.value = terms.join(' ');
return false;
} }
}; };
@ -248,12 +231,10 @@ $(function()
var searchInput = $(this); var searchInput = $(this);
searchInput searchInput
// don't navigate away from the field on tab when selecting an item // don't navigate away from the field on tab when selecting an item
.bind('keydown', function(event) .bind('keydown', function(e)
{ {
if (event.keyCode === $.ui.keyCode.TAB && $(this).data('autocomplete').menu.active) if (e.keyCode === $.ui.keyCode.TAB && $(this).data('autocomplete').menu.active)
{ e.preventDefault();
event.preventDefault();
}
}).autocomplete(options); }).autocomplete(options);
}); });
}); });