summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xattachment.cgi3
-rwxr-xr-xbuglist.cgi1
-rwxr-xr-xenter_bug.cgi1
-rw-r--r--js/util.js76
-rwxr-xr-xpost_bug.cgi1
-rwxr-xr-xprocess_bug.cgi1
-rwxr-xr-xshow_bug.cgi1
-rw-r--r--skins/standard/global.css13
-rw-r--r--template/en/default/attachment/created.html.tmpl2
-rw-r--r--template/en/default/attachment/updated.html.tmpl2
-rw-r--r--template/en/default/bug/create/create.html.tmpl11
-rw-r--r--template/en/default/bug/create/created.html.tmpl2
-rw-r--r--template/en/default/bug/edit.html.tmpl11
-rw-r--r--template/en/default/bug/process/header.html.tmpl2
-rw-r--r--template/en/default/bug/show.html.tmpl2
-rw-r--r--template/en/default/filterexceptions.pl1
-rw-r--r--template/en/default/list/edit-multiple.html.tmpl9
-rw-r--r--template/en/default/list/list.html.tmpl2
18 files changed, 12 insertions, 129 deletions
diff --git a/attachment.cgi b/attachment.cgi
index 64d0f6c3f..ec82b7fa4 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -419,7 +419,6 @@ sub insert {
$vars->{'bugs'} = [new Bugzilla::Bug($bugid)];
$vars->{'header_done'} = 1;
$vars->{'contenttypemethod'} = $cgi->param('contenttypemethod');
- $vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
print $cgi->header();
@@ -607,7 +606,6 @@ sub update {
# since the object was created.
$vars->{'bugs'} = [new Bugzilla::Bug($bug->id)];
$vars->{'header_done'} = 1;
- $vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
print $cgi->header();
@@ -680,7 +678,6 @@ sub delete_attachment {
# Required to display the bug the deleted attachment belongs to.
$vars->{'bugs'} = [$bug];
$vars->{'header_done'} = 1;
- $vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
$template->process("attachment/updated.html.tmpl", $vars)
diff --git a/buglist.cgi b/buglist.cgi
index 687146ed6..d762dd5ee 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -1200,7 +1200,6 @@ if ($dotweak && scalar @bugs) {
object => 'multiple_bugs'});
}
$vars->{'dotweak'} = 1;
- $vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
$vars->{'products'} = Bugzilla->user->get_enterable_products;
diff --git a/enter_bug.cgi b/enter_bug.cgi
index 3f29acb8f..915dcb47d 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -368,7 +368,6 @@ $vars->{'bug_severity'} = get_legal_field_values('bug_severity');
$vars->{'rep_platform'} = get_legal_field_values('rep_platform');
$vars->{'op_sys'} = get_legal_field_values('op_sys');
-$vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
$vars->{'assigned_to'} = formvalue('assigned_to');
diff --git a/js/util.js b/js/util.js
index 98bafb664..ce7ea4cae 100644
--- a/js/util.js
+++ b/js/util.js
@@ -135,82 +135,6 @@ function bz_overlayBelow(item, parent) {
}
/**
- * Create wanted options in a select form control.
- *
- * @param aSelect Select form control to manipulate.
- * @param aValue Value attribute of the new option element.
- * @param aTextValue Value of a text node appended to the new option
- * element.
- * @param aOwnerDocument Owner document of the new option element. If not
- * specified then "document" will be used.
- * @return Created option element.
- */
-function bz_createOptionInSelect(aSelect, aValue, aTextValue, aOwnerDocument)
-{
- if (!aOwnerDocument) {
- aOwnerDocument = document;
- }
-
- var myOption = aOwnerDocument.createElement("option");
- myOption.setAttribute("value", aValue);
-
- var myTextNode = aOwnerDocument.createTextNode(aTextValue)
- myOption.appendChild(myTextNode);
-
- aSelect.appendChild(myOption);
-
- return myOption;
-}
-
-/**
- * Clears all options from a select form control.
- *
- * @param aElm Select form control of which options to clear.
- * @param aSkipFirst Boolean; true to skip (not clear) first option in the
- * select and false to remove all options.
- */
-function bz_clearOptions(aElm, aSkipFirst)
-{
- var start = 0;
-
- // Skip the first element? (for 'Choose One' type foo)
- if (aSkipFirst) {
- start = 1;
- }
-
- var length = aElm.options.length;
-
- for (var run = start; run < length; run++) {
- aElm.removeChild(aElm.options[start]);
- }
-}
-
-/**
- * Takes an array and moves all the values to an select.
- *
- * @param aSelect Select form control to populate. Will be cleared
- * before array values are created in it.
- * @param aArray Array with values to populate select with.
- * @param aSkipFirst Boolean; true to skip (not touch) first option in the
- * select and false to remove all options.
- * @param aUseNameAsValue Boolean; true if name is used as value and false if
- * not.
- */
-function bz_populateSelectFromArray(aSelect, aArray, aSkipFirst, aUseNameAsValue)
-{
- // Clear the field
- bz_clearOptions(aSelect, aSkipFirst);
-
- for (var run = 0; run < aArray.length; run++) {
- if (aUseNameAsValue) {
- bz_createOptionInSelect(aSelect, aArray[run], aArray[run]);
- } else {
- bz_createOptionInSelect(aSelect, aArray[run][0], aArray[run][0]);
- }
- }
-}
-
-/**
* Checks if a specified value is in the specified array.
*
* @param aArray Array to search for the value.
diff --git a/post_bug.cgi b/post_bug.cgi
index 31c70b0af..b450a8691 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -264,7 +264,6 @@ if ($cgi->cookie("BUGLIST")) {
@bug_list = split(/:/, $cgi->cookie("BUGLIST"));
}
$vars->{'bug_list'} = \@bug_list;
-$vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
if ($token) {
diff --git a/process_bug.cgi b/process_bug.cgi
index 8424a49a5..bea5d1a7b 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -68,7 +68,6 @@ my $cgi = Bugzilla->cgi;
my $dbh = Bugzilla->dbh;
my $template = Bugzilla->template;
my $vars = {};
-$vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
######################################################################
diff --git a/show_bug.cgi b/show_bug.cgi
index b3251b9d1..62575c5ce 100755
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -94,7 +94,6 @@ eval {
$vars->{'bugs'} = \@bugs;
$vars->{'marks'} = \%marks;
-$vars->{'valid_keywords'} = [map($_->name, Bugzilla::Keyword->get_all)];
$vars->{'use_keywords'} = 1 if Bugzilla::Keyword::keyword_count();
my @bugids = map {$_->bug_id} grep {!$_->error} @bugs;
diff --git a/skins/standard/global.css b/skins/standard/global.css
index f3dd2ffbe..f1a4a1f0b 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -433,17 +433,6 @@ form#Create .comment {
height: 4ex;
}
-#keyword-chooser {
- padding: 10px;
- position: absolute;
- z-index: 25;
- top: 50px;
- left: 50px;
- border: 2px solid #404D6C;
- -moz-border-radius: 5px;
- background: white;
-}
-
.image_button {
background-repeat: no-repeat;
background-position: center center;
@@ -465,4 +454,4 @@ form#Create .comment {
#down_button {
background-image: url(global/down.png);
-} \ No newline at end of file
+}
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 1f5bdb6ac..faf1b87c0 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -39,7 +39,7 @@
[% PROCESS global/header.html.tmpl
title = "Attachment $attachment.id added to $terms.Bug $attachment.bug_id"
bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index f7252e5c8..bc22b4666 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -43,7 +43,7 @@
subheader = filtered_desc
header_addl_info = "Last modified: $filtered_timestamp"
bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 9b522f2a7..d9eab0e04 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -32,7 +32,7 @@
title = title
style_urls = [ 'skins/standard/create_attachment.css',
'skins/standard/yui/calendar.css' ]
- javascript_urls = [ "js/attachment.js", "js/util.js", "js/keyword-chooser.js",
+ javascript_urls = [ "js/attachment.js", "js/util.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js",
"js/field.js" ]
%]
@@ -531,7 +531,8 @@ function handleWantsAttachment(wants_attachment) {
<tr>
<th><a href="describekeywords.cgi">Keywords</a>:</th>
<td colspan="3">
- <input id="keywords" name="keywords" size="60" value="[% keywords FILTER html %]" onfocus="this.chooser.open();"> (optional)
+ <input id="keywords" name="keywords" size="60"
+ value="[% keywords FILTER html %]"> (optional)
</td>
</tr>
[% END %]
@@ -600,12 +601,6 @@ function handleWantsAttachment(wants_attachment) {
<input type="hidden" name="form_name" value="enter_bug">
</form>
-[% IF use_keywords %]
- [% PROCESS "bug/keyword-chooser.html.tmpl"
- sel_keywords = keywords.split(', ')
- %]
-[% END %]
-
[%# Links or content with more information about the bug being created. %]
[% Hook.process("end") %]
diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl
index 1cf2a14f7..6226fdc64 100644
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -36,7 +36,7 @@
[% PROCESS global/header.html.tmpl
title = "$terms.Bug $id Submitted"
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 89d5319fa..6d60d8eb9 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -280,12 +280,6 @@
</table>
</form>
-[% IF use_keywords %]
- [% PROCESS "bug/keyword-chooser.html.tmpl"
- sel_keywords = bug.keywords.split(', ')
- %]
-[% END %]
-
[%############################################################################%]
[%# Block for the Title (alias and short desc) #%]
[%############################################################################%]
@@ -631,8 +625,7 @@
<b><a href="describekeywords.cgi"><u>K</u>eywords</a></b></label>:
</td>
[% PROCESS input inputname => "keywords" size => 40 colspan => 2
- value => bug.keywords.join(', ')
- onfocus => "this.chooser.open()" %]
+ value => bug.keywords.join(', ') %]
</tr>
[% END %]
[% END %]
@@ -1097,7 +1090,6 @@
<input id="[% inputname %]" name="[% inputname %]"
value="[% val FILTER html %]"[% " size=\"$size\"" IF size %]
[% " maxlength=\"$maxlength\"" IF maxlength %]
- [% " onfocus=\"$onfocus\"" IF onfocus %]
[% " spellcheck=\"$spellcheck\"" IF spellcheck %]>
[% ELSE %]
[% IF size && val.length > size %]
@@ -1116,7 +1108,6 @@
[% colspan = 0 %]
[% size = 0 %]
[% value = undef %]
- [% onfocus = undef %]
[% spellcheck = undef %]
[% END %]
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 5472aa7dd..4aecfc1b8 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -42,7 +42,7 @@
[% END %]
[% PROCESS global/header.html.tmpl
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 373cfa327..cf6127413 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -44,7 +44,7 @@
subheader = filtered_desc
header_addl_info = "Last modified: $filtered_timestamp"
bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 9ac1b4339..2509ff5c2 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -301,7 +301,6 @@
'" colspan=\"$colspan\"" IF colspan',
'" size=\"$size\"" IF size',
'" maxlength=\"$maxlength\"" IF maxlength',
- '" onfocus=\"$onfocus\"" IF onfocus',
'flag.status',
'" spellcheck=\"$spellcheck\"" IF spellcheck',
],
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 238763e06..190628fa9 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -220,8 +220,7 @@
</label>
</th>
<td colspan="3">
- <input id="keywords" name="keywords" size="32"
- onfocus = "this.chooser.open();">
+ <input id="keywords" name="keywords" size="32">
<select name="keywordaction">
<option value="add">Add these keywords</option>
<option value="delete">Delete these keywords</option>
@@ -257,12 +256,6 @@
</table>
-[% IF use_keywords %]
- [% PROCESS "bug/keyword-chooser.html.tmpl"
- sel_keywords = keywords.split(', ')
- %]
-[% END %]
-
<b><label for="comment">Additional Comments:</label></b><br>
[% INCLUDE global/textarea.html.tmpl
name = 'comment'
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 37fd0a638..8d67e6c41 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -46,7 +46,7 @@
title = title
style = style
atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom"
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/buglist.css", "skins/standard/yui/calendar.css" ]
doc_section = "query.html#list"
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-22 01:24:47 +0100