Changeset 6392

Timestamp:

11/01/06 08:45:48 (21 months ago)

Author:

liucougar

Message:

more descriptive error message when event connection goes wrong
fix dojo.raise to handle exception correctly

Location:

trunk/src

Files:

• bootstrap1.js (modified) (16 diffs)
• debug.js (modified) (1 diff)
• event/common.js (modified) (1 diff)

trunk/src/bootstrap1.js

@@ -14 +14 @@
 // TODOC: HOW TO DOC THE BELOW?
 // @global: djConfig
-// summary:  
+// summary:
 //              Application code can set the global 'djConfig' prior to loading
-//              the library to override certain global settings for how dojo works.  
+//              the library to override certain global settings for how dojo works.
 // description:  The variables that can be set are as follows:
 //                      - isDebug: false
@@ -33 +33 @@
 // TODOC: IS THIS A COMPLETE LIST?
 // note:
-//              'djConfig' does not exist under 'dojo.*' so that it can be set before the 
-//              'dojo' variable exists.  
+//              'djConfig' does not exist under 'dojo.*' so that it can be set before the
+//              'dojo' variable exists.
 // note:
-//              Setting any of these variables *after* the library has loaded does nothing at all. 
+//              Setting any of these variables *after* the library has loaded does nothing at all.
 // TODOC: is this still true?  Release notes for 0.3 indicated they could be set after load.
 //
@@ -43 +43 @@
 //TODOC:  HOW TO DOC THIS?
 // @global: dj_global
-// summary: 
+// summary:
 //              an alias for the top-level global object in the host environment
 //              (e.g., the window object in a browser).
-// description:  
+// description:
 //              Refer to 'dj_global' rather than referring to window to ensure your
 //              code runs correctly in contexts other than web browsers (eg: Rhino on a server).
@@ -53 +53 @@
 //TODOC:  HOW TO DOC THIS?
 // @global: dj_currentContext
-// summary: 
+// summary:
 //              Private global context object. Where 'dj_global' always refers to the boot-time
 //    global context, 'dj_currentContext' can be modified for temporary context shifting.
 //    dojo.global() returns dj_currentContext.
-// description:  
+// description:
 //              Refer to dojo.global() rather than referring to dj_global to ensure your
 //              code runs correctly in managed contexts.
@@ -75 +75 @@
 
 // make sure djConfig is defined
-if(dj_undef("djConfig", this)){ 
-        var djConfig = {}; 
+if(dj_undef("djConfig", this)){
+        var djConfig = {};
 }
 
 //TODOC:  HOW TO DOC THIS?
 // dojo is the root variable of (almost all) our public symbols -- make sure it is defined.
-if(dj_undef("dojo", this)){ 
-        var dojo = {}; 
+if(dj_undef("dojo", this)){
+        var dojo = {};
 }
 
@@ -89 +89 @@
         //              return the current global context object
         //              (e.g., the window object in a browser).
-        // description: 
+        // description:
         //              Refer to 'dojo.global()' rather than referring to window to ensure your
         //              code runs correctly in contexts other than web browsers (eg: Rhino on a server).
@@ -112 +112 @@
 dojo.evalProp = function(/*String*/ name, /*Object*/ object, /*Boolean?*/ create){
         // summary: Returns 'object[name]'.  If not defined and 'create' is true, will return a new Object.
-        // description: 
+        // description:
         //              Returns null if 'object[name]' is not defined and 'create' is not true.
-        //              Note: 'defined' and 'exists' are not the same concept.  
+        //              Note: 'defined' and 'exists' are not the same concept.
         if((!object)||(!name)) return undefined; // undefined
         if(!dj_undef(name, object)) return object[name]; // mixed
@@ -122 +122 @@
 dojo.parseObjPath = function(/*String*/ path, /*Object?*/ context, /*Boolean?*/ create){
         // summary: Parse string path to an object, and return corresponding object reference and property name.
-        // description: 
-        //              Returns an object with two properties, 'obj' and 'prop'.  
+        // description:
+        //              Returns an object with two properties, 'obj' and 'prop'.
         //              'obj[prop]' is the reference indicated by 'path'.
         // path: Path to an object, in the form "A.B.C".
@@ -141 +141 @@
         // path: Path to an object, in the form "A.B.C".
         // create: If true, Objects will be created at any point along the 'path' that is undefined.
-        if(typeof path != "string"){ 
-                return dojo.global(); 
+        if(typeof path != "string"){
+                return dojo.global();
         }
         // fast path for no periods
@@ -178 +178 @@
         if(exception){
                 message = message + ": "+dojo.errorToString(exception);
+        }else{
+                message = dojo.errorToString(message);
         }
 
@@ -192 +194 @@
 dojo.profile = { start: function(){}, end: function(){}, stop: function(){}, dump: function(){} };
 
-function dj_eval(/*String*/ scriptFragment){ 
+function dj_eval(/*String*/ scriptFragment){
         // summary: Perform an evaluation in the global scope.  Use this rather than calling 'eval()' directly.
         // description: Placed in a separate function to minimize size of trapped evaluation context.
@@ -265 +267 @@
 dojo.hostenv = (function(){
         // TODOC:  HOW TO DOC THIS?
-        // summary: Provides encapsulation of behavior that changes across different 'host environments' 
+        // summary: Provides encapsulation of behavior that changes across different 'host environments'
         //                      (different browsers, server via Rhino, etc).
         // description: None of these methods should ever be called directly by library users.
         //                              Use public methods such as 'loadModule' instead.
-        
+
         // default configuration options
         var config = {
@@ -299 +301 @@
 
 
-                getName: function(){ 
+                getName: function(){
                         // sumary: Return the name of the host environment.
                         return this.name_;      // String
@@ -305 +307 @@
 
 
-                getVersion: function(){ 
+                getVersion: function(){
                         // summary: Return the version of the hostenv.
                         return this.version_; // String
@@ -312 +314 @@
                 getText: function(/*String*/ uri){
                         // summary:     Read the plain/text contents at the specified 'uri'.
-                        // description: 
-                        //                      If 'getText()' is not implemented, then it is necessary to override 
+                        // description:
+                        //                      If 'getText()' is not implemented, then it is necessary to override
                         //                      'loadUri()' with an implementation that doesn't rely on it.
 
@@ -327 +329 @@
         //              MAYBE:  Return the base uri to scripts in the dojo library.      ???
         // return: Empty string or a path ending in '/'.
-        if(djConfig.baseScriptUri.length){ 
+        if(djConfig.baseScriptUri.length){
                 return djConfig.baseScriptUri;
         }

trunk/src/debug.js

@@ -3 +3 @@
         //              Produce a line of debug output. Does nothing unless
         //              djConfig.isDebug is true. Accepts any nubmer of args, joined with
-        //              '' to produce a single line of debugging output.  Caller should not
+        //              ' ' to produce a single line of debugging output.  Caller should not
         //              supply a trailing "\n".
         if (!djConfig.isDebug) { return; }

trunk/src/event/common.js

@@ -713 +713 @@
                                 result = this.object[this.methodname].apply(this.object, args);
                         }
-                }catch(e){ if(!this.squelch){ dojo.raise(e); } }
+                }catch(e){ 
+                        if(!this.squelch){ 
+                                dojo.debug(e,"when calling",this.methodname,"on",this.object,"with arguments",args);
+                                dojo.raise(e);
+                        } 
+                }
 
                 if((this["after"])&&(this.after.length>0)){