-1?"&":"?")+_631;
+var _396=url;
+if(_386!=""){
+_396+=(_396.indexOf("?")>-1?"&":"?")+_386;
}
-if(_63b){
-_641+=(dojo.string.endsWithAny(_641,"?","&")?"":(_641.indexOf("?")>-1?"&":"?"))+"dojo.preventCache="+new Date().valueOf();
+if(_390){
+_396+=(dojo.string.endsWithAny(_396,"?","&")?"":(_396.indexOf("?")>-1?"&":"?"))+"dojo.preventCache="+new Date().valueOf();
}
-if(!_62f.user){
-http.open(_62f.method.toUpperCase(),_641,_63a);
+if(!_384.user){
+http.open(_384.method.toUpperCase(),_396,_38f);
}else{
-http.open(_62f.method.toUpperCase(),_641,_63a,_62f.user,_62f.password);
+http.open(_384.method.toUpperCase(),_396,_38f,_384.user,_384.password);
}
-setHeaders(http,_62f);
+setHeaders(http,_384);
try{
http.send(null);
}
@@ -6683,14 +4110,14 @@ catch(e){
if(typeof http.abort=="function"){
http.abort();
}
-doLoad(_62f,{status:404},url,_631,_63c);
+doLoad(_384,{status:404},url,_386,_391);
}
}
-if(!_63a){
-doLoad(_62f,http,url,_631,_63c);
-_60f._blockAsync=false;
+if(!_38f){
+doLoad(_384,http,url,_386,_391);
+_364._blockAsync=false;
}
-_62f.abort=function(){
+_384.abort=function(){
try{
http._aborted=true;
}
@@ -6702,16 +4129,17 @@ return;
};
dojo.io.transports.addTransport("XMLHTTPTransport");
};
+}
dojo.provide("dojo.io.cookie");
-dojo.io.cookie.setCookie=function(name,_643,days,path,_646,_647){
-var _648=-1;
-if(typeof days=="number"&&days>=0){
+dojo.io.cookie.setCookie=function(name,_398,days,path,_39b,_39c){
+var _39d=-1;
+if((typeof days=="number")&&(days>=0)){
var d=new Date();
d.setTime(d.getTime()+(days*24*60*60*1000));
-_648=d.toGMTString();
+_39d=d.toGMTString();
}
-_643=escape(_643);
-document.cookie=name+"="+_643+";"+(_648!=-1?" expires="+_648+";":"")+(path?"path="+path:"")+(_646?"; domain="+_646:"")+(_647?"; secure":"");
+_398=escape(_398);
+document.cookie=name+"="+_398+";"+(_39d!=-1?" expires="+_39d+";":"")+(path?"path="+path:"")+(_39b?"; domain="+_39b:"")+(_39c?"; secure":"");
};
dojo.io.cookie.set=dojo.io.cookie.setCookie;
dojo.io.cookie.getCookie=function(name){
@@ -6719,71 +4147,71 @@ var idx=document.cookie.lastIndexOf(name+"=");
if(idx==-1){
return null;
}
-var _64c=document.cookie.substring(idx+name.length+1);
-var end=_64c.indexOf(";");
+var _3a1=document.cookie.substring(idx+name.length+1);
+var end=_3a1.indexOf(";");
if(end==-1){
-end=_64c.length;
+end=_3a1.length;
}
-_64c=_64c.substring(0,end);
-_64c=unescape(_64c);
-return _64c;
+_3a1=_3a1.substring(0,end);
+_3a1=unescape(_3a1);
+return _3a1;
};
dojo.io.cookie.get=dojo.io.cookie.getCookie;
dojo.io.cookie.deleteCookie=function(name){
dojo.io.cookie.setCookie(name,"-",0);
};
-dojo.io.cookie.setObjectCookie=function(name,obj,days,path,_653,_654,_655){
+dojo.io.cookie.setObjectCookie=function(name,obj,days,path,_3a8,_3a9,_3aa){
if(arguments.length==5){
-_655=_653;
-_653=null;
-_654=null;
+_3aa=_3a8;
+_3a8=null;
+_3a9=null;
}
-var _656=[],_657,_658="";
-if(!_655){
-_657=dojo.io.cookie.getObjectCookie(name);
+var _3ab=[],_3ac,_3ad="";
+if(!_3aa){
+_3ac=dojo.io.cookie.getObjectCookie(name);
}
if(days>=0){
-if(!_657){
-_657={};
+if(!_3ac){
+_3ac={};
}
for(var prop in obj){
-if(prop==null){
-delete _657[prop];
+if(obj[prop]==null){
+delete _3ac[prop];
}else{
-if(typeof obj[prop]=="string"||typeof obj[prop]=="number"){
-_657[prop]=obj[prop];
+if((typeof obj[prop]=="string")||(typeof obj[prop]=="number")){
+_3ac[prop]=obj[prop];
}
}
}
prop=null;
-for(var prop in _657){
-_656.push(escape(prop)+"="+escape(_657[prop]));
+for(var prop in _3ac){
+_3ab.push(escape(prop)+"="+escape(_3ac[prop]));
}
-_658=_656.join("&");
+_3ad=_3ab.join("&");
}
-dojo.io.cookie.setCookie(name,_658,days,path,_653,_654);
+dojo.io.cookie.setCookie(name,_3ad,days,path,_3a8,_3a9);
};
dojo.io.cookie.getObjectCookie=function(name){
-var _65b=null,_65c=dojo.io.cookie.getCookie(name);
-if(_65c){
-_65b={};
-var _65d=_65c.split("&");
-for(var i=0;i<_65d.length;i++){
-var pair=_65d[i].split("=");
-var _660=pair[1];
-if(isNaN(_660)){
-_660=unescape(pair[1]);
+var _3b0=null,_3b1=dojo.io.cookie.getCookie(name);
+if(_3b1){
+_3b0={};
+var _3b2=_3b1.split("&");
+for(var i=0;i<_3b2.length;i++){
+var pair=_3b2[i].split("=");
+var _3b5=pair[1];
+if(isNaN(_3b5)){
+_3b5=unescape(pair[1]);
}
-_65b[unescape(pair[0])]=_660;
+_3b0[unescape(pair[0])]=_3b5;
}
}
-return _65b;
+return _3b0;
};
dojo.io.cookie.isSupported=function(){
if(typeof navigator.cookieEnabled!="boolean"){
dojo.io.cookie.setCookie("__TestingYourBrowserForCookieSupport__","CookiesAllowed",90,null);
-var _661=dojo.io.cookie.getCookie("__TestingYourBrowserForCookieSupport__");
-navigator.cookieEnabled=(_661=="CookiesAllowed");
+var _3b6=dojo.io.cookie.getCookie("__TestingYourBrowserForCookieSupport__");
+navigator.cookieEnabled=(_3b6=="CookiesAllowed");
if(navigator.cookieEnabled){
this.deleteCookie("__TestingYourBrowserForCookieSupport__");
}
@@ -6793,304 +4221,18 @@ return navigator.cookieEnabled;
if(!dojo.io.cookies){
dojo.io.cookies=dojo.io.cookie;
}
+dojo.kwCompoundRequire({common:["dojo.io.common"],rhino:["dojo.io.RhinoIO"],browser:["dojo.io.BrowserIO","dojo.io.cookie"],dashboard:["dojo.io.BrowserIO","dojo.io.cookie"]});
dojo.provide("dojo.io.*");
-dojo.provide("dojo.uri.*");
-dojo.provide("dojo.io.IframeIO");
-dojo.io.createIFrame=function(_662,_663,uri){
-if(window[_662]){
-return window[_662];
-}
-if(window.frames[_662]){
-return window.frames[_662];
-}
-var r=dojo.render.html;
-var _666=null;
-var turi=uri||dojo.uri.dojoUri("iframe_history.html?noInit=true");
-var _668=((r.ie)&&(dojo.render.os.win))?"");
+ document.write("");
}
}catch(e){/* squelch */}
@@ -9085,37 +5748,9 @@ if(dojo.render.html.opera){
dojo.debug("Opera is not supported with dojo.undo.browser, so back/forward detection will not work.");
}
-/* NOTES:
- * Safari 1.2:
- * back button "works" fine, however it's not possible to actually
- * DETECT that you've moved backwards by inspecting window.location.
- * Unless there is some other means of locating.
- * FIXME: perhaps we can poll on history.length?
- * Safari 2.0.3+ (and probably 1.3.2+):
- * works fine, except when changeUrl is used. When changeUrl is used,
- * Safari jumps all the way back to whatever page was shown before
- * the page that uses dojo.undo.browser support.
- * IE 5.5 SP2:
- * back button behavior is macro. It does not move back to the
- * previous hash value, but to the last full page load. This suggests
- * that the iframe is the correct way to capture the back button in
- * these cases.
- * Don't test this page using local disk for MSIE. MSIE will not create
- * a history list for iframe_history.html if served from a file: URL.
- * The XML served back from the XHR tests will also not be properly
- * created if served from local disk. Serve the test pages from a web
- * server to test in that browser.
- * IE 6.0:
- * same behavior as IE 5.5 SP2
- * Firefox 1.0+:
- * the back button will return us to the previous hash on the same
- * page, thereby not requiring an iframe hack, although we do then
- * need to run a timer to detect inter-page movement.
- */
-
dojo.undo.browser = {
- initialHref: window.location.href,
- initialHash: window.location.hash,
+ initialHref: (!dj_undef("window")) ? window.location.href : "",
+ initialHash: (!dj_undef("window")) ? window.location.hash : "",
moveForward: false,
historyStack: [],
@@ -9125,40 +5760,71 @@ dojo.undo.browser = {
locationTimer: null,
/**
- * setInitialState sets the state object and back callback for the very first page that is loaded.
- * It is recommended that you call this method as part of an event listener that is registered via
- * dojo.addOnLoad().
+ *
*/
- setInitialState: function(args){
+ setInitialState: function(/*Object*/args){
+ //summary: Sets the state object and back callback for the very first page that is loaded.
+ //description: It is recommended that you call this method as part of an event listener that is registered via
+ //dojo.addOnLoad().
+ //args: Object
+ // See the addToHistory() function for the list of valid args properties.
this.initialState = this._createState(this.initialHref, args, this.initialHash);
},
//FIXME: Would like to support arbitrary back/forward jumps. Have to rework iframeLoaded among other things.
//FIXME: is there a slight race condition in moz using change URL with the timer check and when
// the hash gets set? I think I have seen a back/forward call in quick succession, but not consistent.
- /**
- * addToHistory takes one argument, and it is an object that defines the following functions:
- * - To support getting back button notifications, the object argument should implement a
- * function called either "back", "backButton", or "handle". The string "back" will be
- * passed as the first and only argument to this callback.
- * - To support getting forward button notifications, the object argument should implement a
- * function called either "forward", "forwardButton", or "handle". The string "forward" will be
- * passed as the first and only argument to this callback.
- * - If you want the browser location string to change, define "changeUrl" on the object. If the
- * value of "changeUrl" is true, then a unique number will be appended to the URL as a fragment
- * identifier (http://some.domain.com/path#uniquenumber). If it is any other value that does
- * not evaluate to false, that value will be used as the fragment identifier. For example,
- * if changeUrl: 'page1', then the URL will look like: http://some.domain.com/path#page1
- *
- * Full example:
- *
- * dojo.undo.browser.addToHistory({
- * back: function() { alert('back pressed'); },
- * forward: function() { alert('forward pressed'); },
- * changeUrl: true
- * });
- */
addToHistory: function(args){
+ //summary: adds a state object (args) to the history list. You must set
+ //djConfig.preventBackButtonFix = false to use dojo.undo.browser.
+
+ //args: Object
+ // args can have the following properties:
+ // To support getting back button notifications, the object argument should implement a
+ // function called either "back", "backButton", or "handle". The string "back" will be
+ // passed as the first and only argument to this callback.
+ // - To support getting forward button notifications, the object argument should implement a
+ // function called either "forward", "forwardButton", or "handle". The string "forward" will be
+ // passed as the first and only argument to this callback.
+ // - If you want the browser location string to change, define "changeUrl" on the object. If the
+ // value of "changeUrl" is true, then a unique number will be appended to the URL as a fragment
+ // identifier (http://some.domain.com/path#uniquenumber). If it is any other value that does
+ // not evaluate to false, that value will be used as the fragment identifier. For example,
+ // if changeUrl: 'page1', then the URL will look like: http://some.domain.com/path#page1
+ // Full example:
+ // dojo.undo.browser.addToHistory({
+ // back: function() { alert('back pressed'); },
+ // forward: function() { alert('forward pressed'); },
+ // changeUrl: true
+ // });
+ //
+ // BROWSER NOTES:
+ // Safari 1.2:
+ // back button "works" fine, however it's not possible to actually
+ // DETECT that you've moved backwards by inspecting window.location.
+ // Unless there is some other means of locating.
+ // FIXME: perhaps we can poll on history.length?
+ // Safari 2.0.3+ (and probably 1.3.2+):
+ // works fine, except when changeUrl is used. When changeUrl is used,
+ // Safari jumps all the way back to whatever page was shown before
+ // the page that uses dojo.undo.browser support.
+ // IE 5.5 SP2:
+ // back button behavior is macro. It does not move back to the
+ // previous hash value, but to the last full page load. This suggests
+ // that the iframe is the correct way to capture the back button in
+ // these cases.
+ // Don't test this page using local disk for MSIE. MSIE will not create
+ // a history list for iframe_history.html if served from a file: URL.
+ // The XML served back from the XHR tests will also not be properly
+ // created if served from local disk. Serve the test pages from a web
+ // server to test in that browser.
+ // IE 6.0:
+ // same behavior as IE 5.5 SP2
+ // Firefox 1.0+:
+ // the back button will return us to the previous hash on the same
+ // page, thereby not requiring an iframe hack, although we do then
+ // need to run a timer to detect inter-page movement.
+
//If addToHistory is called, then that means we prune the
//forward stack -- the user went back, then wanted to
//start a new forward path.
@@ -9167,6 +5833,11 @@ dojo.undo.browser = {
var hash = null;
var url = null;
if(!this.historyIframe){
+ if(djConfig["useXDomain"] && !djConfig["dojoIframeHistoryUrl"]){
+ dojo.debug("dojo.undo.browser: When using cross-domain Dojo builds,"
+ + " please save iframe_history.html to your domain and set djConfig.dojoIframeHistoryUrl"
+ + " to the path on your domain to iframe_history.html");
+ }
this.historyIframe = window.frames["djhistory"];
}
if(!this.bookmarkAnchor){
@@ -9259,6 +5930,7 @@ dojo.undo.browser = {
},
checkLocation: function(){
+ //summary: private method. Do not call this directly.
if (!this.changingUrl){
var hsl = this.historyStack.length;
@@ -9290,6 +5962,7 @@ dojo.undo.browser = {
},
iframeLoaded: function(evt, ifrLoc){
+ //summary: private method. Do not call this directly.
if(!dojo.render.html.opera){
var query = this._getUrlQuery(ifrLoc.href);
if(query == null){
@@ -9318,6 +5991,8 @@ dojo.undo.browser = {
},
handleBackButton: function(){
+ //summary: private method. Do not call this directly.
+
//The "current" page is always at the top of the history stack.
var current = this.historyStack.pop();
if(!current){ return; }
@@ -9338,6 +6013,8 @@ dojo.undo.browser = {
},
handleForwardButton: function(){
+ //summary: private method. Do not call this directly.
+
var last = this.forwardStack.pop();
if(!last){ return; }
if(last.kwArgs["forward"]){
@@ -9351,31 +6028,45 @@ dojo.undo.browser = {
},
_createState: function(url, args, hash){
- return {"url": url, "kwArgs": args, "urlHash": hash};
+ //summary: private method. Do not call this directly.
+
+ return {"url": url, "kwArgs": args, "urlHash": hash}; //Object
},
_getUrlQuery: function(url){
+ //summary: private method. Do not call this directly.
var segments = url.split("?");
if (segments.length < 2){
- return null;
+ return null; //null
}
else{
- return segments[1];
+ return segments[1]; //String
}
},
_loadIframeHistory: function(){
- var url = dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new Date()).getTime();
+ //summary: private method. Do not call this directly.
+ var url = (djConfig["dojoIframeHistoryUrl"] || dojo.hostenv.getBaseScriptUri()+'iframe_history.html')
+ + "?" + (new Date()).getTime();
this.moveForward = true;
dojo.io.setIFrameSrc(this.historyIframe, url, false);
- return url;
+ return url; //String
}
}
dojo.provide("dojo.io.BrowserIO");
-dojo.io.checkChildrenForFile = function(node){
+
+
+
+
+
+
+if(!dj_undef("window")) {
+
+dojo.io.checkChildrenForFile = function(/*DOMNode*/node){
+ //summary: Checks any child nodes of node for an input type="file" element.
var hasFile = false;
var inputs = node.getElementsByTagName("input");
dojo.lang.forEach(inputs, function(input){
@@ -9384,14 +6075,20 @@ dojo.io.checkChildrenForFile = function(node){
hasFile = true;
}
});
- return hasFile;
+ return hasFile; //boolean
}
-dojo.io.formHasFile = function(formNode){
- return dojo.io.checkChildrenForFile(formNode);
+dojo.io.formHasFile = function(/*DOMNode*/formNode){
+ //summary: Just calls dojo.io.checkChildrenForFile().
+ return dojo.io.checkChildrenForFile(formNode); //boolean
}
-dojo.io.updateNode = function(node, urlOrArgs){
+dojo.io.updateNode = function(/*DOMNode*/node, /*String or Object*/urlOrArgs){
+ //summary: Updates a DOMnode with the result of a dojo.io.bind() call.
+ //node: DOMNode
+ //urlOrArgs: String or Object
+ // Either a String that has an URL, or an object containing dojo.io.bind()
+ // arguments.
node = dojo.byId(node);
var args = urlOrArgs;
if(dojo.lang.isString(urlOrArgs)){
@@ -9400,26 +6097,35 @@ dojo.io.updateNode = function(node, urlOrArgs){
args.mimetype = "text/html";
args.load = function(t, d, e){
while(node.firstChild){
- if(dojo["event"]){
- try{
- dojo.event.browser.clean(node.firstChild);
- }catch(e){}
- }
- node.removeChild(node.firstChild);
+ dojo.dom.destroyNode(node.firstChild);
}
node.innerHTML = d;
};
dojo.io.bind(args);
}
-dojo.io.formFilter = function(node) {
+dojo.io.formFilter = function(/*DOMNode*/node) {
+ //summary: Returns true if the node is an input element that is enabled, has
+ //a name, and whose type is one of the following values: ["file", "submit", "image", "reset", "button"]
var type = (node.type||"").toLowerCase();
return !node.disabled && node.name
- && !dojo.lang.inArray(["file", "submit", "image", "reset", "button"], type);
+ && !dojo.lang.inArray(["file", "submit", "image", "reset", "button"], type); //boolean
}
// TODO: Move to htmlUtils
-dojo.io.encodeForm = function(formNode, encoding, formFilter){
+dojo.io.encodeForm = function(/*DOMNode*/formNode, /*String?*/encoding, /*Function?*/formFilter){
+ //summary: Converts the names and values of form elements into an URL-encoded
+ //string (name=value&name=value...).
+ //formNode: DOMNode
+ //encoding: String?
+ // The encoding to use for the values. Specify a string that starts with
+ // "utf" (for instance, "utf8"), to use encodeURIComponent() as the encoding
+ // function. Otherwise, dojo.string.encodeAscii will be used.
+ //formFilter: Function?
+ // A function used to filter out form elements. The element node will be passed
+ // to the formFilter function, and a boolean result is expected (true indicating
+ // indicating that the element should have its name/value included in the output).
+ // If no formFilter is specified, then dojo.io.formFilter() will be used.
if((!formNode)||(!formNode.tagName)||(!formNode.tagName.toLowerCase() == "form")){
dojo.raise("Attempted to encode a non-form element.");
}
@@ -9460,10 +6166,16 @@ dojo.io.encodeForm = function(formNode, encoding, formFilter){
values.push(name + ".y=0");
}
}
- return values.join("&") + "&";
+ return values.join("&") + "&"; //String
}
-dojo.io.FormBind = function(args) {
+dojo.io.FormBind = function(/*DOMNode or Object*/args) {
+ //summary: constructor for a dojo.io.FormBind object. See the Dojo Book for
+ //some information on usage: http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book23
+ //args: DOMNode or Object
+ // args can either be the DOMNode for a form element, or an object containing
+ // dojo.io.bind() arguments, one of which should be formNode with the value of
+ // a form element DOMNode.
this.bindArgs = {};
if(args && args.formNode) {
@@ -9479,7 +6191,9 @@ dojo.lang.extend(dojo.io.FormBind, {
clickedButton: null,
- init: function(args) {
+ init: function(/*DOMNode or Object*/args) {
+ //summary: Internal function called by the dojo.io.FormBind() constructor
+ //do not call this method directly.
var form = dojo.byId(args.formNode);
if(!form || !form.tagName || form.tagName.toLowerCase() != "form") {
@@ -9511,11 +6225,15 @@ dojo.lang.extend(dojo.io.FormBind, {
}
},
- onSubmit: function(form) {
- return true;
+ onSubmit: function(/*DOMNode*/form) {
+ //summary: Function used to verify that the form is OK to submit.
+ //Override this function if you want specific form validation done.
+ return true; //boolean
},
- submit: function(e) {
+ submit: function(/*Event*/e) {
+ //summary: internal function that is connected as a listener to the
+ //form's onsubmit event.
e.preventDefault();
if(this.onSubmit(this.form)) {
dojo.io.bind(dojo.lang.mixin(this.bindArgs, {
@@ -9524,13 +6242,17 @@ dojo.lang.extend(dojo.io.FormBind, {
}
},
- click: function(e) {
+ click: function(/*Event*/e) {
+ //summary: internal method that is connected as a listener to the
+ //form's elements whose click event can submit a form.
var node = e.currentTarget;
if(node.disabled) { return; }
this.clickedButton = node;
},
- formFilter: function(node) {
+ formFilter: function(/*DOMNode*/node) {
+ //summary: internal function used to know which form element values to include
+ // in the dojo.io.bind() request.
var type = (node.type||"").toLowerCase();
var accept = false;
if(node.disabled || !node.name) {
@@ -9541,11 +6263,13 @@ dojo.lang.extend(dojo.io.FormBind, {
} else {
accept = !dojo.lang.inArray(["file", "submit", "reset", "button"], type);
}
- return accept;
+ return accept; //boolean
},
// in case you don't have dojo.event.* pulled in
- connect: function(srcObj, srcFcn, targetFcn) {
+ connect: function(/*Object*/srcObj, /*Function*/srcFcn, /*Function*/targetFcn) {
+ //summary: internal function used to connect event listeners to form elements
+ //that trigger events. Used in case dojo.event is not loaded.
if(dojo.evalObjPath("dojo.event.connect")) {
dojo.event.connect(srcObj, srcFcn, this, targetFcn);
} else {
@@ -9561,6 +6285,7 @@ dojo.lang.extend(dojo.io.FormBind, {
});
dojo.io.XMLHTTPTransport = new function(){
+ //summary: The object that implements the dojo.io.bind transport for XMLHttpRequest.
var _this = this;
var _cache = {}; // FIXME: make this public? do we even need to?
@@ -9656,6 +6381,8 @@ dojo.io.XMLHTTPTransport = new function(){
this.inFlightTimer = null;
this.startWatchingInFlight = function(){
+ //summary: internal method used to trigger a timer to watch all inflight
+ //XMLHttpRequests.
if(!this.inFlightTimer){
// setInterval broken in mozilla x86_64 in some circumstances, see
// https://bugzilla.mozilla.org/show_bug.cgi?id=344439
@@ -9665,6 +6392,8 @@ dojo.io.XMLHTTPTransport = new function(){
}
this.watchInFlight = function(){
+ //summary: internal method that checks each inflight XMLHttpRequest to see
+ //if it has completed or if the timeout situation applies.
var now = null;
// make sure sync calls stay thread safe, if this callback is called during a sync call
// and this results in another sync call before the first sync call ends the browser hangs
@@ -9715,21 +6444,66 @@ dojo.io.XMLHTTPTransport = new function(){
}
var hasXmlHttp = dojo.hostenv.getXmlhttpObject() ? true : false;
- this.canHandle = function(kwArgs){
- // canHandle just tells dojo.io.bind() if this is a good transport to
- // use for the particular type of request.
+ this.canHandle = function(/*dojo.io.Request*/kwArgs){
+ //summary: Tells dojo.io.bind() if this is a good transport to
+ //use for the particular type of request. This type of transport cannot
+ //handle forms that have an input type="file" element.
// FIXME: we need to determine when form values need to be
// multi-part mime encoded and avoid using this transport for those
// requests.
return hasXmlHttp
&& dojo.lang.inArray(["text/plain", "text/html", "application/xml", "text/xml", "text/javascript", "text/json", "application/json"], (kwArgs["mimetype"].toLowerCase()||""))
- && !( kwArgs["formNode"] && dojo.io.formHasFile(kwArgs["formNode"]) );
+ && !( kwArgs["formNode"] && dojo.io.formHasFile(kwArgs["formNode"]) ); //boolean
}
this.multipartBoundary = "45309FFF-BD65-4d50-99C9-36986896A96F"; // unique guid as a boundary value for multipart posts
- this.bind = function(kwArgs){
+ this.bind = function(/*dojo.io.Request*/kwArgs){
+ //summary: function that sends the request to the server.
+
+ //This function will attach an abort() function to the kwArgs dojo.io.Request object,
+ //so if you need to abort the request, you can call that method on the request object.
+ //The following are acceptable properties in kwArgs (in addition to the
+ //normal dojo.io.Request object properties).
+ //url: String: URL the server URL to use for the request.
+ //method: String: the HTTP method to use (GET, POST, etc...).
+ //mimetype: Specifies what format the result data should be given to the load/handle callback. Valid values are:
+ // text/javascript, text/json, application/json, application/xml, text/xml. Any other mimetype will give back a text
+ // string.
+ //transport: String: specify "XMLHTTPTransport" to force the use of this XMLHttpRequest transport.
+ //headers: Object: The object property names and values will be sent as HTTP request header
+ // names and values.
+ //sendTransport: boolean: If true, then dojo.transport=xmlhttp will be added to the request.
+ //encoding: String: The type of encoding to use when dealing with the content kwArgs property.
+ //content: Object: The content object is converted into a name=value&name=value string, by
+ // using dojo.io.argsFromMap(). The encoding kwArgs property is passed to dojo.io.argsFromMap()
+ // for use in encoding the names and values. The resulting string is added to the request.
+ //formNode: DOMNode: a form element node. This should not normally be used. Use new dojo.io.FormBind() instead.
+ // If formNode is used, then the names and values of the form elements will be converted
+ // to a name=value&name=value string and added to the request. The encoding kwArgs property is used
+ // to encode the names and values.
+ //postContent: String: Raw name=value&name=value string to be included as part of the request.
+ //back or backButton: Function: A function to be called if the back button is pressed. If this kwArgs property
+ // is used, then back button support via dojo.undo.browser will be used. See notes for dojo.undo.browser on usage.
+ // You need to set djConfig.preventBackButtonFix = false to enable back button support.
+ //changeUrl: boolean or String: Used as part of back button support. See notes for dojo.undo.browser on usage.
+ //user: String: The user name. Used in conjuction with password. Passed to XMLHttpRequest.open().
+ //password: String: The user's password. Used in conjuction with user. Passed to XMLHttpRequest.open().
+ //file: Object or Array of Objects: an object simulating a file to be uploaded. file objects should have the following properties:
+ // name or fileName: the name of the file
+ // contentType: the MIME content type for the file.
+ // content: the actual content of the file.
+ //multipart: boolean: indicates whether this should be a multipart mime request. If kwArgs.file exists, then this
+ // property is set to true automatically.
+ //sync: boolean: if true, then a synchronous XMLHttpRequest call is done,
+ // if false (the default), then an asynchronous call is used.
+ //preventCache: boolean: If true, then a cache busting parameter is added to the request URL.
+ // default value is false.
+ //useCache: boolean: If true, then XMLHttpTransport will keep an internal cache of the server
+ // response and use that response if a similar request is done again.
+ // A similar request is one that has the same URL, query string and HTTP method value.
+ // default is false.
if(!kwArgs["url"]){
// are we performing a history action?
if( !kwArgs["formNode"]
@@ -9949,11 +6723,16 @@ dojo.io.XMLHTTPTransport = new function(){
dojo.io.transports.addTransport("XMLHTTPTransport");
}
+}
+
dojo.provide("dojo.io.cookie");
-dojo.io.cookie.setCookie = function(name, value, days, path, domain, secure) {
+dojo.io.cookie.setCookie = function(/*String*/name, /*String*/value,
+ /*Number?*/days, /*String?*/path,
+ /*String?*/domain, /*boolean?*/secure){
+ //summary: sets a cookie.
var expires = -1;
- if(typeof days == "number" && days >= 0) {
+ if((typeof days == "number")&&(days >= 0)){
var d = new Date();
d.setTime(d.getTime()+(days*24*60*60*1000));
expires = d.toGMTString();
@@ -9968,7 +6747,9 @@ dojo.io.cookie.setCookie = function(name, value, days, path, domain, secure) {
dojo.io.cookie.set = dojo.io.cookie.setCookie;
-dojo.io.cookie.getCookie = function(name) {
+dojo.io.cookie.getCookie = function(/*String*/name){
+ //summary: Gets a cookie with the given name.
+
// FIXME: Which cookie should we return?
// If there are cookies set for different sub domains in the current
// scope there could be more than one cookie with the same name.
@@ -9981,34 +6762,48 @@ dojo.io.cookie.getCookie = function(name) {
if(end == -1) { end = value.length; }
value = value.substring(0, end);
value = unescape(value);
- return value;
+ return value; //String
}
dojo.io.cookie.get = dojo.io.cookie.getCookie;
-dojo.io.cookie.deleteCookie = function(name) {
+dojo.io.cookie.deleteCookie = function(/*String*/name){
+ //summary: Deletes a cookie with the given name.
dojo.io.cookie.setCookie(name, "-", 0);
}
-dojo.io.cookie.setObjectCookie = function(name, obj, days, path, domain, secure, clearCurrent) {
- if(arguments.length == 5) { // for backwards compat
+dojo.io.cookie.setObjectCookie = function( /*String*/name, /*Object*/obj,
+ /*Number?*/days, /*String?*/path,
+ /*String?*/domain, /*boolean?*/secure,
+ /*boolean?*/clearCurrent){
+ //summary: Takes an object, serializes it to a cookie value, and either
+ //sets a cookie with the serialized value.
+ //description: If clearCurrent is true, then any current cookie value
+ //for this object will be replaced with the the new serialized object value.
+ //If clearCurrent is false, then the existing cookie value will be modified
+ //with any changes from the new object value.
+ //Objects must be simple name/value pairs where the value is either a string
+ //or a number. Any other value will be ignored.
+ if(arguments.length == 5){ // for backwards compat
clearCurrent = domain;
domain = null;
secure = null;
}
var pairs = [], cookie, value = "";
- if(!clearCurrent) { cookie = dojo.io.cookie.getObjectCookie(name); }
- if(days >= 0) {
- if(!cookie) { cookie = {}; }
- for(var prop in obj) {
- if(prop == null) {
+ if(!clearCurrent){
+ cookie = dojo.io.cookie.getObjectCookie(name);
+ }
+ if(days >= 0){
+ if(!cookie){ cookie = {}; }
+ for(var prop in obj){
+ if(obj[prop] == null){
delete cookie[prop];
- } else if(typeof obj[prop] == "string" || typeof obj[prop] == "number") {
+ }else if((typeof obj[prop] == "string")||(typeof obj[prop] == "number")){
cookie[prop] = obj[prop];
}
}
prop = null;
- for(var prop in cookie) {
+ for(var prop in cookie){
pairs.push(escape(prop) + "=" + escape(cookie[prop]));
}
value = pairs.join("&");
@@ -10016,419 +6811,58 @@ dojo.io.cookie.setObjectCookie = function(name, obj, days, path, domain, secure,
dojo.io.cookie.setCookie(name, value, days, path, domain, secure);
}
-dojo.io.cookie.getObjectCookie = function(name) {
+dojo.io.cookie.getObjectCookie = function(/*String*/name){
+ //summary: Gets an object value for the given cookie name. The complement of
+ //dojo.io.cookie.setObjectCookie().
var values = null, cookie = dojo.io.cookie.getCookie(name);
- if(cookie) {
+ if(cookie){
values = {};
var pairs = cookie.split("&");
- for(var i = 0; i < pairs.length; i++) {
+ for(var i = 0; i < pairs.length; i++){
var pair = pairs[i].split("=");
var value = pair[1];
- if( isNaN(value) ) { value = unescape(pair[1]); }
+ if( isNaN(value) ){ value = unescape(pair[1]); }
values[ unescape(pair[0]) ] = value;
}
}
return values;
}
-dojo.io.cookie.isSupported = function() {
- if(typeof navigator.cookieEnabled != "boolean") {
+dojo.io.cookie.isSupported = function(){
+ //summary: Tests the browser to see if cookies are enabled.
+ if(typeof navigator.cookieEnabled != "boolean"){
dojo.io.cookie.setCookie("__TestingYourBrowserForCookieSupport__",
"CookiesAllowed", 90, null);
var cookieVal = dojo.io.cookie.getCookie("__TestingYourBrowserForCookieSupport__");
navigator.cookieEnabled = (cookieVal == "CookiesAllowed");
- if(navigator.cookieEnabled) {
+ if(navigator.cookieEnabled){
// FIXME: should we leave this around?
this.deleteCookie("__TestingYourBrowserForCookieSupport__");
}
}
- return navigator.cookieEnabled;
+ return navigator.cookieEnabled; //boolean
}
// need to leave this in for backwards-compat from 0.1 for when it gets pulled in by dojo.io.*
-if(!dojo.io.cookies) { dojo.io.cookies = dojo.io.cookie; }
+if(!dojo.io.cookies){ dojo.io.cookies = dojo.io.cookie; }
+dojo.kwCompoundRequire({
+ common: ["dojo.io.common"],
+ rhino: ["dojo.io.RhinoIO"],
+ browser: ["dojo.io.BrowserIO", "dojo.io.cookie"],
+ dashboard: ["dojo.io.BrowserIO", "dojo.io.cookie"]
+});
dojo.provide("dojo.io.*");
-dojo.provide("dojo.uri.*");
+dojo.provide("dojo.io");
-dojo.provide("dojo.io.IframeIO");
-// FIXME: is it possible to use the Google htmlfile hack to prevent the
-// background click with this transport?
-
-dojo.io.createIFrame = function(fname, onloadstr, uri){
- if(window[fname]){ return window[fname]; }
- if(window.frames[fname]){ return window.frames[fname]; }
- var r = dojo.render.html;
- var cframe = null;
- var turi = uri||dojo.uri.dojoUri("iframe_history.html?noInit=true");
- var ifrstr = ((r.ie)&&(dojo.render.os.win)) ? '"
- }else{
+ ifrDiv.innerHTML = "";
+ } else {
this.rcvNode = dojo.io.createIFrame(this.rcvNodeName, "", initUrl);
- // dojo.io.setIFrameSrc(this.rcvNode, initUrl);
- // we're still waiting on the iframe to call back up to use and
- // advertise that it's been initialized via tunnelInit
}
- }
-}
-
-cometd.mimeReplaceTransport = new function(){
+ };
+};
+cometd.mimeReplaceTransport = new function () {
this.connected = false;
this.connectionId = null;
this.xhr = null;
-
this.authToken = null;
this.lastTimestamp = null;
this.lastId = null;
this.backlog = [];
-
- this.check = function(types, version, xdomain){
- return ((!xdomain)&&
- (dojo.render.html.mozilla)&& // seems only Moz really supports this right now = (
- (dojo.lang.inArray(types, "mime-message-block")));
- }
-
- this.tunnelInit = function(){
- if(this.connected){ return; }
- // FIXME: open up the connection here
- this.openTunnelWith({
- message: dojo.json.serialize([
- {
- channel: "/meta/connect",
- clientId: cometd.clientId,
- connectionType: "mime-message-block"
- // FIXME: auth not passed here!
- // "authToken": this.authToken
- }
- ])
- });
+ this.check = function (types, version, xdomain) {
+ return ((!xdomain) && (dojo.render.html.mozilla) && (dojo.lang.inArray(types, "mime-message-block")));
+ };
+ this.tunnelInit = function () {
+ if (this.connected) {
+ return;
+ }
+ this.openTunnelWith({message:dojo.json.serialize([{channel:"/meta/connect", clientId:cometd.clientId, connectionType:"mime-message-block"}])});
this.connected = true;
- }
-
- this.tunnelCollapse = function(){
- if(this.connected){
- // try to restart the tunnel
+ };
+ this.tunnelCollapse = function () {
+ if (this.connected) {
this.connected = false;
- this.openTunnelWith({
- message: dojo.json.serialize([
- {
- channel: "/meta/reconnect",
- clientId: cometd.clientId,
- connectionId: this.connectionId,
- timestamp: this.lastTimestamp,
- id: this.lastId
- // FIXME: no authToken provision!
- }
- ])
- });
+ this.openTunnelWith({message:dojo.json.serialize([{channel:"/meta/reconnect", clientId:cometd.clientId, connectionId:this.connectionId, timestamp:this.lastTimestamp, id:this.lastId}])});
}
- }
-
+ };
this.deliver = cometd.iframeTransport.deliver;
- // the logic appears to be the same
-
- this.handleOnLoad = function(resp){
+ this.handleOnLoad = function (resp) {
cometd.deliver(dojo.json.evalJson(this.xhr.responseText));
- }
-
- this.openTunnelWith = function(content, url){
- // set up the XHR object and register the multipart callbacks
+ };
+ this.openTunnelWith = function (content, url) {
this.xhr = dojo.hostenv.getXmlhttpObject();
- this.xhr.multipart = true; // FIXME: do Opera and Safari support this flag?
- if(dojo.render.html.mozilla){
+ this.xhr.multipart = true;
+ if (dojo.render.html.mozilla) {
this.xhr.addEventListener("load", dojo.lang.hitch(this, "handleOnLoad"), false);
- }else if(dojo.render.html.safari){
- // Blah. WebKit doesn't actually populate responseText and/or responseXML. Useless.
- dojo.debug("Webkit is broken with multipart responses over XHR = (");
- this.xhr.onreadystatechange = dojo.lang.hitch(this, "handleOnLoad");
- }else{
- this.xhr.onload = dojo.lang.hitch(this, "handleOnLoad");
+ } else {
+ if (dojo.render.html.safari) {
+ dojo.debug("Webkit is broken with multipart responses over XHR = (");
+ this.xhr.onreadystatechange = dojo.lang.hitch(this, "handleOnLoad");
+ } else {
+ this.xhr.onload = dojo.lang.hitch(this, "handleOnLoad");
+ }
}
- this.xhr.open("POST", (url||cometd.url), true); // async post
+ this.xhr.open("POST", (url || cometd.url), true);
this.xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
dojo.debug(dojo.json.serialize(content));
this.xhr.send(dojo.io.argsFromMap(content, "utf8"));
- }
-
- this.processBacklog = function(){
- while(this.backlog.length > 0){
+ };
+ this.processBacklog = function () {
+ while (this.backlog.length > 0) {
this.sendMessage(this.backlog.shift(), true);
}
- }
-
- this.sendMessage = function(message, bypassBacklog){
- // FIXME: what about auth fields?
- if((bypassBacklog)||(this.connected)){
+ };
+ this.sendMessage = function (message, bypassBacklog) {
+ if ((bypassBacklog) || (this.connected)) {
message.connectionId = this.connectionId;
message.clientId = cometd.clientId;
- var bindArgs = {
- url: cometd.url||djConfig["cometdRoot"],
- method: "POST",
- mimetype: "text/json",
- content: { message: dojo.json.serialize([ message ]) }
- };
+ var bindArgs = {url:cometd.url || djConfig["cometdRoot"], method:"POST", mimetype:"text/json", content:{message:dojo.json.serialize([message])}};
return dojo.io.bind(bindArgs);
- }else{
+ } else {
this.backlog.push(message);
}
- }
-
- this.startup = function(handshakeData){
+ };
+ this.startup = function (handshakeData) {
dojo.debugShallow(handshakeData);
- if(this.connected){ return; }
+ if (this.connected) {
+ return;
+ }
this.tunnelInit();
- }
-}
-
-cometd.longPollTransport = new function(){
+ };
+};
+cometd.longPollTransport = new function () {
this.connected = false;
this.connectionId = null;
-
this.authToken = null;
this.lastTimestamp = null;
this.lastId = null;
this.backlog = [];
-
- this.check = function(types, version, xdomain){
- return ((!xdomain)&&(dojo.lang.inArray(types, "long-polling")));
- }
-
- this.tunnelInit = function(){
- if(this.connected){ return; }
- // FIXME: open up the connection here
- this.openTunnelWith({
- message: dojo.json.serialize([
- {
- channel: "/meta/connect",
- clientId: cometd.clientId,
- connectionType: "long-polling"
- // FIXME: auth not passed here!
- // "authToken": this.authToken
- }
- ])
- });
+ this.check = function (types, version, xdomain) {
+ return ((!xdomain) && (dojo.lang.inArray(types, "long-polling")));
+ };
+ this.tunnelInit = function () {
+ if (this.connected) {
+ return;
+ }
+ this.openTunnelWith({message:dojo.json.serialize([{channel:"/meta/connect", clientId:cometd.clientId, connectionType:"long-polling"}])});
this.connected = true;
- }
-
- this.tunnelCollapse = function(){
- if(!this.connected){
- // try to restart the tunnel
+ };
+ this.tunnelCollapse = function () {
+ if (!this.connected) {
this.connected = false;
dojo.debug("clientId:", cometd.clientId);
- this.openTunnelWith({
- message: dojo.json.serialize([
- {
- channel: "/meta/reconnect",
- connectionType: "long-polling",
- clientId: cometd.clientId,
- connectionId: this.connectionId,
- timestamp: this.lastTimestamp,
- id: this.lastId
- // FIXME: no authToken provision!
- }
- ])
- });
+ this.openTunnelWith({message:dojo.json.serialize([{channel:"/meta/reconnect", connectionType:"long-polling", clientId:cometd.clientId, connectionId:this.connectionId, timestamp:this.lastTimestamp, id:this.lastId}])});
}
- }
-
+ };
this.deliver = cometd.iframeTransport.deliver;
- // the logic appears to be the same
-
- this.openTunnelWith = function(content, url){
- dojo.io.bind({
- url: (url||cometd.url),
- method: "post",
- content: content,
- mimetype: "text/json",
- load: dojo.lang.hitch(this, function(type, data, evt, args){
- // dojo.debug(evt.responseText);
- cometd.deliver(data);
- this.connected = false;
- this.tunnelCollapse();
- }),
- error: function(){ dojo.debug("tunnel opening failed"); }
- });
+ this.openTunnelWith = function (content, url) {
+ dojo.io.bind({url:(url || cometd.url), method:"post", content:content, mimetype:"text/json", load:dojo.lang.hitch(this, function (type, data, evt, args) {
+ cometd.deliver(data);
+ this.connected = false;
+ this.tunnelCollapse();
+ }), error:function () {
+ dojo.debug("tunnel opening failed");
+ }});
this.connected = true;
- }
-
- this.processBacklog = function(){
- while(this.backlog.length > 0){
+ };
+ this.processBacklog = function () {
+ while (this.backlog.length > 0) {
this.sendMessage(this.backlog.shift(), true);
}
- }
-
- this.sendMessage = function(message, bypassBacklog){
- // FIXME: what about auth fields?
- if((bypassBacklog)||(this.connected)){
+ };
+ this.sendMessage = function (message, bypassBacklog) {
+ if ((bypassBacklog) || (this.connected)) {
message.connectionId = this.connectionId;
message.clientId = cometd.clientId;
- var bindArgs = {
- url: cometd.url||djConfig["cometdRoot"],
- method: "post",
- mimetype: "text/json",
- content: { message: dojo.json.serialize([ message ]) }
- };
+ var bindArgs = {url:cometd.url || djConfig["cometdRoot"], method:"post", mimetype:"text/json", content:{message:dojo.json.serialize([message])}, load:dojo.lang.hitch(this, function (type, data, evt, args) {
+ cometd.deliver(data);
+ })};
return dojo.io.bind(bindArgs);
- }else{
+ } else {
this.backlog.push(message);
}
- }
-
- this.startup = function(handshakeData){
- if(this.connected){ return; }
+ };
+ this.startup = function (handshakeData) {
+ if (this.connected) {
+ return;
+ }
this.tunnelInit();
- }
-}
-
-cometd.callbackPollTransport = new function(){
+ };
+};
+cometd.callbackPollTransport = new function () {
this.connected = false;
this.connectionId = null;
-
this.authToken = null;
this.lastTimestamp = null;
this.lastId = null;
this.backlog = [];
-
- this.check = function(types, version, xdomain){
- // we handle x-domain!
+ this.check = function (types, version, xdomain) {
return dojo.lang.inArray(types, "callback-polling");
- }
-
- this.tunnelInit = function(){
- if(this.connected){ return; }
- // FIXME: open up the connection here
- this.openTunnelWith({
- message: dojo.json.serialize([
- {
- channel: "/meta/connect",
- clientId: cometd.clientId,
- connectionType: "callback-polling"
- // FIXME: auth not passed here!
- // "authToken": this.authToken
- }
- ])
- });
- this.connected = true;
- }
-
- this.tunnelCollapse = function(){
- if(!this.connected){
- // try to restart the tunnel
- this.connected = false;
- this.openTunnelWith({
- message: dojo.json.serialize([
- {
- channel: "/meta/reconnect",
- connectionType: "long-polling",
- clientId: cometd.clientId,
- connectionId: this.connectionId,
- timestamp: this.lastTimestamp,
- id: this.lastId
- // FIXME: no authToken provision!
- }
- ])
- });
+ };
+ this.tunnelInit = function () {
+ if (this.connected) {
+ return;
}
- }
-
- this.deliver = cometd.iframeTransport.deliver;
- // the logic appears to be the same
-
- this.openTunnelWith = function(content, url){
- // create a
@@ -195,6 +256,6 @@
This file is used for Dojo's XMLHttpRequest Iframe Proxy. This is the "client" file used
internally by dojo.io.XhrIframeProxy.
-
+
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/io/xip_server.html b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/io/xip_server.html
index 565c7cc2c..b69fb8e7d 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/io/xip_server.html
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/io/xip_server.html
@@ -42,16 +42,11 @@
- data: The URL-encoded data for the request. For a GET request, this would
be the querystring parameters. For a POST request, it wll be the
body data.
+
+ See xip_client.html for more info on the xip fragment identifier protocol.
-->
@@ -333,5 +373,6 @@
This file is used for Dojo's XMLHttpRequest Iframe Proxy. This is the the file
that should go on the server that will actually be doing the XHR request.
+