mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-24 16:43:06 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Admin AJAX tweaks from mdawaffe. fixes #2969

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@4042 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2006-07-25 19:01:52 +00:00
parent d44fdf7d33
commit 31376ccaa9
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/admin-ajax.php
View File

@ -13,12 +13,6 @@ if ( !is_user_logged_in() )
function get_out_now() { exit; } function get_out_now() { exit; }
add_action( 'shutdown', 'get_out_now', -1 ); add_action( 'shutdown', 'get_out_now', -1 );
function wp_clean_ajax_input( $i ) {
global $wpdb;
$i = is_array($i) ? array_map('wp_clean_ajax_input', $i) : $wpdb->escape( rawurldecode(stripslashes($i)) );
return $i;
}
function wp_ajax_echo_meta( $pid, $mid, $key, $value ) { function wp_ajax_echo_meta( $pid, $mid, $key, $value ) {
$value = wp_specialchars($value, true); $value = wp_specialchars($value, true);
$key_js = addslashes(wp_specialchars($key, 'double')); $key_js = addslashes(wp_specialchars($key, 'double'));
@ -35,7 +29,6 @@ function wp_ajax_echo_meta( $pid, $mid, $key, $value ) {
return $r; return $r;
} }
$_POST = wp_clean_ajax_input( $_POST );
$id = (int) $_POST['id']; $id = (int) $_POST['id'];
switch ( $_POST['action'] ) : switch ( $_POST['action'] ) :
case 'delete-comment' : case 'delete-comment' :
@ -224,6 +217,7 @@ case 'add-user' :
die($r); die($r);
break; break;
default : default :
do_action( 'wp_ajax_' . $_POST['action'] );
die('0'); die('0');
break; break;
endswitch; endswitch;

36
wp-admin/list-manipulation-js.php
View File

@ -1,6 +1,7 @@
<?php <?php
require_once('admin.php'); require_once('admin.php');
header('Content-type: text/javascript; charset=' . get_settings('blog_charset'), true); header('Content-type: text/javascript; charset=' . get_settings('blog_charset'), true);
$handler = get_settings( 'siteurl' ) . '/wp-admin/admin-ajax.php';
?> ?>
addLoadEvent(function(){theList=new listMan();}); 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;} 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;}
@ -27,15 +28,15 @@ function WPAjax(file, responseEl){//class WPAjax extends sack
} WPAjax.prototype=new sack; } WPAjax.prototype=new sack;
WPAjax.prototype.init=function(f,r){ WPAjax.prototype.init=function(f,r){
this.encVar('cookie', document.cookie); this.encVar('cookie', document.cookie);
this.requestFile=f;this.getResponseElement(r);this.method='POST'; this.requestFile=f?f:'<?php echo $handler; ?>';this.getResponseElement(r);this.method='POST';
this.onLoading=function(){this.myResponseElement.innerHTML="<?php _e('Sending Data...'); ?>";}; this.onLoading=function(){this.myResponseElement.innerHTML="<?php _e('Sending Data...'); ?>";};
this.onLoaded=function(){this.myResponseElement.innerHTML="<?php _e('Data Sent...'); ?>";}; this.onLoaded=function(){this.myResponseElement.innerHTML="<?php _e('Data Sent...'); ?>";};
this.onInteractive=function(){this.myResponseElement.innerHTML="<?php _e('Processing Data...'); ?>";}; this.onInteractive=function(){this.myResponseElement.innerHTML="<?php _e('Processing Data...'); ?>";};
} }
function listMan(theListId){ function listMan(theListId){
this.theList=null; this.theList=null;this.theListId=theListId;
this.ajaxRespEl=null; this.ajaxRespEl=null;this.ajaxHandler='<?php echo $handler; ?>';
this.inputData='';this.clearInputs=new Array();this.showLink=1; this.inputData='';this.clearInputs=new Array();this.showLink=1;
this.topAdder=0;this.alt='alternate';this.recolorPos;this.reg_color='#FFFFFF';this.alt_color='#F1F1F1'; this.topAdder=0;this.alt='alternate';this.recolorPos;this.reg_color='#FFFFFF';this.alt_color='#F1F1F1';
this.addComplete=null;this.delComplete=null;this.dimComplete=null; this.addComplete=null;this.delComplete=null;this.dimComplete=null;
@ -44,7 +45,7 @@ function listMan(theListId){
this.ajaxAdder=function(what,where,update){//for TR, server must wrap TR in TABLE TBODY. this.makeEl cleans it this.ajaxAdder=function(what,where,update){//for TR, server must wrap TR in TABLE TBODY. this.makeEl cleans it
if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300); if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
this.ajaxAdd=new WPAjax('admin-ajax.php',this.ajaxRespEl?this.ajaxRespEl:'ajax-response'); this.ajaxAdd=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
if(this.ajaxAdd.failed)return true; if(this.ajaxAdd.failed)return true;
this.grabInputs(where); this.grabInputs(where);
var tempObj=this; var tempObj=this;
@ -53,7 +54,7 @@ function listMan(theListId){
var newItems=this.responseXML.getElementsByTagName(what); var newItems=this.responseXML.getElementsByTagName(what);
if(tempObj.topAdder)tempObj.recolorPos=0; if(tempObj.topAdder)tempObj.recolorPos=0;
if(newItems){for (c=0;c<newItems.length;c++){ if(newItems){for (c=0;c<newItems.length;c++){
var id=parseInt(getNodeValue(newItems[c],'id'),10); var id=getNodeValue(newItems[c],'id');
var exists=document.getElementById(what+'-'+id); var exists=document.getElementById(what+'-'+id);
if(exists)tempObj.replaceListItem(exists.id,getNodeValue(newItems[c],'newitem'),newItems.length,update); if(exists)tempObj.replaceListItem(exists.id,getNodeValue(newItems[c],'newitem'),newItems.length,update);
else tempObj.addListItem(getNodeValue(newItems[c],'newitem'),newItems.length); else tempObj.addListItem(getNodeValue(newItems[c],'newitem'),newItems.length);
@ -71,7 +72,7 @@ function listMan(theListId){
this.ajaxUpdater=function(what,where){return this.ajaxAdder(what,where,true);} this.ajaxUpdater=function(what,where){return this.ajaxAdder(what,where,true);}
this.ajaxDelete=function(what,id){ this.ajaxDelete=function(what,id){
if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300); if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
this.ajaxDel=new WPAjax('admin-ajax.php',this.ajaxRespEl?this.ajaxRespEl:'ajax-response'); this.ajaxDel=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
if(this.ajaxDel.failed)return true; if(this.ajaxDel.failed)return true;
var tempObj=this; var tempObj=this;
this.ajaxDel.onCompletion=function(){if(this.parseAjaxResponse()){tempObj.removeListItem(what.replace('-as-spam','')+'-'+id);this.myResponseElement.innerHTML='';if(tempObj.delComplete&&typeof tempObj.delComplete=='function')tempObj.delComplete(what,id);tempObj.recolorList(tempObj.recolorPos,1000)}}; this.ajaxDel.onCompletion=function(){if(this.parseAjaxResponse()){tempObj.removeListItem(what.replace('-as-spam','')+'-'+id);this.myResponseElement.innerHTML='';if(tempObj.delComplete&&typeof tempObj.delComplete=='function')tempObj.delComplete(what,id);tempObj.recolorList(tempObj.recolorPos,1000)}};
@ -80,7 +81,7 @@ function listMan(theListId){
} }
this.ajaxDimmer=function(what,id,dimClass){ this.ajaxDimmer=function(what,id,dimClass){
if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300); if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
this.ajaxDim=new WPAjax('admin-ajax.php',this.ajaxRespEl?this.ajaxRespEl:'ajax-response'); this.ajaxDim=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
if(this.ajaxDim.failed)return true; if(this.ajaxDim.failed)return true;
var tempObj=this; var tempObj=this;
this.ajaxDim.onCompletion=function(){if(this.parseAjaxResponse()){tempObj.dimItem(what+'-'+id,dimClass);this.myResponseElement.innerHTML='';if(tempObj.dimComplete&&typeof tempObj.dimComplete=='function')tempObj.dimComplete(what,id,dimClass);}}; this.ajaxDim.onCompletion=function(){if(this.parseAjaxResponse()){tempObj.dimItem(what+'-'+id,dimClass);this.myResponseElement.innerHTML='';if(tempObj.dimComplete&&typeof tempObj.dimComplete=='function')tempObj.dimComplete(what,id,dimClass);}};
@ -137,8 +138,8 @@ function listMan(theListId){
this.getListItems=function(){ this.getListItems=function(){
if(this.theList)return; if(this.theList)return;
listItems=new Array(); listItems=new Array();
if(theListId){this.theList=document.getElementById(theListId);if(!this.theList)return false;} if(this.theListId){this.theList=document.getElementById(this.theListId);if(!this.theList)return false;}
else{this.theList=document.getElementById('the-list');if(this.theList)theListId='the-list';} else{this.theList=document.getElementById('the-list');if(this.theList)this.theListId='the-list';}
if(this.theList){ if(this.theList){
var items=this.theList.getElementsByTagName('tr');listType='table'; var items=this.theList.getElementsByTagName('tr');listType='table';
if(!items[0]){items=this.theList.getElementsByTagName('li');listType='list';} if(!items[0]){items=this.theList.getElementsByTagName('li');listType='list';}
@ -155,9 +156,18 @@ function listMan(theListId){
} }
this.getListItems(); this.getListItems();
} }
//No submit unless eval(code) returns true. //No submit unless code returns true.
function killSubmit(code,e){if(!e){if(window.event)e=window.event;else return;}var t=e.target?e.target:e.srcElement;if(('text'==t.type&&e.keyCode==13)||('submit'==t.type&&'click'==e.type)){if(!eval(code)){e.returnValue=false;e.cancelBubble=true;return false;}}} function killSubmit ( code, e ) {
//Pretty func from ALA http://www.alistapart.com/articles/gettingstartedwithajax e = e ? e : window.event;
function getNodeValue(tree,el){return tree.getElementsByTagName(el)[0].firstChild.nodeValue;} if ( !e ) return;
var t = e.target ? e.target : e.srcElement;
if ( ( 'text' == t.type && e.keyCode == 13 ) || ( 'submit' == t.type && 'click' == e.type ) ) {
if ( ( 'string' == typeof code && !eval(code) ) || 'function' == typeof code && !code() ) {
if ( !eval(code) ) { e.returnValue = false; e.cancelBubble = true; return false; }
}
}
}
//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 //Generic but lame JS closure
function encloseFunc(f){var a=arguments[1];return function(){return f(a);}} function encloseFunc(f){var a=arguments[1];return function(){return f(a);}}

2
wp-includes/script-loader.php
View File

@ -19,7 +19,7 @@ class WP_Scripts {
$this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' ); $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' );
if ( is_admin() ) { if ( is_admin() ) {
$this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' ); $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
$this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '3850' ); // 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( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '3684' );
$this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' ); $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' );
$this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' ); $this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' );