mirror of
https://git.tt-rss.org/git/tt-rss.git
synced 2025-12-14 03:25:56 +00:00
upgrade Dojo to 1.6.1
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
|
||||
Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved.
|
||||
Available via Academic Free License >= 2.1 OR the modified BSD license.
|
||||
see: http://dojotoolkit.org/license for details
|
||||
*/
|
||||
@@ -9,6 +9,8 @@ if(!dojo._hasResource["dojo.io.script"]){ //_hasResource checks added by build.
|
||||
dojo._hasResource["dojo.io.script"] = true;
|
||||
dojo.provide("dojo.io.script");
|
||||
|
||||
dojo.getObject("io", true, dojo);
|
||||
|
||||
/*=====
|
||||
dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
|
||||
constructor: function(){
|
||||
@@ -24,13 +26,13 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
|
||||
// legacy code. See notes for jsonp property.
|
||||
// jsonp: String
|
||||
// The URL parameter name that indicates the JSONP callback string.
|
||||
// For instance, when using Yahoo JSONP calls it is normally,
|
||||
// jsonp: "callback". For AOL JSONP calls it is normally
|
||||
// For instance, when using Yahoo JSONP calls it is normally,
|
||||
// jsonp: "callback". For AOL JSONP calls it is normally
|
||||
// jsonp: "c".
|
||||
// checkString: String
|
||||
// A string of JavaScript that when evaluated like so:
|
||||
// A string of JavaScript that when evaluated like so:
|
||||
// "typeof(" + checkString + ") != 'undefined'"
|
||||
// being true means that the script fetched has been loaded.
|
||||
// being true means that the script fetched has been loaded.
|
||||
// Do not use this if doing a JSONP type of call (use callbackParamName instead).
|
||||
// frameDoc: Document
|
||||
// The Document object for a child iframe. If this is passed in, the script
|
||||
@@ -43,7 +45,7 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
|
||||
}
|
||||
});
|
||||
=====*/
|
||||
;(function(){
|
||||
(function(){
|
||||
var loadEvent = dojo.isIE ? "onreadystatechange" : "load",
|
||||
readyRegExp = /complete|loaded/;
|
||||
|
||||
@@ -105,7 +107,7 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
|
||||
},
|
||||
|
||||
_makeScriptDeferred: function(/*Object*/args){
|
||||
//summary:
|
||||
//summary:
|
||||
// sets up a Deferred object for an IO request.
|
||||
var dfd = dojo._ioSetArgs(args, this._deferredCancel, this._deferredOk, this._deferredError);
|
||||
|
||||
@@ -152,7 +154,7 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
|
||||
//DO NOT use "this" and expect it to be dojo.io.script.
|
||||
var ioArgs = dfd.ioArgs;
|
||||
|
||||
//Add script to list of things that can be removed.
|
||||
//Add script to list of things that can be removed.
|
||||
if(ioArgs.canDelete){
|
||||
dojo.io.script._addDeadScript(ioArgs);
|
||||
}
|
||||
@@ -247,14 +249,14 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
|
||||
},
|
||||
|
||||
_jsonpCallback: function(/*JSON Object*/json){
|
||||
//summary:
|
||||
//summary:
|
||||
// generic handler for jsonp callback. A pointer to this function
|
||||
// is used for all jsonp callbacks. NOTE: the "this" in this
|
||||
// function will be the Deferred object that represents the script
|
||||
// request.
|
||||
this.ioArgs.json = json;
|
||||
}
|
||||
}
|
||||
};
|
||||
})();
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user