From 17886b24d18c0419b6349903d381853f41f0b27f Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sun, 9 Nov 2014 17:21:01 -0500 Subject: [PATCH] Make tag completions be all searchable tags, not just formal tags --- src/packages.rkt | 4 +++- src/site.rkt | 4 ++-- static/site.js | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/packages.rkt b/src/packages.rkt index d04c52a..6deced5 100644 --- a/src/packages.rkt +++ b/src/packages.rkt @@ -108,7 +108,9 @@ [all-tags (for/fold ((ts (set))) ((pkg (in-hash-values (package-manager-state-local-packages state)))) - (set-union ts (list->set (or (@ pkg tags) '()))))])) + (set-union ts (list->set + (map symbol->string + (hash-keys (or (@ pkg search-terms) (hash)))))))])) (define (replace-package old-pkg new-pkg state) (define local-packages (package-manager-state-local-packages state)) diff --git a/src/site.rkt b/src/site.rkt index 81846a9..938b3d7 100644 --- a/src/site.rkt +++ b/src/site.rkt @@ -53,7 +53,7 @@ [("create") edit-package-page] [("logout") logout-page] [("json" "search-completions") json-search-completions] - [("json" "all-tags") json-all-tags] + [("json" "tag-completions") json-tag-completions] )) (define (on-continuation-expiry request) @@ -1098,7 +1098,7 @@ (lambda (response-port) (write-json (set->list completions) response-port)))) -(define (json-all-tags request) +(define (json-tag-completions request) (response/output #:mime-type #"application/json" (lambda (response-port) (write-json (set->list (all-tags)) response-port)))) diff --git a/static/site.js b/static/site.js index 8294c2a..b06324e 100644 --- a/static/site.js +++ b/static/site.js @@ -35,9 +35,10 @@ $(document).ready(function () { $("table.sortable").tablesorter(); if ($("#tags").length) { - $.getJSON("/json/all-tags", function (allTags) { - allTags.sort(); - PkgSite.multiTermComplete(PkgSite.preventTabMovingDuringSelection($("#tags")), allTags); + $.getJSON("/json/tag-completions", function (tagCompletions) { + tagCompletions.sort(); + PkgSite.multiTermComplete(PkgSite.preventTabMovingDuringSelection($("#tags")), + tagCompletions); }); } });