Comparing version 1.10.8 to 1.10.9
@@ -1,2 +0,2 @@ | ||
define(["../has", "require"], function(has, require){ | ||
define(["../global", "../has", "require"], function(global, has, require){ | ||
// module: | ||
@@ -177,3 +177,2 @@ // dojo/_base/config | ||
}; | ||
var global = (function () { return this; })(); | ||
result = has("dojo-loader") ? | ||
@@ -180,0 +179,0 @@ // must be a built version of the dojo loader; all config stuffed in require.rawConfig |
@@ -1,2 +0,2 @@ | ||
define(["../has", "./config", "require", "module"], function(has, config, require, module){ | ||
define(["../global", "../has", "./config", "require", "module"], function(global, has, config, require, module){ | ||
// module: | ||
@@ -13,3 +13,2 @@ // dojo/_base/kernel | ||
// FIXME: in 2.0 remove dijit, dojox being created by dojo | ||
global = (function () { return this; })(), | ||
dijit = {}, | ||
@@ -84,3 +83,3 @@ dojox = {}, | ||
var rev = "$Rev: f8ee3a9 $".match(/[0-9a-f]{7,}/); | ||
var rev = "$Rev: bce476b $".match(/[0-9a-f]{7,}/); | ||
dojo.version = { | ||
@@ -98,3 +97,3 @@ // summary: | ||
major: 1, minor: 10, patch: 8, flag: "", | ||
major: 1, minor: 10, patch: 9, flag: "", | ||
revision: rev ? rev[0] : NaN, | ||
@@ -101,0 +100,0 @@ toString: function(){ |
@@ -281,3 +281,3 @@ define([ | ||
// mouse event | ||
if(!this.skipForm || !dnd.isFormElement(e)){ | ||
if(!this.withHandles && (!this.skipForm || !dnd.isFormElement(e))){ | ||
e.stopPropagation(); | ||
@@ -284,0 +284,0 @@ e.preventDefault(); |
@@ -1,4 +0,3 @@ | ||
define(['./has'], function(has){ | ||
var global = (function () { return this; })(), | ||
doc = document, | ||
define(['./global', './has'], function(global, has){ | ||
var doc = document, | ||
readyStates = { 'loaded': 1, 'complete': 1 }, | ||
@@ -5,0 +4,0 @@ fixReadyState = typeof doc.readyState != "string", |
@@ -1,2 +0,2 @@ | ||
define(["require", "module"], function(require, module){ | ||
define(["./global", "require", "module"], function(global, require, module){ | ||
// module: | ||
@@ -29,3 +29,2 @@ // dojo/has | ||
// has API variables | ||
global = (function () { return this; })(), | ||
doc = isBrowser && document, | ||
@@ -32,0 +31,0 @@ element = doc && doc.createElement("DiV"), |
{ | ||
"name": "dojo", | ||
"version":"1.10.8", | ||
"version":"1.10.9", | ||
"directories": { | ||
@@ -5,0 +5,0 @@ "lib": "." |
@@ -29,8 +29,17 @@ define([ | ||
function attach(id, url, frameDoc){ | ||
function attach(id, url, frameDoc, errorHandler){ | ||
var doc = (frameDoc || win.doc), | ||
element = doc.createElement('script'); | ||
if (errorHandler) { | ||
on.once(element, 'error', errorHandler); | ||
} | ||
element.type = 'text/javascript'; | ||
element.src = url; | ||
try { | ||
element.src = url; | ||
} catch(err) { | ||
errorHandler && errorHandler(element); | ||
} | ||
element.id = id; | ||
@@ -154,3 +163,11 @@ element.async = true; | ||
if(!options.canAttach || options.canAttach(dfd)){ | ||
var node = script._attach(dfd.id, url, options.frameDoc); | ||
var node = script._attach(dfd.id, url, options.frameDoc, function (error) { | ||
if (!(error instanceof Error)) { | ||
var newError = new Error('Error loading ' + (error.target ? error.target.src : 'script')); | ||
newError.source = error; | ||
error = newError; | ||
} | ||
dfd.reject(error); | ||
script._remove(dfd.id, options.frameDoc, true); | ||
}); | ||
@@ -157,0 +174,0 @@ if(!options.jsonp && !options.checkString){ |
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
40
3049713
634
104970