From 4ada9a43a2677533312c2d84ad6a914551993eec Mon Sep 17 00:00:00 2001
From: matt <matt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 10 Aug 2005 23:39:15 +0000
Subject: [PATCH] Getting much better! Fixes #1566

git-svn-id: http://svn.automattic.com/wordpress/trunk@2776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php       | 40 ++++++++++++++++++++++++++++++---
 wp-admin/edit-form-advanced.php |  7 +-----
 2 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index ab867f3bd7..e3bed3c21d 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -100,12 +100,40 @@ tinyMCE.init({
 <?php endif; ?>
 <script type="text/javascript" src="dbx.js"></script>
 <script type="text/javascript" src="dbx-key.js"></script>
+
+<?php if ( current_user_can('manage_categories') ) : ?>
 <script type="text/javascript" src="tw-sack.js"></script>
 <script type="text/javascript">
 var ajaxCat = new sack();
+var newcat;
+ 
+function newCatAddIn() {
+	var ajaxcat = document.createElement('p');
+	ajaxcat.id = 'ajaxcat';
+
+	newcat = document.createElement('input');
+	newcat.type = 'text';
+	newcat.name = 'newcat';
+	newcat.id = 'newcat';
+	newcat.size = '16';
+	newcat.setAttribute('autocomplete', 'off');
+	newcat.setAttribute('onkeypress', 'return ajaxNewCatKeyPress(event);');
+
+	var newcatSub = document.createElement('input');
+	newcatSub.type = 'button';
+	newcatSub.name = 'Button';
+	newcatSub.value = '+';
+	newcatSub.setAttribute('onclick', 'ajaxNewCat();');
+
+	ajaxcat.appendChild(newcat);
+	ajaxcat.appendChild(newcatSub);
+	document.getElementById('categorychecklist').parentNode.appendChild(ajaxcat);
+}
+
+addLoadEvent(newCatAddIn);
 
 function getResponseElement() {
-var p = document.getElementById('ajaxcatresponse');
+	var p = document.getElementById('ajaxcatresponse');
 	if (!p) {
 		p = document.createElement('p');
 		document.getElementById('categorydiv').appendChild(p);
@@ -165,14 +193,15 @@ function newCatCompletion() {
 		newCheck.name = 'post_category[]';
 		newCheck.id = 'category-' + id;
 
-		var newLabelText = document.createTextNode(' ' + document.getElementById('newcat').value);
+		var newLabelText = document.createTextNode(' ' + newcat.value);
 		newLabel.appendChild(newLabelText);
 		Fat.fade_all();
 		newLabel.setAttribute('class', 'selectit');
 	}
+	newcat.value = '';
 }
 
-function ajaxNewCatKeyUp(e) {
+function ajaxNewCatKeyPress(e) {
 	if (!e) {
 		if (window.event) {
 			e = window.event;
@@ -182,6 +211,9 @@ function ajaxNewCatKeyUp(e) {
 	}
 	if (e.keyCode == 13) {
 		ajaxNewCat();
+		e.returnValue = false;
+		e.cancelBubble = true;
+		return false;
 	}
 }
 
@@ -199,6 +231,8 @@ function ajaxNewCat() {
 </script>
 <?php endif; ?>
 
+<?php endif; ?>
+
 <?php do_action('admin_head'); ?>
 </head>
 <body>
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index ebe6279a7a..9e1d506a2d 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -83,12 +83,7 @@ addLoadEvent(focusit);
 
 <fieldset id="categorydiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Categories') ?></h3> 
-<div class="dbx-content"><div id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></div>
-<p id="ajaxcat">
-  <input type="text" name="newcat" id="newcat" size="16" onkeyup="ajaxNewCatKeyUp(event);" /> 
-  <input type="button" name="Button" value="+" onclick="ajaxNewCat();" />
-</p>
-</div>
+<div class="dbx-content"><div id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></div></div>
 </fieldset>
 
 <fieldset class="dbx-box">
