upgrade Dojo to 1.6.1

[tt-rss.git] / lib / dojo / _base / _loader / bootstrap.js

diff --git a/lib/dojo/_base/_loader/bootstrap.js b/lib/dojo/_base/_loader/bootstrap.js
index 3ef3012a2a4eb8206a5d8b64f5ddbc371c99a461..a1f99276a881bd6ce8f77427b50d1ba80ff61baf 100644 (file)
--- a/lib/dojo/_base/_loader/bootstrap.js
+++ b/lib/dojo/_base/_loader/bootstrap.js
@@ -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
 */
@@ -76,7 +76,7 @@ djConfig = {
        //              of calling `dojo.registerModulePath("foo", "../../bar");`. Multiple
        //              modules may be configured via `djConfig.modulePaths`.
        modulePaths: {},
-       // afterOnLoad: Boolean 
+       // afterOnLoad: Boolean
        //              Indicates Dojo was added to the page after the page load. In this case
        //              Dojo will not wait for the page DOMContentLoad/load events and fire
        //              its dojo.addOnLoad callbacks after making sure all outstanding
@@ -103,7 +103,7 @@ djConfig = {
        // dojoBlankHtmlUrl: String
        //              Used by some modules to configure an empty iframe. Used by dojo.io.iframe and
        //              dojo.back, and dijit popup support in IE where an iframe is needed to make sure native
-       //              controls do not bleed through the popups. Normally this configuration variable 
+       //              controls do not bleed through the popups. Normally this configuration variable
        //              does not need to be set, except when using cross-domain/CDN Dojo builds.
        //              Save dojo/resources/blank.html to your domain and set `djConfig.dojoBlankHtmlUrl`
        //              to the path on your domain your copy of blank.html.
@@ -149,7 +149,7 @@ djConfig = {
                        "groupEnd", "info", "profile", "profileEnd", "time", "timeEnd",
                        "trace", "warn", "log"
                ];
-               var i=0, tn;
+               var i = 0, tn;
                while((tn=cn[i++])){
                        if(!console[tn]){
                                (function(){
@@ -209,9 +209,13 @@ dojo.global = {
                debugAtAllCosts: false
        };
 
-       if(typeof djConfig != "undefined"){
-               for(var opt in djConfig){
-                       d.config[opt] = djConfig[opt];
+       // FIXME: 2.0, drop djConfig support. Use dojoConfig exclusively for global config.
+       var cfg = typeof djConfig != "undefined" ? djConfig :
+               typeof dojoConfig != "undefined" ? dojoConfig : null;
+               
+       if(cfg){
+               for(var c in cfg){
+                       d.config[c] = cfg[c];
                }
        }
 
@@ -223,7 +227,7 @@ dojo.global = {
 =====*/
        dojo.locale = d.config.locale;
 
-       var rev = "$Rev: 22487 $".match(/\d+/);
+       var rev = "$Rev: 24595 $".match(/\d+/);
 
 /*=====
        dojo.version = function(){
@@ -247,7 +251,7 @@ dojo.global = {
        }
 =====*/
        dojo.version = {
-               major: 1, minor: 5, patch: 0, flag: "",
+               major: 1, minor: 6, patch: 1, flag: "",
                revision: rev ? +rev[0] : NaN,
                toString: function(){
                        with(d.version){
@@ -323,7 +327,7 @@ dojo.global = {
                //      |               constructor: function(properties){
                //      |                       // property configuration:
                //      |                       dojo.mixin(this, properties);
-               //      |       
+               //      |
                //      |                       console.log(this.quip);
                //      |                       //  ...
                //      |               },
@@ -344,7 +348,7 @@ dojo.global = {
                //      |                       name: "Carl Brutanananadilewski"
                //      |               }
                //      |       );
-               //      |       
+               //      |
                //      |       // will print "Carl Brutanananadilewski"
                //      |       console.log(flattened.name);
                //      |       // will print "true"
@@ -419,10 +423,7 @@ dojo.global = {
                //              determine if an object supports a given method
                //      description:
                //              useful for longer api chains where you have to test each object in
-               //              the chain. Useful only for object and method detection.
-               //              Not useful for testing generic properties on an object.
-               //              In particular, dojo.exists("foo.bar") when foo.bar = ""
-               //              will return false. Use ("bar" in foo) to test for those cases.
+               //              the chain. Useful for object and method detection.
                //      name:
                //              Path to an object, in the form "A.B.C".
                //      obj:
@@ -441,7 +442,7 @@ dojo.global = {
                //      |       // search from a particular scope
                //      |       dojo.exists("bar", foo); // true
                //      |       dojo.exists("bar.baz", foo); // false
-               return !!d.getObject(name, false, obj); // Boolean
+               return d.getObject(name, false, obj) !== undefined; // Boolean
        }
 
        dojo["eval"] = function(/*String*/ scriptFragment){