Changeset 4458

Timestamp:

11/08/2006 09:23:41 PM (19 years ago)

Author:

ryan

Message:

Ajax plugin tweakage from mdawaffe. fixes #3334

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• js/list-manipulation-js.php (modified) (5 diffs)
• js/wp-ajax-js.php (modified) (2 diffs)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -689 +689 @@
 
         $x = '';
-        $x .= "<response action='$action_$id'>"; // The action attribute in the xml output is formatted like a nonce action
+        $x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
         $x .=   "<$what id='$id'" . ( false !== $old_id ? "old_id='$old_id'>" : '>' );
         $x .=       $response;

trunk/wp-includes/js/list-manipulation-js.php

@@ -1 @@
-<?php
-@require_once('../../wp-config.php');
-cache_javascript_headers();
-$handler =  get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php';
-?>
+<?php @require_once('../../wp-config.php'); cache_javascript_headers(); ?>
 addLoadEvent(function(){theList=new listMan();});
 function deleteSomething(what,id,message,obj){if(!obj)obj=theList;if(!message)message="<?php printf(__('Are you sure you want to delete this %s?'),"'+what+'"); ?>";if(confirm(message))return obj.ajaxDelete(what,id);else return false;}
@@ -11 +7 @@
 Object.extend(listMan.prototype, {
     ajaxRespEl: 'ajax-response',
-    ajaxHandler: '<?php echo $handler; ?>',
+    ajaxHandler: false,
     inputData: '',
     clearInputs: [],
@@ -52 +48 @@
                         tempObj.showLink = id;
                 });
+                ajaxAdd.myResponseElement.update(tempObj.showLink ? ( "<div id='jumplink' class='updated fade'><p><a href='#" + what + '-' + tempObj.showLink + "'><?php _e('Jump to new item'); ?></a></p></div>" ) : '');
             }
-            ajaxAdd.myResponseElement.update(tempObj.showLink ? ( "<div id='jumplink' class='updated fade'><p><a href='#" + what + '-' + tempObj.showLink + "'><?php _e('Jump to new item'); ?></a></p></div>" ) : '');
             if ( tempObj.addComplete && typeof tempObj.addComplete == 'function' )
                 tempObj.addComplete( what, where, update, transport );
@@ -59 +55 @@
             ajaxAdd.restoreInputs = null;
         });
-        ajaxAdd.addOnWPError( function(transport) { tempObj.restoreForm(ajaxAdd.restoreInputs); });
+        if ( !update )
+            ajaxAdd.addOnWPError( function(transport) { tempObj.restoreForm(ajaxAdd.restoreInputs); });
         ajaxAdd.request(ajaxAdd.url);
-        this.clear();
+        if ( !update )
+            this.clear();
         return false;
     },
@@ -263 +261 @@
     }
 }
-//Pretty func adapted from ALA http://www.alistapart.com/articles/gettingstartedwithajax
-function getNodeValue(tree,el){try { var r = tree.getElementsByTagName(el)[0].firstChild.nodeValue; } catch(err) { var r = null; } return r; }
 //Generic but lame JS closure
 function encloseFunc(f){var a=arguments[1];return function(){return f(a);}}

trunk/wp-includes/js/wp-ajax-js.php

@@ -20 +20 @@
             }
         });
-        this.url = url;
+        this.url = url ? url : '<?php bloginfo( 'wpurl' ); ?>/wp-admin/admin-ajax.php';
         this.getResponseElement(responseEl);
     },
@@ -92 +92 @@
     }
 });
+
+//Pretty func adapted from ALA http://www.alistapart.com/articles/gettingstartedwithajax
+function getNodeValue(tree,el){try { var r = tree.getElementsByTagName(el)[0].firstChild.nodeValue; } catch(err) { var r = null; } return r; }

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'), '4206');
-        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '4187');
-        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '4187');
+        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '####');
+        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '####');
         if ( is_admin() ) {
             $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );