Upgrade typeahead to 0.10.2

Deze commit is opgenomen in:
Sébastien Lucas 2014-04-06 21:20:49 +02:00
bovenliggende d2e39e5eed
commit a2a6652487
5 gewijzigde bestanden met toevoegingen van 38 en 1159 verwijderingen

7
resources/typeahead/typeahead.bundle.min.js vendored Normaal bestaand

Bestand-diff onderdrukt omdat een of meer regels te lang zijn

Diff onderdrukt omdat het te groot bestand Laad diff

Bestand weergeven

@ -22,7 +22,7 @@
<link rel="stylesheet" type="text/css" href="resources/Magnific-Popup/magnific-popup.css?v={{=it.version}}" media="screen" /> <link rel="stylesheet" type="text/css" href="resources/Magnific-Popup/magnific-popup.css?v={{=it.version}}" media="screen" />
<script type="text/javascript" src="resources/doT/doT.min.js?v={{=it.version}}"></script> <script type="text/javascript" src="resources/doT/doT.min.js?v={{=it.version}}"></script>
<script type="text/javascript" src="resources/lru/lru.js?v={{=it.version}}"></script> <script type="text/javascript" src="resources/lru/lru.js?v={{=it.version}}"></script>
<script type="text/javascript" src="resources/typeahead/typeahead.js?v={{=it.version}}"></script> <script type="text/javascript" src="resources/typeahead/typeahead.bundle.min.js?v={{=it.version}}"></script>
{{?}} {{?}}
<script type="text/javascript" src="util.js"></script> <script type="text/javascript" src="util.js"></script>
<link rel="related" href="{{=it.opds_url}}" type="application/atom+xml;profile=opds-catalog" title="{{=it.title}}" /> <link rel="related" href="{{=it.opds_url}}" type="application/atom+xml;profile=opds-catalog" title="{{=it.title}}" />

Bestand weergeven

@ -337,6 +337,7 @@ width:100%;
{ {
vertical-align: middle; vertical-align: middle;
width: 100%; width: 100%;
color: black;
} }
.tt-hint, .tt-query { .tt-hint, .tt-query {
@ -386,7 +387,7 @@ width: 100%;
line-height: 14px; line-height: 14px;
} }
.tt-suggestion.tt-is-under-cursor { .tt-suggestion.tt-cursor {
color: #1c1c1c; color: #1c1c1c;
background-color: #778899; background-color: #778899;
} }

45
util.js
Bestand weergeven

@ -15,6 +15,23 @@ $.ajaxSetup({
cache: false cache: false
}); });
var copsTypeahead = new Bloodhound({
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('title'),
queryTokenizer: Bloodhound.tokenizers.whitespace,
limit: 30,
remote: {
url: 'getJSON.php?page=9&search=1&db=%DB&query=%QUERY',
replace: function (url, query) {
if (currentData.multipleDatabase === 1 && currentData.databaseId === "") {
return url.replace('%QUERY', query).replace('&db=%DB', "");
}
return url.replace('%QUERY', query).replace('%DB', currentData.databaseId);
}
}
});
copsTypeahead.initialize();
var DEBUG = false; var DEBUG = false;
var isPushStateEnabled = window.history && window.history.pushState && window.history.replaceState && var isPushStateEnabled = window.history && window.history.pushState && window.history.replaceState &&
// pushState isn't reliable on iOS until 5. // pushState isn't reliable on iOS until 5.
@ -288,25 +305,19 @@ updatePage = function (data) {
$("#sortForm").hide (); $("#sortForm").hide ();
} }
$('input[name=query]').typeahead([ $('input[name=query]').typeahead(
{
hint: true,
minLength : 3
},
{ {
name: 'search', name: 'search',
allowDuplicates: true, displayKey: 'title',
minLength : 3, templates: {
valueKey: 'title', suggestion: templateSuggestion
limit: 24, },
template: templateSuggestion, source: copsTypeahead.ttAdapter()
remote: { });
url: 'getJSON.php?page=9&search=1&db=%DB&query=%QUERY',
replace: function (url, query) {
if (currentData.multipleDatabase === 1 && currentData.databaseId === "") {
return url.replace('%QUERY', query).replace('&db=%DB', "");
}
return url.replace('%QUERY', query).replace('%DB', currentData.databaseId);
}
}
}
]);
$('input[name=query]').bind('typeahead:selected', function(obj, datum) { $('input[name=query]').bind('typeahead:selected', function(obj, datum) {
if (isPushStateEnabled) { if (isPushStateEnabled) {