New SACK and DBX releases and some list manip fixes from mdawaffe. fixes #2642
git-svn-id: http://svn.automattic.com/wordpress/trunk@3695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9e83d18a03
commit
fa29d02a4b
|
@ -26,7 +26,7 @@ function WPAjax(file, responseEl){//class WPAjax extends sack
|
||||||
this.init(file,responseEl);
|
this.init(file,responseEl);
|
||||||
} WPAjax.prototype=new sack;
|
} WPAjax.prototype=new sack;
|
||||||
WPAjax.prototype.init=function(f,r){
|
WPAjax.prototype.init=function(f,r){
|
||||||
this.URLString=this.encVar('cookie', document.cookie);
|
this.encVar('cookie', document.cookie);
|
||||||
this.requestFile=f;this.getResponseElement(r);this.method='POST';
|
this.requestFile=f;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...'); ?>";};
|
||||||
|
@ -108,7 +108,7 @@ function listMan(theListId){
|
||||||
if(!update){this.removeListItem(id,true);this.addListItem(h,tot);return;}
|
if(!update){this.removeListItem(id,true);this.addListItem(h,tot);return;}
|
||||||
var newItem=this.makeEl(h);
|
var newItem=this.makeEl(h);
|
||||||
var oldItem=document.getElementById(id);
|
var oldItem=document.getElementById(id);
|
||||||
var pos=this.getListPos(oldItem.id);if(this.alt&&!(pos%2))newItem.className+=' '+this.alt;
|
var pos=this.getListPos(oldItem.id,1);if(this.alt&&!(pos%2))newItem.className+=' '+this.alt;
|
||||||
oldItem.parentNode.replaceChild(newItem,oldItem);
|
oldItem.parentNode.replaceChild(newItem,oldItem);
|
||||||
Fat.fade_element(newItem.id);
|
Fat.fade_element(newItem.id);
|
||||||
}
|
}
|
||||||
|
@ -159,4 +159,4 @@ function killSubmit(code,e){if(!e){if(window.event)e=window.event;else return;}v
|
||||||
//Pretty func from ALA http://www.alistapart.com/articles/gettingstartedwithajax
|
//Pretty func from ALA http://www.alistapart.com/articles/gettingstartedwithajax
|
||||||
function getNodeValue(tree,el){return tree.getElementsByTagName(el)[0].firstChild.nodeValue;}
|
function getNodeValue(tree,el){return tree.getElementsByTagName(el)[0].firstChild.nodeValue;}
|
||||||
//Generic but lame JS closure
|
//Generic but lame JS closure
|
||||||
function encloseFunc(f){var a=arguments[1];return function(){f(a);}}
|
function encloseFunc(f){var a=arguments[1];return function(){return f(a);}}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,133 +1,193 @@
|
||||||
/* Simple AJAX Code-Kit (SACK) */
|
/* Simple AJAX Code-Kit (SACK) v1.6.1 */
|
||||||
/* ©2005 Gregory Wild-Smith */
|
/* ©2005 Gregory Wild-Smith */
|
||||||
/* www.twilightuniverse.com */
|
/* www.twilightuniverse.com */
|
||||||
/* Software licenced under a modified X11 licence, see documentation or authors website for more details */
|
/* Software licenced under a modified X11 licence,
|
||||||
|
see documentation or authors website for more details */
|
||||||
|
|
||||||
function sack(file){
|
function sack(file) {
|
||||||
this.AjaxFailedAlert = "Your browser does not support the enhanced functionality of this website, and therefore you will have an experience that differs from the intended one.\n";
|
this.xmlhttp = null;
|
||||||
this.requestFile = file;
|
|
||||||
this.method = "POST";
|
|
||||||
this.URLString = "";
|
|
||||||
this.encodeURIString = true;
|
|
||||||
this.execute = false;
|
|
||||||
|
|
||||||
this.onLoading = function() { };
|
this.resetData = function() {
|
||||||
this.onLoaded = function() { };
|
this.method = "POST";
|
||||||
this.onInteractive = function() { };
|
this.queryStringSeparator = "?";
|
||||||
this.onCompletion = function() { };
|
this.argumentSeparator = "&";
|
||||||
|
this.URLString = "";
|
||||||
|
this.encodeURIString = true;
|
||||||
|
this.execute = false;
|
||||||
|
this.element = null;
|
||||||
|
this.elementObj = null;
|
||||||
|
this.requestFile = file;
|
||||||
|
this.vars = new Object();
|
||||||
|
this.responseStatus = new Array(2);
|
||||||
|
};
|
||||||
|
|
||||||
|
this.resetFunctions = function() {
|
||||||
|
this.onLoading = function() { };
|
||||||
|
this.onLoaded = function() { };
|
||||||
|
this.onInteractive = function() { };
|
||||||
|
this.onCompletion = function() { };
|
||||||
|
this.onError = function() { };
|
||||||
|
this.onFail = function() { };
|
||||||
|
};
|
||||||
|
|
||||||
|
this.reset = function() {
|
||||||
|
this.resetFunctions();
|
||||||
|
this.resetData();
|
||||||
|
};
|
||||||
|
|
||||||
this.createAJAX = function() {
|
this.createAJAX = function() {
|
||||||
try {
|
try {
|
||||||
this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
|
this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
|
||||||
} catch (e) {
|
} catch (e1) {
|
||||||
try {
|
try {
|
||||||
this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
|
this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
|
||||||
} catch (err) {
|
} catch (e2) {
|
||||||
this.xmlhttp = null;
|
this.xmlhttp = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!this.xmlhttp && typeof XMLHttpRequest != "undefined")
|
|
||||||
this.xmlhttp = new XMLHttpRequest();
|
if (! this.xmlhttp) {
|
||||||
if (!this.xmlhttp){
|
if (typeof XMLHttpRequest != "undefined") {
|
||||||
this.failed = true;
|
this.xmlhttp = new XMLHttpRequest();
|
||||||
|
} else {
|
||||||
|
this.failed = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.setVar = function(name, value){
|
this.setVar = function(name, value){
|
||||||
if (this.URLString.length < 3){
|
this.vars[name] = Array(value, false);
|
||||||
this.URLString = name + "=" + value;
|
};
|
||||||
|
|
||||||
|
this.encVar = function(name, value, returnvars) {
|
||||||
|
if (true == returnvars) {
|
||||||
|
return Array(encodeURIComponent(name), encodeURIComponent(value));
|
||||||
} else {
|
} else {
|
||||||
this.URLString += "&" + name + "=" + value;
|
this.vars[encodeURIComponent(name)] = Array(encodeURIComponent(value), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.encVar = function(name, value){
|
this.processURLString = function(string, encode) {
|
||||||
var varString = encodeURIComponent(name) + "=" + encodeURIComponent(value);
|
encoded = encodeURIComponent(this.argumentSeparator);
|
||||||
return varString;
|
regexp = new RegExp(this.argumentSeparator + "|" + encoded);
|
||||||
}
|
varArray = string.split(regexp);
|
||||||
|
|
||||||
this.encodeURLString = function(string){
|
|
||||||
varArray = string.split('&');
|
|
||||||
for (i = 0; i < varArray.length; i++){
|
for (i = 0; i < varArray.length; i++){
|
||||||
urlVars = varArray[i].split('=');
|
urlVars = varArray[i].split("=");
|
||||||
if (urlVars[0].indexOf('amp;') != -1){
|
if (true == encode){
|
||||||
urlVars[0] = urlVars[0].substring(4);
|
this.encVar(urlVars[0], urlVars[1]);
|
||||||
|
} else {
|
||||||
|
this.setVar(urlVars[0], urlVars[1]);
|
||||||
}
|
}
|
||||||
varArray[i] = this.encVar(urlVars[0],urlVars[1]);
|
|
||||||
}
|
}
|
||||||
return varArray.join('&');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.runResponse = function(){
|
this.createURLString = function(urlstring) {
|
||||||
|
if (this.encodeURIString && this.URLString.length) {
|
||||||
|
this.processURLString(this.URLString, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (urlstring) {
|
||||||
|
if (this.URLString.length) {
|
||||||
|
this.URLString += this.argumentSeparator + urlstring;
|
||||||
|
} else {
|
||||||
|
this.URLString = urlstring;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// prevents caching of URLString
|
||||||
|
this.setVar("rndval", new Date().getTime());
|
||||||
|
|
||||||
|
urlstringtemp = new Array();
|
||||||
|
for (key in this.vars) {
|
||||||
|
if (false == this.vars[key][1] && true == this.encodeURIString) {
|
||||||
|
encoded = this.encVar(key, this.vars[key][0], true);
|
||||||
|
delete this.vars[key];
|
||||||
|
this.vars[encoded[0]] = Array(encoded[1], true);
|
||||||
|
key = encoded[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
urlstringtemp[urlstringtemp.length] = key + "=" + this.vars[key][0];
|
||||||
|
}
|
||||||
|
if (urlstring){
|
||||||
|
this.URLString += this.argumentSeparator + urlstringtemp.join(this.argumentSeparator);
|
||||||
|
} else {
|
||||||
|
this.URLString += urlstringtemp.join(this.argumentSeparator);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.runResponse = function() {
|
||||||
eval(this.response);
|
eval(this.response);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.runAJAX = function(urlstring){
|
this.runAJAX = function(urlstring) {
|
||||||
this.responseStatus = new Array(2);
|
if (this.failed) {
|
||||||
if(this.failed && this.AjaxFailedAlert){
|
this.onFail();
|
||||||
alert(this.AjaxFailedAlert);
|
|
||||||
} else {
|
} else {
|
||||||
if (urlstring){
|
this.createURLString(urlstring);
|
||||||
if (this.URLString.length){
|
if (this.element) {
|
||||||
this.URLString = this.URLString + "&" + urlstring;
|
this.elementObj = document.getElementById(this.element);
|
||||||
} else {
|
|
||||||
this.URLString = urlstring;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (this.encodeURIString){
|
|
||||||
var timeval = new Date().getTime();
|
|
||||||
this.URLString = this.encodeURLString(this.URLString);
|
|
||||||
this.setVar("rndval", timeval);
|
|
||||||
}
|
|
||||||
if (this.element) { this.elementObj = document.getElementById(this.element); }
|
|
||||||
if (this.xmlhttp) {
|
if (this.xmlhttp) {
|
||||||
var self = this;
|
var self = this;
|
||||||
if (this.method == "GET") {
|
if (this.method == "GET") {
|
||||||
var totalurlstring = this.requestFile + "?" + this.URLString;
|
totalurlstring = this.requestFile + this.queryStringSeparator + this.URLString;
|
||||||
this.xmlhttp.open(this.method, totalurlstring, true);
|
this.xmlhttp.open(this.method, totalurlstring, true);
|
||||||
} else {
|
} else {
|
||||||
this.xmlhttp.open(this.method, this.requestFile, true);
|
this.xmlhttp.open(this.method, this.requestFile, true);
|
||||||
}
|
try {
|
||||||
if (this.method == "POST"){
|
this.xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
|
||||||
try {
|
} catch (e) { }
|
||||||
this.xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded')
|
|
||||||
} catch (e) {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.xmlhttp.send(this.URLString);
|
|
||||||
this.xmlhttp.onreadystatechange = function() {
|
this.xmlhttp.onreadystatechange = function() {
|
||||||
switch (self.xmlhttp.readyState){
|
switch (self.xmlhttp.readyState) {
|
||||||
case 1:
|
case 1:
|
||||||
self.onLoading();
|
self.onLoading();
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
self.onLoaded();
|
self.onLoaded();
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
self.onInteractive();
|
self.onInteractive();
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
self.response = self.xmlhttp.responseText;
|
self.response = self.xmlhttp.responseText;
|
||||||
self.responseXML = self.xmlhttp.responseXML;
|
self.responseXML = self.xmlhttp.responseXML;
|
||||||
self.responseStatus[0] = self.xmlhttp.status;
|
self.responseStatus[0] = self.xmlhttp.status;
|
||||||
self.responseStatus[1] = self.xmlhttp.statusText;
|
self.responseStatus[1] = self.xmlhttp.statusText;
|
||||||
self.onCompletion();
|
|
||||||
if(self.execute){ self.runResponse(); }
|
if (self.execute) {
|
||||||
|
self.runResponse();
|
||||||
|
}
|
||||||
|
|
||||||
if (self.elementObj) {
|
if (self.elementObj) {
|
||||||
var elemNodeName = self.elementObj.nodeName;
|
elemNodeName = self.elementObj.nodeName;
|
||||||
elemNodeName.toLowerCase();
|
elemNodeName.toLowerCase();
|
||||||
if (elemNodeName == "input" || elemNodeName == "select" || elemNodeName == "option" || elemNodeName == "textarea"){
|
if (elemNodeName == "input"
|
||||||
|
|| elemNodeName == "select"
|
||||||
|
|| elemNodeName == "option"
|
||||||
|
|| elemNodeName == "textarea") {
|
||||||
self.elementObj.value = self.response;
|
self.elementObj.value = self.response;
|
||||||
} else {
|
} else {
|
||||||
self.elementObj.innerHTML = self.response;
|
self.elementObj.innerHTML = self.response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (self.responseStatus[0] == "200") {
|
||||||
|
self.onCompletion();
|
||||||
|
} else {
|
||||||
|
self.onError();
|
||||||
|
}
|
||||||
|
|
||||||
self.URLString = "";
|
self.URLString = "";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.xmlhttp.send(this.URLString);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
this.createAJAX();
|
|
||||||
}
|
this.reset();
|
||||||
|
this.createAJAX();
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue