diff options
author | Byron Jones <glob@mozilla.com> | 2015-05-26 17:59:57 +0200 |
---|---|---|
committer | Byron Jones <glob@mozilla.com> | 2015-05-26 17:59:57 +0200 |
commit | f8b984852ae27f14a5f44e651193f00977737ab1 (patch) | |
tree | 7b7d631f17fa9b82844f0db79b605f157fa48e2c /template/en/default/bug | |
parent | 95e71eea95c977eb7512156be813ede7eb161600 (diff) | |
download | bugzilla-f8b984852ae27f14a5f44e651193f00977737ab1.tar.gz bugzilla-f8b984852ae27f14a5f44e651193f00977737ab1.tar.xz |
Bug 1146782: backport bug 1159589 to bmo (migrate autocomplete from yui to jquery)
Diffstat (limited to 'template/en/default/bug')
-rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 2 | ||||
-rw-r--r-- | template/en/default/bug/edit.html.tmpl | 4 | ||||
-rw-r--r-- | template/en/default/bug/field.html.tmpl | 25 | ||||
-rw-r--r-- | template/en/default/bug/show-header.html.tmpl | 2 |
4 files changed, 16 insertions, 17 deletions
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index fc1bc5420..b3619f993 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -31,7 +31,7 @@ [% PROCESS global/header.html.tmpl title = title generate_api_token = 1 - yui = [ 'autocomplete', 'calendar', 'datatable', 'button' ] + yui = [ 'calendar', 'datatable', 'button' ] style_urls = [ 'skins/standard/attachment.css', 'skins/standard/enter_bug.css', 'skins/custom/create_bug.css' ] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 0fc8762a4..eba5702e3 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -34,11 +34,11 @@ [% IF user.can_tag_comments %] <div id="bz_ctag_div" class="bz_default_hidden"> <a href="javascript:void(0)" onclick="YAHOO.bugzilla.commentTagging.hideInput()">x</a> - <div> + <span> <input id="bz_ctag_add" size="10" placeholder="add tag" maxlength="[% constants.MAX_COMMENT_TAG_LENGTH FILTER html %]"> <span id="bz_ctag_autocomp"></span> - </div> + </span> [<a href="https://wiki.mozilla.org/BMO/comment_tagging" target="_blank" title="About Comment Tagging">help</a>] diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 366fe1144..ba1237dc0 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -235,19 +235,18 @@ [% END %] [% END %] [% CASE constants.FIELD_TYPE_KEYWORDS %] - <div id="keyword_container"> - <input type="text" id="[% field.name FILTER html %]" size="40" - class="text_input" name="[% field.name FILTER html %]" - value="[% value FILTER html %]"> - <div id="keyword_autocomplete"></div> - </div> - <script type="text/javascript" defer="defer"> - YAHOO.bugzilla.keyword_array = [ - [%- FOREACH keyword = active_keywords %] - [%-# %]"[% keyword.name FILTER js %]" - [%- "," IF NOT loop.last %][% END %]]; - YAHOO.bugzilla.keywordAutocomplete.init('[% field.name FILTER js %]', - 'keyword_autocomplete'); + <input type="text" id="[% field.name FILTER html %]" size="40" + class="text_input bz_autocomplete_values" + name="[% field.name FILTER html %]" + data-values="[% field.name FILTER html %]" + value="[% value FILTER html %]"> + <script type="text/javascript"> + if (typeof BUGZILLA.autocomplete_values === 'undefined') + BUGZILLA.autocomplete_values = []; + BUGZILLA.autocomplete_values['[% field.name FILTER js %]'] = [ + [%- FOREACH keyword = active_keywords %] + [%- %]"[% keyword.name FILTER js %]" + [%- "," IF NOT loop.last %][% END %]]; </script> [% CASE constants.FIELD_TYPE_EXTENSION %] [% Hook.process('editable') %] diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl index 6170d7a45..e7d0a07fb 100644 --- a/template/en/default/bug/show-header.html.tmpl +++ b/template/en/default/bug/show-header.html.tmpl @@ -39,7 +39,7 @@ [% generate_api_token = 1 %] [% header = "$terms.Bug $bug.bug_id" %] [% header_addl_info = "Last modified: $filtered_timestamp" %] -[% yui = ['autocomplete', 'calendar'] %] +[% yui = ['calendar', 'connection', 'json'] %] [% yui.push('container') IF user.can_tag_comments %] [% javascript_urls = [ "js/util.js", "js/field.js" ] %] [% javascript_urls.push("js/bug.js") IF user.id %] |