Changeset 4163

Timestamp:

09/02/2006 10:08:10 PM (18 years ago)

Author:

ryan

Message:

Revert accidental commit.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (5 diffs)
• wp-admin/cat-js.php (modified) (1 diff)
• wp-admin/custom-fields.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -6 +6 @@
 define('DOING_AJAX', true);
 
+
 check_ajax_referer();
 if ( !is_user_logged_in() )
@@ -17 +18 @@
     $key_js = addslashes(wp_specialchars($key, 'double'));
     $key = wp_specialchars($key, true);
-    $r  = "<meta><id>$mid</id><postid>$pid</postid><newitem><![CDATA[";
+    $r  = "<meta><id>$mid</id><postid>$pid</postid><newitem><![CDATA[<table><tbody>";
     $r .= "<tr id='meta-$mid'><td valign='top'>";
     $r .= "<input name='meta[$mid][key]' tabindex='6' onkeypress='return killSubmit(\"theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);\",event);' type='text' size='20' value='$key' />";
@@ -25 +26 @@
     $r .= sprintf(__("You are about to delete the &quot;%s&quot; custom field on this post.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), $key_js);
     $r .= "' );\" class='deletemeta' tabindex='6' value='Delete' />";
-    $r .= "</td></tr>]]></newitem></meta>";
+    $r .= "</td></tr></tbody></table>]]></newitem></meta>";
     return $r;
 }
@@ -148 +149 @@
 
     $r  = "<?xml version='1.0' standalone='yes'?><ajaxresponse>";
-    $r .= "<cat><id>$cat->cat_ID</id><name>$cat_full_name</name><newitem><![CDATA[";
+    $r .= "<cat><id>$cat->cat_ID</id><name>$cat_full_name</name><newitem><![CDATA[<table><tbody>";
     $r .= _cat_row( $cat, $level, $cat_full_name );
-    $r .= "]]></newitem></cat></ajaxresponse>";
+    $r .= "</tbody></table>]]></newitem></cat></ajaxresponse>";
     header('Content-type: text/xml');
     die($r);
@@ -207 +208 @@
         die('0');
     }
-    $r  = "<?xml version='1.0' standalone='yes'?><ajaxresponse><user><id>$user_id</id><newitem><![CDATA[";
+    $r  = "<?xml version='1.0' standalone='yes'?><ajaxresponse><user><id>$user_id</id><newitem><![CDATA[<table><tbody>";
     $r .= user_row( $user_id );
-    $r .= "]]></newitem></user></ajaxresponse>";
+    $r .= "</tbody></table>]]></newitem></user></ajaxresponse>";
     header('Content-type: text/xml');
     die($r);

trunk/wp-admin/cat-js.php

@@ -6 +6 @@
 addLoadEvent(newCatAddIn);
 function newCatAddIn() {
-    var jaxcat = $('jaxcat');
-    if ( !jaxcat )
-        return false;
-    jaxcat.update('<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" id="catadd" value="Add"/><span id="howto"><?php _e('Separate multiple categories with commas.'); ?></span></span>');
-    $('newcat').onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','jaxcat');", e); };
-    $('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); };
+    if ( !document.getElementById('jaxcat') ) return false;
+    var ajaxcat = document.createElement('span');
+    ajaxcat.id = 'ajaxcat';
+
+    newcat = document.createElement('input');
+    newcat.type = 'text';
+    newcat.name = 'newcat';
+    newcat.id = 'newcat';
+    newcat.size = '16';
+    newcat.setAttribute('autocomplete', 'off');
+    newcat.onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','categorydiv');", e); };
+
+    var newcatSub = document.createElement('input');
+    newcatSub.type = 'button';
+    newcatSub.name = 'Button';
+    newcatSub.id = 'catadd';
+    newcatSub.value = 'Add';
+    newcatSub.onclick = function() { catList.ajaxAdder('category', 'categorydiv'); };
+
+    ajaxcat.appendChild(newcat);
+    ajaxcat.appendChild(newcatSub);
+    document.getElementById('jaxcat').appendChild(ajaxcat);
+
+    howto = document.createElement('span');
+    howto.innerHTML = "<?php _e('Separate multiple categories with commas.'); ?>";
+    howto.id = 'howto';
+    ajaxcat.appendChild(howto);
 }

trunk/wp-admin/custom-fields.js

@@ -1 +1 @@
 function customFieldsOnComplete() {
-    var pidEl = $('post_ID');
+    var pidEl = document.getElementById('post_ID');
     pidEl.name = 'post_ID';
     pidEl.value = getNodeValue(theList.ajaxAdd.responseXML, 'postid');
-    var aEl = $('hiddenaction')
+    var aEl = document.getElementById('hiddenaction')
     if ( aEl.value == 'post' ) aEl.value = 'postajaxpost';
 }
@@ -22 +22 @@
     }
 
-    $('metakeyinput').onkeypress = function(e) {return killSubmit('theList.inputData+="&id="+$("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); };
-    $('updatemetasub').onclick = function(e) {return killSubmit('theList.inputData+="&id="+$("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); };
+    document.getElementById('metakeyinput').onkeypress = function(e) {return killSubmit('theList.inputData+="&id="+document.getElementById("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); };
+    document.getElementById('updatemetasub').onclick = function(e) {return killSubmit('theList.inputData+="&id="+document.getElementById("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); };
 }

trunk/wp-includes/script-loader.php

@@ -20 +20 @@
         $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
         $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4107');
-        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), rand());
-        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), rand());
         if ( is_admin() ) {
             $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
-            $this->add( 'listman-old', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '4042' ); // Make changeset # the correct one
+            $this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '4042' ); // Make changeset # the correct one
             $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '3684' );
             $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' );