From 9076a957cceac3f1411f9ec1abb4eb96822810b5 Mon Sep 17 00:00:00 2001 From: Akira Sudoh Date: Tue, 31 Mar 2015 23:08:48 +0900 Subject: [PATCH] Make sure lang.getObject() returns 3rd arg if 1st arg is empty, fixes #18542. --- _base/lang.js | 2 +- tests/unit/_base/lang.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_base/lang.js b/_base/lang.js index e544eabc4c..579450b81a 100644 --- a/_base/lang.js +++ b/_base/lang.js @@ -216,7 +216,7 @@ define(["./kernel", "../has", "../sniff"], function(dojo, has){ // context: Object? // Optional. Object to use as root of path. Defaults to // 'dojo.global'. Null may be passed. - return getProp(name ? name.split(".") : [], create, context); // Object + return !name ? context : getProp(name.split("."), create, context); // Object }, exists: function(name, obj){ diff --git a/tests/unit/_base/lang.js b/tests/unit/_base/lang.js index 01da2aae21..bc175ffd5e 100644 --- a/tests/unit/_base/lang.js +++ b/tests/unit/_base/lang.js @@ -51,7 +51,8 @@ define([ // empty path should return the same object assert.strictEqual(lang.getObject('', false, test), test); - assert.strictEqual(lang.getObject(''), kernel.global); + assert.strictEqual(lang.getObject('', false, null), null); + assert.strictEqual(lang.getObject(''), undefined); }, '.setObject': function () {