From 7a764b50473a62286421328df9e9e554ccf06db6 Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 28 Jun 2013 10:00:45 -0400 Subject: [PATCH] autocomplete style consistency --- app/assets/javascripts/sources.js | 1 - app/assets/javascripts/wiki_pages.js | 54 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/sources.js b/app/assets/javascripts/sources.js index 7f1f95328..a4a1a2e09 100644 --- a/app/assets/javascripts/sources.js +++ b/app/assets/javascripts/sources.js @@ -9,4 +9,3 @@ }); } })(); - diff --git a/app/assets/javascripts/wiki_pages.js b/app/assets/javascripts/wiki_pages.js index c579e846c..2ca236974 100644 --- a/app/assets/javascripts/wiki_pages.js +++ b/app/assets/javascripts/wiki_pages.js @@ -3,36 +3,37 @@ Danbooru.WikiPage.initialize_all = function() { if ($("#c-wiki-pages").length) { - this.initialize_typeahead(); + if (Danbooru.meta("enable-auto-complete") === "true") { + this.initialize_autocomplete(); + } } } - Danbooru.WikiPage.initialize_typeahead = function() { - if (Danbooru.meta("enable-auto-complete") === "true") { - var $fields = $("#search_title,#quick_search_title"); + Danbooru.WikiPage.initialize_autocomplete = function() { + var $fields = $("#search_title,#quick_search_title"); - $fields.autocomplete({ - minLength: 1, - source: function(req, resp) { - $.ajax({ - url: "/wiki_pages.json", - data: { - "search[title]": "*" + req.term + "*", - "limit": 10 - }, - method: "get", - success: function(data) { - resp($.map(data, function(wiki_page) { - return { - label: wiki_page.title.replace(/_/g, " "), - value: wiki_page.title, - category: wiki_page.category_name - }; - })); - } - }); - } - }); + $fields.autocomplete({ + minLength: 1, + source: function(req, resp) { + $.ajax({ + url: "/wiki_pages.json", + data: { + "search[title]": "*" + req.term + "*", + "limit": 10 + }, + method: "get", + success: function(data) { + resp($.map(data, function(wiki_page) { + return { + label: wiki_page.title.replace(/_/g, " "), + value: wiki_page.title, + category: wiki_page.category_name + }; + })); + } + }); + } + }); var render_wiki_page = function(list, wiki_page) { var $link = $("").addClass("tag-type-" + wiki_page.category).text(wiki_page.label); @@ -42,7 +43,6 @@ $fields.each(function(i, field) { $(field).data("uiAutocomplete")._renderItem = render_wiki_page; }); - } } })();