Changeset 4420

Timestamp:

06/17/06 01:39:37 (4 years ago)

Author:

alex

Message:

merging the final version of IBM's namespacing patch

Location:

trunk

Files:

• buildscripts/buildUtil.js (modified) (2 diffs)
• dojo.js (modified) (1 diff)
• src/loader.js (modified) (1 diff)
• src/namespace.js (added)
• src/namespaces (added)
• src/namespaces/dojo.js (added)
• src/uri/Uri.js (modified) (2 diffs)
• src/widget/DomWidget.js (modified) (1 diff)
• src/widget/Parse.js (modified) (9 diffs)
• src/widget/Widget.js (modified) (5 diffs)
• src/xml/Parse.js (modified) (5 diffs)
• tests/testns.tgz (added)
• tests/widget/test_Accordion.html (modified) (1 diff)

trunk/buildscripts/buildUtil.js

@@ -29 +29 @@
         load("../src/hostenv_rhino.js");
         load("../src/bootstrap2.js");
+
         // FIXME: is this really what we want to say?
         dojo.render.html.capable = true;
@@ -59 +60 @@
         dojo.hostenv.loadedUris.push("../src/bootstrap2.js");
         
+        dojo.hostenv.loadedUris.push("../src/namespace.js");
         
         if(dependencies["prefixes"]){

trunk/dojo.js

@@ -27 +27 @@
         
                 tmps.push("bootstrap2.js");
+                tmps.push("namespace.js");
         
                 if((this["djConfig"])&&(djConfig["baseScriptUri"])){

trunk/src/loader.js

@@ -272 +272 @@
         // things slightly diffrently
         var nsyms = modulename.split(".");
+        if(djConfig.autoLoadNamespace){ dojo.getNamespace(syms[0]); }
         if(last=="*"){
                 modulename = (nsyms.slice(0, -1)).join('.');

trunk/src/uri/Uri.js

@@ -3 +3 @@
 dojo.uri = new function() {
         this.joinPath = function() {
-                // DEPRECATED: use the dojo.uri.Uri object instead
+                dojo.deprecated("dojo.uri.joinPath", "use the dojo.uri.Uri object instead", "0.4");
                 var arr = [];
                 for(var i = 0; i < arguments.length; i++) { arr.push(arguments[i]); }
@@ -13 +13 @@
                 return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri(), uri);
         }
-                
+
+        //returns a URI of a widget in a namespace, for example dojo.uri.nsUri("dojo","Editor"), or dojo.uri.nsUri("customNS","someWidget")
+        this.nsUri = function(namespace,uri){
+                var ns = dojo.getNamespace(namespace);
+                if(!ns){
+                        return null;
+                }
+                var loc = ns.location;
+                if(loc.lastIndexOf("/") != loc.length - 1){
+                        loc += "/";
+                }
+                return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri()+loc,uri);
+        } 
+
         this.Uri = function (/*uri1, uri2, [...]*/) {
                 // An object representing a Uri.

trunk/src/widget/DomWidget.js

@@ -390 +390 @@
 
         getFragNodeRef: function(frag){
-                if( !frag || !frag["dojo:"+this.widgetType.toLowerCase()] ){
-                        dojo.raise("Error: no frag for widget type " + this.widgetType +
-                                ", id " + this.widgetId + " (maybe a widget has set it's type incorrectly)");
-                }
-                return (frag ? frag["dojo:"+this.widgetType.toLowerCase()]["nodeRef"] : null);
+                if(!frag || !frag[this.namespace+":"+this.widgetType.toLowerCase()]){
+                        dojo.raise("Error: no frag for widget type " + this.widgetType
+                                + " with namespace "+this.namespace + ", id " + this.widgetId
+                                + " (maybe a widget has set it's type incorrectly)");
+                }
+                return frag ? frag[this.namespace+":"+this.widgetType.toLowerCase()]["nodeRef"] : null;
         },
         

trunk/src/widget/Parse.js

@@ -9 +9 @@
         
         this.createComponents = function(frag, parentComp){
-                var comps = [ ];
+                var comps = [];
                 var built = false;
                 // if we have items to parse/create at this level, do it!
@@ -20 +20 @@
                                 for(var x=0; x<tna.length; x++){
                                         var ltn = (tna[x].replace(/^\s+|\s+$/g, "")).toLowerCase();
+
+                                //if we don't already have a tag registered for this widget, try to load it's
+                                //namespace, if it has one
+                                if(!djTags[ltn] && dojo.getNamespace && dojo.lang.isString(ltn)){
+                                    var pos = ltn.indexOf(":");
+                                    if(pos > 0){
+                                        var nsName = ltn.substring(0,pos);
+                                        var ns = dojo.getNamespace(nsName);
+                                        var tagName = ltn.substring(pos+1,ltn.length);
+                                        var domain = null;
+                                        var dojoDomain = frag[ltn]["dojoDomain"] || frag[ltn]["dojodomain"]; 
+                                        if(dojoDomain){
+                                                domain = dojoDomain[0].value;
+                                        }
+                                        if(ns){
+                                            ns.load(tagName, domain);
+                                        }
+                                    }
+                                }
+
                                         if(djTags[ltn]){
                                                 built = true;
@@ -26 +46 @@
                                                 comps.push(ret);
                                         }else{
-                                                if((dojo.lang.isString(ltn))&&(ltn.substr(0, 5)=="dojo:")){
-                                                        dojo.debug("no tag handler registed for type: ", ltn);
-                                                }
+                                                if(dojo.lang.isString(ltn) && (ltn.substr(0, 5)=="dojo:")){
+                                                        dojo.debug("no tag handler registered for type: ", ltn);
+                                    } //TODO: else? what if it's not dojo:? is it still an error?
                                         }
                                 }
@@ -34 +54 @@
                 }catch(e){
                         dojo.debug("dojo.widget.Parse: error:", e);
-                        // throw(e);
+                        // throw e;
                         // IE is such a bitch sometimes
                 }
@@ -199 +219 @@
                 properties is an object of name value pairs
         */
-        this.createComponentFromScript = function(nodeRef, componentName, properties){
-                var ltn = "dojo:" + componentName.toLowerCase();
+        this.createComponentFromScript = function(nodeRef, componentName, properties, namespace){
+                if(!namespace){
+                        namespace = "dojo";
+                }
+                var ltn = namespace + ":" + componentName.toLowerCase();
                 if(dojo.widget.tags[ltn]){
                         properties.fastMixIn = true;
                         return [dojo.widget.tags[ltn](properties, this, null, null, properties)];
                 }else{
-                        if(ltn.substr(0, 5)=="dojo:"){
-                                dojo.debug("no tag handler registed for type: ", ltn);
-                        }
+                        dojo.debug("no tag handler registered for type: ", ltn);
                 }
         }
@@ -229 +250 @@
  * @param refNode  If the last argument is specified this node is used as
  *                 a reference for inserting this node into a DOM tree else
- *                 it beomces the domNode
+ *                 it becomes the domNode
  * @param position The position to insert this widget's node relative to the
  *                 refNode argument
  * @return The new Widget object
  */
- 
-dojo.widget.createWidget = function(name, props, refNode, position){
-        var lowerCaseName = name.toLowerCase();
-        var namespacedName = "dojo:" + lowerCaseName;
-        var isNode = ( dojo.byId(name) && (!dojo.widget.tags[namespacedName]) );
-
-        // if we got a node or an unambiguious ID, build a widget out of it
-        if(     (arguments.length==1) && ((typeof name != "string")||(isNode)) ){
-                // we got a DOM node
-                var xp = new dojo.xml.Parse();
-                // FIXME: we should try to find the parent!
-                var tn = (isNode) ? dojo.byId(name) : name;
-                return dojo.widget.getParser().createComponents(xp.parseElement(tn, null, true))[0];
-        }
-
-        function fromScript (placeKeeperNode, name, props) {
+
+dojo.widget.createWidget = function(name, props, refNode, position, namespace){
+        if(!namespace){
+                namespace = "dojo";
+        }
+
+        function fromScript(placeKeeperNode, name, props, namespace){
+                if(!namespace){
+                        namespace="dojo";
+                }
+                var lowerCaseName = name.toLowerCase();
+                var namespacedName = namespace+":" + lowerCaseName;
                 props[namespacedName] = { 
                         dojotype: [{value: lowerCaseName}],
@@ -256 +273 @@
                 };
                 return dojo.widget.getParser().createComponentFromScript(
-                        placeKeeperNode, name, props, true);
+                        placeKeeperNode, name, props, namespace);
         }
 
@@ -263 +280 @@
                         "argument order is now of the form " +
                         "dojo.widget.createWidget(NAME, [PROPERTIES, [REFERENCENODE, [POSITION]]])", "0.4");
-                return fromScript(name, props, refNode);
+                return fromScript(name, props, refNode, namespace);
         }
         
@@ -284 +301 @@
                 tn = refNode;
         }
-        var widgetArray = fromScript(tn, name, props);
+        var widgetArray = fromScript(tn, name, props, namespace);
         if (!widgetArray || !widgetArray[0] || typeof widgetArray[0].widgetType == "undefined") {
                 throw new Error("createWidget: Creation of \"" + name + "\" widget failed.");

trunk/src/widget/Widget.js

@@ -36 +36 @@
         widgetType: "Widget", // used for building generic widgets
 
+        namespace: "dojo", //defaults to 'dojo'
+
         toString: function() {
                 return '[Widget ' + this.widgetType + ', ' + (this.widgetId || 'NO ID') + ']';
@@ -80 +82 @@
         },
 
-        create: function(args, fragment, parentComp){
+        create: function(args, fragment, parentComp, namespace){
+                if(namespace){
+                        this.namespace = namespace;
+                }
                 // dojo.debug(this.widgetType, "create");
                 this.satisfyPropertySets(args, fragment, parentComp);
@@ -285 +290 @@
                                                 // other object types intelligently?
 
-                                                // if we defined a URI, we probablt want to allow plain strings
+                                                // if we defined a URI, we probably want to allow plain strings
                                                 // to override it
                                                 if (this[x] instanceof dojo.uri.Uri){
@@ -496 +501 @@
         // FIXME: we don't seem to be doing anything with this!
         // var propertySets = parser.getPropertySets(frag);
-        var localProperties = localProps || parser.parseProperties(frag["dojo:"+stype]);
+        var localProperties = localProps || parser.parseProperties(frag[frag.namespace+":"+stype]);
         // var tic = new Date();
         var twidget = dojo.widget.manager.getImplementation(stype);
@@ -505 +510 @@
         }
         localProperties["dojoinsertionindex"] = insertionIndex;
-        // FIXME: we loose no less than 5ms in construction!
-        var ret = twidget.create(localProperties, frag, parentComp);
+        // FIXME: we lose no less than 5ms in construction!
+        var ret = twidget.create(localProperties, frag, parentComp, frag.namespace);
         // dojo.debug(new Date() - tic);
         return ret;
 }
 
+//TODO: add namespace support to this
 /*
  * Create a widget constructor function (aka widgetClass)

trunk/src/xml/Parse.js

@@ -31 +31 @@
         function getDojoTagName (node) {
                 var tagName = node.tagName;
-                if (tagName.substr(0,5).toLowerCase() != "dojo:") {
-                        
-                        if (tagName.substr(0,4).toLowerCase() == "dojo") {
-                                // FIXME: this assuumes tag names are always lower case
-                                return "dojo:" + tagName.substring(4).toLowerCase();
+                if(tagName.substr(0,5).toLowerCase() == "dojo:"){
+                        return tagName.toLowerCase();
+                }
+
+                if(tagName.substr(0,4).toLowerCase() == "dojo"){
+                        // FIXME: this assumes tag names are always lower case
+                        return "dojo:" + tagName.substring(4).toLowerCase();
+                }
+
+                // allow lower-casing
+                var djt = node.getAttribute("dojoType") || node.getAttribute("dojotype");
+                if(djt){
+                        if(djt.indexOf(":")<0){
+                                djt = "dojo:"+djt;
                         }
+                        return djt.toLowerCase();
+                }
                 
-                        // allow lower-casing
-                        var djt = node.getAttribute("dojoType") || node.getAttribute("dojotype");
-                        if (djt) { return "dojo:" + djt.toLowerCase(); }
-                        
-                        if (node.getAttributeNS && node.getAttributeNS(dojo.dom.dojoml,"type")) {
-                                return "dojo:" + node.getAttributeNS(dojo.dom.dojoml,"type").toLowerCase();
-                        }
-                        try {
-                                // FIXME: IE really really doesn't like this, so we squelch
-                                // errors for it
-                                djt = node.getAttribute("dojo:type");
-                        } catch (e) { /* FIXME: log? */ }
+                if(node.getAttributeNS && node.getAttributeNS(dojo.dom.dojoml,"type")){
+                        return "dojo:" + node.getAttributeNS(dojo.dom.dojoml,"type").toLowerCase();
+                }
+                try{
+                        // FIXME: IE really really doesn't like this, so we squelch errors for it
+                        djt = node.getAttribute("dojo:type");
+                }catch(e){ /* FIXME: log? */ }
 
-                        if (djt) { return "dojo:"+djt.toLowerCase(); }
-                
-                        if (!dj_global["djConfig"] || !djConfig["ignoreClassNames"]) {
-                                // FIXME: should we make this optionally enabled via djConfig?
-                                var classes = node.className||node.getAttribute("class");
-                                // FIXME: following line, without check for existence of classes.indexOf
-                                // breaks firefox 1.5's svg widgets
-                                if (classes && classes.indexOf && classes.indexOf("dojo-") != -1) {
-                                        var aclasses = classes.split(" ");
-                                        for(var x=0; x<aclasses.length; x++){
-                                                if (aclasses[x].length > 5 && aclasses[x].indexOf("dojo-") >= 0) {
-                                                        return "dojo:"+aclasses[x].substr(5).toLowerCase();
-                                                }
+                if(djt){ return "dojo:"+djt.toLowerCase(); }
+        
+                if(!dj_global["djConfig"] || !djConfig["ignoreClassNames"]){ 
+                        // FIXME: should we make this optionally enabled via djConfig?
+                        var classes = node.className||node.getAttribute("class");
+                        // FIXME: following line, without check for existence of classes.indexOf
+                        // breaks firefox 1.5's svg widgets
+                        if(classes && classes.indexOf && classes.indexOf("dojo-") != -1){
+                            var aclasses = classes.split (" ");
+                            for(var x=0; x<aclasses.length; x++){
+                                if(aclasses[x].length > 5 && aclasses[x].indexOf("dojo-") >= 0){
+                                    return "dojo:"+aclasses[x].substr(5).toLowerCase(); 
                                         }
                                 }
@@ -69 +74 @@
                 
                 }
+
                 return tagName.toLowerCase();
         }
@@ -74 +80 @@
         this.parseElement = function(node, hasParentNodeSet, optimizeForDojoML, thisIdx){
 
-        // if parseWidgets="false" don't search inside this node for widgets
-        if (node.getAttribute("parseWidgets") == "false") {
-            return {};
-        }
-
                 // TODO: make this namespace aware
                 var parsedNodeSet = {};
 
+                //There's a weird bug in IE where it counts end tags, e.g. </dojo:button> as nodes that should be parsed.  Ignore these
+                if(node.tagName && node.tagName.indexOf("/") == 0){
+                        return null;
+                }
+
                 var tagName = getDojoTagName(node);
                 parsedNodeSet[tagName] = [];
-                if((!optimizeForDojoML)||(tagName.substr(0,4).toLowerCase()=="dojo")){
-                        var attributeSet = parseAttributes(node);
+                if(tagName.substr(0,4).toLowerCase()=="dojo"){
+                        parsedNodeSet.namespace = "dojo";
+                }else{
+                        var pos = tagName.indexOf(":");
+                        if(pos > 0){
+                            parsedNodeSet.namespace = tagName.substring(0,pos);
+                        }
+                }
+
+                if(!optimizeForDojoML||dojo.getNamespace(parsedNodeSet.namespace)){
+                        var attributeSet = this.parseAttributes(node);
                         for(var attr in attributeSet){
                                 if((!parsedNodeSet[tagName][attr])||(typeof parsedNodeSet[tagName][attr] != "array")){
@@ -99 +114 @@
                         parsedNodeSet.tagName = tagName;
                         parsedNodeSet.index = thisIdx||0;
+
+                        //    dojo.debug("parseElement: set the element tagName = "+parsedNodeSet.tagName+" and namespace to "+parsedNodeSet.namespace);
                 }
-        
+
                 var count = 0;
-                var tcn, i = 0, nodes = node.childNodes;
-                while(tcn = nodes[i++]){
+                for(var i = 0; i < node.childNodes.length; i++){
+                        var tcn = node.childNodes.item(i);
                         switch(tcn.nodeType){
                                 case  dojo.dom.ELEMENT_NODE: // element nodes, call this function recursively
@@ -148 +165 @@
                 }
                 //return (hasParentNodeSet) ? parsedNodeSet[node.tagName] : parsedNodeSet;
+                //if(parsedNodeSet.tagName)dojo.debug("parseElement: RETURNING NODE WITH TAGNAME "+parsedNodeSet.tagName);
                 return parsedNodeSet;
         }
 
         /* parses a set of attributes on a node into an object tree */
-        function parseAttributes(node) {
+        this.parseAttributes = function(node){
                 // TODO: make this namespace aware
                 var parsedAttributeSet = {};

trunk/tests/widget/test_Accordion.html

@@ -10 +10 @@
 </script>
 <script type="text/javascript" src="../../dojo.js"></script>
-<script language="JavaScript" type="text/javascript">
-        dojo.require("dojo.widget.Tree");
-        dojo.require("dojo.widget.TreeNode");
-        dojo.require("dojo.widget.AccordionContainer");
-        dojo.require("dojo.widget.ContentPane");
+<script type="text/javascript">
+        dojo.require("dojo.widget.*");
 </script>