Comparing version 1.13.4 to 1.13.5
@@ -82,3 +82,3 @@ define(["../global", "../has", "./config", "require", "module"], function(global, has, config, require, module){ | ||
var rev = "$Rev: 44647722 $".match(/[0-9a-f]{7,}/); | ||
var rev = "$Rev: 70003359 $".match(/[0-9a-f]{7,}/); | ||
dojo.version = { | ||
@@ -96,3 +96,3 @@ // summary: | ||
major: 1, minor: 13, patch: 4, flag: "", | ||
major: 1, minor: 13, patch: 5, flag: "", | ||
revision: rev ? rev[0] : NaN, | ||
@@ -99,0 +99,0 @@ toString: function(){ |
@@ -414,3 +414,3 @@ define(["./sniff", "./_base/window","./dom", "./dom-style"], | ||
doc = doc || win.doc; | ||
var node = win.doc.parentWindow || win.doc.defaultView; // use UI window, not dojo.global window. TODO: use dojo/window::get() except for circular dependency problem | ||
var node = doc.parentWindow || doc.defaultView; // use UI window, not dojo.global window. TODO: use dojo/window::get() except for circular dependency problem | ||
return "pageXOffset" in node ? {x: node.pageXOffset, y: node.pageYOffset } : | ||
@@ -417,0 +417,0 @@ (node = has("quirks") ? win.body(doc) : doc.documentElement) && |
{ | ||
"name": "dojo", | ||
"version": "1.13.4", | ||
"version": "1.13.5", | ||
"directories": { | ||
@@ -14,3 +14,3 @@ "lib": "." | ||
"sinon": "1.12.2", | ||
"dojo": "1.13.4" | ||
"dojo": "1.13.5" | ||
}, | ||
@@ -17,0 +17,0 @@ "main": "main", |
@@ -21,8 +21,9 @@ define([ | ||
function isFormElement(value) { | ||
if(typeof HTMLFormElement !== 'undefined') { //all other | ||
return value instanceof HTMLFormElement; | ||
} else { //IE<=7 | ||
value.tagName === "FORM" | ||
function isElement(value) { | ||
if(typeof Element !== 'undefined') { //all other | ||
return value instanceof Element; | ||
} | ||
//IE<=7 | ||
return value.nodeType === 1; | ||
} | ||
@@ -38,3 +39,3 @@ | ||
!isFormData(value) && | ||
!isFormElement(value) && | ||
!isElement(value) && | ||
!isBlob(value) && | ||
@@ -41,0 +42,0 @@ !isArrayBuffer(value) |
@@ -101,4 +101,70 @@ define([ | ||
} | ||
}, | ||
'deepCopy with Element, given Element is defined': function(){ | ||
if (typeof Element !== 'undefined') { | ||
var element = document.createElement('span'); | ||
var object1 = { | ||
apple: 0, | ||
banana: { | ||
weight: 52, | ||
price: 100, | ||
code: "B12345", | ||
purchased: new Date(2016, 0, 1) | ||
}, | ||
cherry: 97 | ||
}; | ||
var object2 = { | ||
banana: { | ||
price: 200, | ||
code: "B98765", | ||
purchased: new Date(2017, 0, 1) | ||
}, | ||
element: element, | ||
durian: 100 | ||
}; | ||
util.deepCopy(object1, object2); | ||
assert.strictEqual(object1.banana.weight, 52); | ||
assert.strictEqual(object1.banana.price, 200); | ||
assert.strictEqual(object1.banana.code, "B98765"); | ||
assert.strictEqual(object1.element, element); | ||
assert.equal(object1.banana.purchased.getTime(), new Date(2017, 0, 1).getTime()); | ||
} else { | ||
this.skip('Do not run test if Element not available.'); | ||
} | ||
}, | ||
'deepCopy with Element, given Element is not defined': function(){ | ||
if (typeof Element !== 'undefined') { | ||
this.skip('Do not run test if Element is available.'); | ||
} | ||
var element = {nodeType: 1, value: 'Orange'}; | ||
var object1 = { | ||
apple: 0, | ||
banana: { | ||
weight: 52, | ||
price: 100, | ||
code: "B12345", | ||
purchased: new Date(2016, 0, 1) | ||
}, | ||
cherry: 97 | ||
}; | ||
var object2 = { | ||
banana: { | ||
price: 200, | ||
code: "B98765", | ||
purchased: new Date(2017, 0, 1) | ||
}, | ||
element: element, | ||
durian: 100 | ||
}; | ||
util.deepCopy(object1, object2); | ||
assert.strictEqual(object1.banana.weight, 52); | ||
assert.strictEqual(object1.banana.price, 200); | ||
assert.strictEqual(object1.banana.code, "B98765"); | ||
assert.strictEqual(object1.element, element); | ||
assert.equal(object1.banana.purchased.getTime(), new Date(2017, 0, 1).getTime()); | ||
} | ||
}); | ||
}); |
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
4647469
138264