Changeset 6973

Timestamp:

01/02/07 21:44:06 (3 years ago)

Author:

jburke

Message:

Fixes #2197: using dojo.uri.moduleUri instead of dojo.uri.dojoUri to enable xdomain image loading, and to fit better with the module URI concept.

Location:

trunk

Files:

• buildscripts/internStrings.js (modified) (1 diff)
• src/a11y.js (modified) (1 diff)
• src/debug.js (modified) (1 diff)
• src/io/IframeIO.js (modified) (1 diff)
• src/io/XhrIframeProxy.js (modified) (1 diff)
• src/lfx/shadow.js (modified) (1 diff)
• src/rpc/YahooService.js (modified) (1 diff)
• src/storage/browser.js (modified) (2 diffs)
• src/uri/Uri.js (modified) (1 diff)
• src/widget/AccordionContainer.js (modified) (1 diff)
• src/widget/AnimatedPng.js (modified) (1 diff)
• src/widget/Button.js (modified) (6 diffs)
• src/widget/Checkbox.js (modified) (2 diffs)
• src/widget/Clock.js (modified) (1 diff)
• src/widget/ComboBox.js (modified) (2 diffs)
• src/widget/DatePicker.js (modified) (1 diff)
• src/widget/demoEngine/DemoContainer.js (modified) (1 diff)
• src/widget/demoEngine/DemoItem.js (modified) (1 diff)
• src/widget/demoEngine/DemoNavigator.js (modified) (1 diff)
• src/widget/demoEngine/DemoPane.js (modified) (1 diff)
• src/widget/demoEngine/SourcePane.js (modified) (1 diff)
• src/widget/Dialog.js (modified) (1 diff)
• src/widget/DomWidget.js (modified) (1 diff)
• src/widget/DropdownContainer.js (modified) (1 diff)
• src/widget/DropdownDatePicker.js (modified) (1 diff)
• src/widget/DropdownTimePicker.js (modified) (1 diff)
• src/widget/Editor.js (modified) (1 diff)
• src/widget/Editor2.js (modified) (1 diff)
• src/widget/Editor2Plugin/AlwaysShowToolbar.js (modified) (1 diff)
• src/widget/Editor2Plugin/CreateLinkDialog.js (modified) (1 diff)
• src/widget/Editor2Plugin/DialogCommands.js (modified) (1 diff)
• src/widget/Editor2Plugin/DropDownList.js (modified) (3 diffs)
• src/widget/Editor2Plugin/FindReplace.js (modified) (1 diff)
• src/widget/Editor2Plugin/FindReplaceDialog.js (modified) (2 diffs)
• src/widget/Editor2Plugin/InsertImageDialog.js (modified) (1 diff)
• src/widget/Editor2Plugin/InsertTableDialog.js (modified) (1 diff)
• src/widget/Editor2Plugin/TableOperation.js (modified) (1 diff)
• src/widget/Editor2Toolbar.js (modified) (1 diff)
• src/widget/FisheyeList.js (modified) (2 diffs)
• src/widget/FloatingPane.js (modified) (1 diff)
• src/widget/HslColorPicker.js (modified) (2 diffs)
• src/widget/InlineEditBox.js (modified) (1 diff)
• src/widget/Menu2.js (modified) (1 diff)
• src/widget/MonthlyCalendar.js (modified) (1 diff)
• src/widget/ProgressBar.js (modified) (1 diff)
• src/widget/ResizableTextarea.js (modified) (1 diff)
• src/widget/ResizeHandle.js (modified) (1 diff)
• src/widget/RichText.js (modified) (2 diffs)
• src/widget/Show.js (modified) (2 diffs)
• src/widget/Slider.js (modified) (5 diffs)
• src/widget/SlideShow.js (modified) (1 diff)
• src/widget/Spinner.js (modified) (1 diff)
• src/widget/SplitContainer.js (modified) (1 diff)
• src/widget/TabContainer.js (modified) (2 diffs)
• src/widget/TaskBar.js (modified) (1 diff)
• src/widget/templates/Checkbox.html (modified) (1 diff)
• src/widget/templates/ComboButtonTemplate.html (modified) (1 diff)
• src/widget/templates/DatePicker.html (modified) (3 diffs)
• src/widget/templates/MonthlyCalendar.html (modified) (4 diffs)
• src/widget/Textbox.js (modified) (1 diff)
• src/widget/TimePicker.js (modified) (1 diff)
• src/widget/TitlePane.js (modified) (1 diff)
• src/widget/Toaster.js (modified) (1 diff)
• src/widget/Toolbar.js (modified) (3 diffs)
• src/widget/Tooltip.js (modified) (1 diff)
• src/widget/Tree.js (modified) (2 diffs)
• src/widget/TreeDisableWrapExtension.js (modified) (1 diff)
• src/widget/TreeDocIconExtension.js (modified) (1 diff)
• src/widget/TreeNode.js (modified) (1 diff)
• src/widget/TreeV3.js (modified) (1 diff)
• src/widget/ValidationTextbox.js (modified) (1 diff)
• src/widget/Wizard.js (modified) (1 diff)

trunk/buildscripts/internStrings.js

@@ -63 +63 @@
 
         var prefixes = buildUtil.getDependencyPropertyFromProfile(profileFile, "prefixes");
+        //Make sure dojo is in the list.
+        var dojoPath = releaseDir.replace(/^.*(\/|\\)release(\/|\\)/, "release/");
+        prefixes.push(["dojo", dojoPath + "/src"]);
+
         var skiplist = buildUtil.getDependencyPropertyFromProfile(profileFile, "internSkipList");
         

trunk/src/a11y.js

@@ -9 +9 @@
         // accessible: Boolean uninitialized when null (accessible check has not been performed)
         //   if true generate accessible widgets
-        imgPath:dojo.uri.dojoUri("src/widget/templates/images"),
+        imgPath:dojo.uri.moduleUri("dojo", "widget/templates/images"),
         doAccessibleCheck: true,
         accessible: null,               

trunk/src/debug.js

@@ -73 +73 @@
         dojo.debugDeep.debugVars.push(obj);
         // dojo.undo.browser back and forward breaks relpaths
-        var url = new dojo.uri.Uri(location, dojo.uri.dojoUri("src/debug/deep.html?var="+idx)).toString();
+        var url = new dojo.uri.Uri(location, dojo.uri.moduleUri("dojo", "debug/deep.html?var="+idx)).toString();
         var win = window.open(url, '_blank', 'width=600, height=400, resizable=yes, scrollbars=yes, status=yes');
         try{

trunk/src/io/IframeIO.js

@@ -19 +19 @@
         var r = dojo.render.html;
         var cframe = null;
-        var turi = uri||dojo.uri.dojoUri("iframe_history.html?noInit=true");
+        var turi = uri||dojo.uri.moduleUri("dojo", "../iframe_history.html?noInit=true");
         var ifrstr = ((r.ie)&&(dojo.render.os.win)) ? '<iframe name="'+fname+'" src="'+turi+'" onload="'+onloadstr+'">' : 'iframe';
         cframe = document.createElement(ifrstr);

trunk/src/io/XhrIframeProxy.js

@@ -16 +16 @@
         //Usage of XHR IFrame Proxying does not work from local disk in Safari.
 
-        xipClientUrl: djConfig["xipClientUrl"] || dojo.uri.dojoUri("src/io/xip_client.html"),
+        xipClientUrl: djConfig["xipClientUrl"] || dojo.uri.moduleUri("dojo", "io/xip_client.html"),
 
         _state: {},

trunk/src/lfx/shadow.js

@@ -7 +7 @@
         //      summary
         //      creates a shadow underneath node.
-        this.shadowPng = dojo.uri.dojoUri("src/html/images/shadow");
+        this.shadowPng = dojo.uri.moduleUri("dojo", "html/images/shadow");
         this.shadowThickness = 8;
         this.shadowOffset = 15;

trunk/src/rpc/YahooService.js

@@ -14 +14 @@
                                         "deployment of your application");
         }
-        this.connect(dojo.uri.dojoUri("src/rpc/yahoo.smd"));
+        this.connect(dojo.uri.moduleUri("dojo", "rpc/yahoo.smd"));
         this.strictArgChecks = false;
 }

trunk/src/storage/browser.js

@@ -643 +643 @@
         
         _writeApplet: function(){
-                var archive = dojo.uri.dojoUri("DojoFileStorageProvider.jar").toString();
+                var archive = dojo.uri.moduleUri("dojo", "../DojoFileStorageProvider.jar").toString();
                 var tag = "<applet "
                                         + "id='" + dojo.storage.browser.FileStorageProvider._APPLET_ID + "' "
@@ -853 +853 @@
                 }
                 dojo.flash.addLoadedListener(loadedListener);
-                var swfloc6 = dojo.uri.dojoUri("Storage_version6.swf").toString();
-                var swfloc8 = dojo.uri.dojoUri("Storage_version8.swf").toString();
+                var swfloc6 = dojo.uri.moduleUri("dojo", "../Storage_version6.swf").toString();
+                var swfloc8 = dojo.uri.moduleUri("dojo", "../Storage_version8.swf").toString();
                 dojo.flash.setSwf({flash6: swfloc6, flash8: swfloc8, visible: false});
         },

trunk/src/uri/Uri.js

@@ -11 +11 @@
                 // description: Examples: dojo.uri.moduleUri("dojo","Editor"), or dojo.uri.moduleUri("acme","someWidget")
                 var loc = dojo.hostenv.getModuleSymbols(module).join('/');
-                //var loc = dojo.hostenv.getModulePrefix(module);
-                if(!loc){return null;}
-                if(loc.lastIndexOf("/") != loc.length-1){loc += "/";}
-                return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri()+loc,uri);
+                if(!loc){
+                        return null;
+                }
+                if(loc.lastIndexOf("/") != loc.length-1){
+                        loc += "/";
+                }
+                
+                //If the path is an absolute path (starts with a / or is on another domain/xdomain)
+                //then don't add the baseScriptUri.
+                var colonIndex = loc.indexOf(":");
+                var slashIndex = loc.indexOf("/");
+                if(loc.charAt(0) != "/" && (colonIndex == -1 || colonIndex > slashIndex)){
+                        loc = dojo.hostenv.getBaseScriptUri() + loc;
+                }
+
+                return new dojo.uri.Uri(loc,uri);
         }
 

trunk/src/widget/AccordionContainer.js

@@ -191 +191 @@
         selected: false,
 
-        templatePath: dojo.uri.dojoUri("src/widget/templates/AccordionPane.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/AccordionPane.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/AccordionPane.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/AccordionPane.css"),
 
         isContainer: true,

trunk/src/widget/AnimatedPng.js

@@ -43 +43 @@
                 interval: 100,
 
-                _blankSrc: dojo.uri.dojoUri("src/widget/templates/images/blank.gif"),
+                _blankSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/blank.gif"),
 
                 templateString: '<img class="dojoAnimatedPng" />',

trunk/src/widget/Button.js

@@ -26 +26 @@
                 caption: "",
                 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/ButtonTemplate.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/ButtonTemplate.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/ButtonTemplate.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/ButtonTemplate.css"),
                 
                 // inactiveImg: Url
                 //      prefix of filename holding images (left, center, right) for button in normal state
-                inactiveImg: "src/widget/templates/images/soriaButton-",
+                inactiveImg: "widget/templates/images/soriaButton-",
                 
                 // activeImg: Url
                 //      prefix of filename holding images (left, center, right) for button when it's being hovered over
-                activeImg: "src/widget/templates/images/soriaActive-",
+                activeImg: "widget/templates/images/soriaActive-",
 
                 // pressedImg: Url
                 //      prefix of filename holding images (left, center, right) for button between mouse-down and mouse-up
-                pressedImg: "src/widget/templates/images/soriaPressed-",
+                pressedImg: "widget/templates/images/soriaPressed-",
 
                 // disabledImg: Url
                 //      prefix of filename holding images (left, center, right) for button when it's disabled (aka, grayed-out)
-                disabledImg: "src/widget/templates/images/soriaDisabled-",
+                disabledImg: "widget/templates/images/soriaDisabled-",
                 
                 // widget2height: Number
@@ -192 +192 @@
 
                 _setImage: function(/*String*/ prefix){
-                        this.leftImage.src=dojo.uri.dojoUri(prefix + "l.gif");
-                        this.centerImage.src=dojo.uri.dojoUri(prefix + "c.gif");
-                        this.rightImage.src=dojo.uri.dojoUri(prefix + "r.gif");
+                        this.leftImage.src=dojo.uri.moduleUri("dojo", prefix + "l.gif");
+                        this.centerImage.src=dojo.uri.moduleUri("dojo", prefix + "c.gif");
+                        this.rightImage.src=dojo.uri.moduleUri("dojo", prefix + "r.gif");
                 },
                 
@@ -260 +260 @@
                 _sizeMyselfHelper: function(){
                         // draw the arrow (todo: why is the arror in containerNode rather than outside it?)
-                        this.arrow.src = dojo.uri.dojoUri(this.disabled ? this.disabledDownArrow : this.downArrow);
+                        this.arrow.src = dojo.uri.moduleUri("dojo", this.disabled ? this.disabledDownArrow : this.downArrow);
                         this.containerNode.appendChild(this.arrow);
 
@@ -289 +289 @@
                 menuId: "",
         
-                templatePath: dojo.uri.dojoUri("src/widget/templates/ComboButtonTemplate.html"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/ComboButtonTemplate.html"),
         
                 // splitWidth: Integer
@@ -338 +338 @@
         
                 _setImage: function(prefix){
-                        this.leftImage.src=dojo.uri.dojoUri(prefix + "l.gif");
-                        this.centerImage.src=dojo.uri.dojoUri(prefix + "c.gif");
+                        this.leftImage.src=dojo.uri.moduleUri("dojo", prefix + "l.gif");
+                        this.centerImage.src=dojo.uri.moduleUri("dojo", prefix + "c.gif");
                 },
         
@@ -394 +394 @@
         
                 _setImageR: function(prefix){
-                        this.arrowBackgroundImage.src=dojo.uri.dojoUri(prefix + "c.gif");
-                        this.rightImage.src=dojo.uri.dojoUri(prefix + "r.gif");
+                        this.arrowBackgroundImage.src=dojo.uri.moduleUri("dojo", prefix + "c.gif");
+                        this.rightImage.src=dojo.uri.moduleUri("dojo", prefix + "r.gif");
                 },
 

trunk/src/widget/Checkbox.js

@@ -14 +14 @@
                 //      Same as an HTML checkbox, but with fancy styling
 
-                templatePath: dojo.uri.dojoUri('src/widget/templates/Checkbox.html'),
-                templateCssPath: dojo.uri.dojoUri('src/widget/templates/Checkbox.css'),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Checkbox.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Checkbox.css"),
 
                 // class: String
@@ -185 +185 @@
                 //      variation on Checkbox widget to be display on monitors in high-contrast mode (that don't display CSS background images)
 
-                templatePath: dojo.uri.dojoUri('src/widget/templates/CheckboxA11y.html'),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/CheckboxA11y.html"),
 
                 postCreate: function(args, frag){

trunk/src/widget/Clock.js

@@ -48 +48 @@
                         second:{ shadow:null, shift:{ dx:4, dy:4} }
                 };
-                this.image = dojo.uri.dojoUri("src/widget/templates/images/clock.png");
+                this.image = dojo.uri.moduleUri("dojo", "widget/templates/images/clock.png");
                 this.surface=null;
                 this.labelNode=null;

trunk/src/widget/ComboBox.js

@@ -345 +345 @@
                 // buttonSrc: URI
                 //              URI for the down arrow icon to the right of the input box.
-                buttonSrc: dojo.uri.dojoUri("src/widget/templates/images/combo_box_arrow.png"),
+                buttonSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/combo_box_arrow.png"),
 
                 // dropdownToggle: String
@@ -351 +351 @@
                 dropdownToggle: "fade",
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/ComboBox.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/ComboBox.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/ComboBox.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/ComboBox.css"),
 
                 setValue: function(/*String*/ value){

trunk/src/widget/DatePicker.js

@@ -87 +87 @@
                         selectedDate: "selectedItem"
                 },
-                templatePath:  dojo.uri.dojoUri("src/widget/templates/DatePicker.html"),
-                templateCssPath:  dojo.uri.dojoUri("src/widget/templates/DatePicker.css"),
+                templatePath:  dojo.uri.moduleUri("dojo", "widget/templates/DatePicker.html"),
+                templateCssPath:  dojo.uri.moduleUri("dojo", "widget/templates/DatePicker.css"),
 
                 postMixInProperties: function(){

trunk/src/widget/demoEngine/DemoContainer.js

@@ -9 +9 @@
         dojo.widget.HtmlWidget, 
         {
-                templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoContainer.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoContainer.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoContainer.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoContainer.css"),
                 postCreate: function() {
                         dojo.html.addClass(this.domNode,this.domNodeClass);

trunk/src/widget/demoEngine/DemoItem.js

@@ -8 +8 @@
         dojo.widget.HtmlWidget, 
         {
-                templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoItem.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoItem.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoItem.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoItem.css"),
                 postCreate: function() {
                         dojo.html.addClass(this.domNode,this.domNodeClass);

trunk/src/widget/demoEngine/DemoNavigator.js

@@ -13 +13 @@
         dojo.widget.HtmlWidget, 
         {
-                templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoNavigator.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoNavigator.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoNavigator.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoNavigator.css"),
                 postMixInProperties: function(){
                         dojo.widget.HtmlWidget.superclass.postMixInProperties.apply(this, arguments);

trunk/src/widget/demoEngine/DemoPane.js

@@ -6 +6 @@
         dojo.widget.HtmlWidget, 
         {
-                templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoPane.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoPane.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoPane.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/DemoPane.css"),
                 postCreate: function() {
                         dojo.html.addClass(this.domNode,this.domNodeClass);

trunk/src/widget/demoEngine/SourcePane.js

@@ -7 +7 @@
         dojo.widget.HtmlWidget, 
         {
-                templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/SourcePane.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/demoEngine/templates/SourcePane.css"),
                 postCreate: function() {
                         dojo.html.addClass(this.domNode,this.domNodeClass);

trunk/src/widget/Dialog.js

@@ -330 +330 @@
                 //      Dialog is extended from ContentPane so it supports all the same parameters (href, etc.)
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/Dialog.html"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Dialog.html"),
 
                 // blockDuration: Integer

trunk/src/widget/DomWidget.js

@@ -17 +17 @@
         // summary: a mapping of strings that are used in template variable replacement
         dojoRoot: dojo.hostenv.getBaseScriptUri(),
+        dojoModuleUri: dojo.uri.moduleUri("dojo"),
         baseScriptUri: dojo.hostenv.getBaseScriptUri()
 };

trunk/src/widget/DropdownContainer.js

@@ -30 +30 @@
 
                 // iconURL: dojo.uri.Uri: icon for the dropdown button
-                iconURL: dojo.uri.dojoUri("src/widget/templates/images/combo_box_arrow.png"),
+                iconURL: dojo.uri.moduleUri("dojo", "widget/templates/images/combo_box_arrow.png"),
 
                 // copyClass:

trunk/src/widget/DropdownDatePicker.js

@@ -37 +37 @@
                 */
 
-                iconURL: dojo.uri.dojoUri("src/widget/templates/images/dateIcon.gif"),
+                iconURL: dojo.uri.moduleUri("dojo", "widget/templates/images/dateIcon.gif"),
 
                 // formatLength: String

trunk/src/widget/DropdownTimePicker.js

@@ -36 +36 @@
                 // iconURL: URL
                 //      path of icon for button to display time picker widget
-                iconURL: dojo.uri.dojoUri("src/widget/templates/images/timeIcon.gif"),
+                iconURL: dojo.uri.moduleUri("dojo", "widget/templates/images/timeIcon.gif"),
                 
                 // formatLength: String

trunk/src/widget/Editor.js

@@ -427 +427 @@
                         return cmd;
                 } else {
-                        return dojo.uri.dojoUri("src/widget/templates/buttons/" + cmd + ".gif");
+                        return dojo.uri.moduleUri("dojo", "widget/templates/buttons/" + cmd + ".gif");
                 }
         },

trunk/src/widget/Editor2.js

@@ -207 +207 @@
                 // toolbarTemplatePath: dojo.uri.Uri
                 //              to specify the template file for the toolbar
-                toolbarTemplatePath: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/EditorToolbarOneline.html")),
+                toolbarTemplatePath: dojo.uri.cache.allow(dojo.uri.moduleUri("dojo", "widget/templates/EditorToolbarOneline.html")),
 
                 // toolbarTemplateCssPath: dojo.uri.Uri
                 //              to specify the css file for the toolbar
-                toolbarTemplateCssPath: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/EditorToolbar.css")),
+                toolbarTemplateCssPath: dojo.uri.cache.allow(dojo.uri.moduleUri("dojo", "widget/templates/EditorToolbar.css")),
 
                 // toolbarPlaceHolder: String

trunk/src/widget/Editor2Plugin/AlwaysShowToolbar.js

@@ -45 +45 @@
                         if((isIE)&&(db)&&(dh.getStyle(db, "background-image")=="none")){
                                 with(db.style){
-                                        backgroundImage = "url(" + dojo.uri.dojoUri("src/widget/templates/images/blank.gif") + ")";
+                                        backgroundImage = "url(" + dojo.uri.moduleUri("dojo", "widget/templates/images/blank.gif") + ")";
                                         backgroundAttachment = "fixed";
                                 }

trunk/src/widget/Editor2Plugin/CreateLinkDialog.js

@@ -7 +7 @@
         dojo.widget.Editor2DialogContent,
 {
-        templatePath: dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/createlink.html"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Editor2/Dialog/createlink.html"),
 
         editableAttributes: ['href', 'target', 'class'],

trunk/src/widget/Editor2Plugin/DialogCommands.js

@@ -12 +12 @@
                 //              Provides a Dialog which can be modal or normal for the Editor2.
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/Editor2/EditorDialog.html"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Editor2/EditorDialog.html"),
 
                 // modal: Boolean: Whether this is a modal dialog. True by default.

trunk/src/widget/Editor2Plugin/DropDownList.js

@@ -101 +101 @@
         // summary: dojo.widget.Editor2ToolbarFormatBlockSelect is an improved format block setting item
 
-        href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FormatBlock.html")),
+        href: dojo.uri.cache.allow(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/EditorToolbar_FormatBlock.html")),
 
         setup: function(){
@@ -172 +172 @@
         // summary: dojo.widget.Editor2ToolbarFontSizeSelect provides a dropdown list for setting fontsize
 
-        href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FontSize.html")),
+        href: dojo.uri.cache.allow(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/EditorToolbar_FontSize.html")),
 
         setup: function(){
@@ -240 +240 @@
 dojo.declare("dojo.widget.Editor2ToolbarFontNameSelect", dojo.widget.Editor2ToolbarFontSizeSelect, {
         // summary: dojo.widget.Editor2ToolbarFontNameSelect provides a dropdown list for setting fontname
-        href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FontName.html"))
-});
+        href: dojo.uri.cache.allow(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/EditorToolbar_FontName.html"))
+});

trunk/src/widget/Editor2Plugin/FindReplace.js

@@ -51 +51 @@
                                 {contentFile: "dojo.widget.Editor2Plugin.FindReplaceDialog", 
                                 contentClass: "Editor2ReplaceDialog",
-                                href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/replace.html")), 
+                                href: dojo.uri.cache.allow(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/Dialog/replace.html")), 
                                 title: "Replace", width: "350px", height: "200px", modal: false});
                 }

trunk/src/widget/Editor2Plugin/FindReplaceDialog.js

@@ -5 +5 @@
         dojo.widget.Editor2DialogContent,
 {
-        templatePath: dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/find.html"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Editor2/Dialog/find.html"),
 
         find: function(){
@@ -30 +30 @@
         dojo.widget.Editor2DialogContent,
 {
-        templatePath: dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/replace.html"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Editor2/Dialog/replace.html"),
 
         replace: function(){

trunk/src/widget/Editor2Plugin/InsertImageDialog.js

@@ -5 +5 @@
         dojo.widget.Editor2DialogContent,
 {
-        templatePath: dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/insertimage.html"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Editor2/Dialog/insertimage.html"),
 
         editableAttributes: ['src', 'alt', 'width', 'height', 'hspace', 'vspace', 'border', 'align'],

trunk/src/widget/Editor2Plugin/InsertTableDialog.js

@@ -5 +5 @@
         dojo.widget.Editor2DialogContent,
 {
-        templatePath: dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/inserttable.html"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Editor2/Dialog/inserttable.html"),
 
         editableAttributes: ['summary', 'height', 'cellspacing', 'cellpadding', 'border', 'align'],

trunk/src/widget/Editor2Plugin/TableOperation.js

@@ -48 +48 @@
                         this._showTableBorder = false;
                         if(dojo.render.html.moz){
-                                this._editor.removeStyleSheet(dojo.uri.dojoUri("src/widget/templates/Editor2/showtableborder_gecko.css"));
+                                this._editor.removeStyleSheet(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/showtableborder_gecko.css"));
                         }else if(dojo.render.html.ie){
-                                this._editor.removeStyleSheet(dojo.uri.dojoUri("src/widget/templates/Editor2/showtableborder_ie.css"));
+                                this._editor.removeStyleSheet(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/showtableborder_ie.css"));
                         }
                 }else{
                         this._showTableBorder = true;
                         if(dojo.render.html.moz){
-                                this._editor.addStyleSheet(dojo.uri.dojoUri("src/widget/templates/Editor2/showtableborder_gecko.css"));
+                                this._editor.addStyleSheet(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/showtableborder_gecko.css"));
                         }else if(dojo.render.html.ie){
-                                this._editor.addStyleSheet(dojo.uri.dojoUri("src/widget/templates/Editor2/showtableborder_ie.css"));
+                                this._editor.addStyleSheet(dojo.uri.moduleUri("dojo", "widget/templates/Editor2/showtableborder_ie.css"));
                         }
                 }

trunk/src/widget/Editor2Toolbar.js

@@ -342 +342 @@
                 //              dojo.widget.Editor2Toolbar is the main widget for the toolbar associated with an Editor2
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/EditorToolbar.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/EditorToolbar.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/EditorToolbar.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/EditorToolbar.css"),
 
                 // ToolbarLatchedItemStyle: String: class name for latched toolbar button items

trunk/src/widget/FisheyeList.js

@@ -58 +58 @@
 {
         templateString: '<div class="dojoHtmlFisheyeListBar"></div>',
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/FisheyeList.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/FisheyeList.css"),
 
         isContainer: true,
@@ -621 +621 @@
         id: "",
 
-        _blankImgPath: dojo.uri.dojoUri("src/widget/templates/images/blank.gif"),
+        _blankImgPath: dojo.uri.moduleUri("dojo", "widget/templates/images/blank.gif"),
 
         templateString:

trunk/src/widget/FloatingPane.js

@@ -76 +76 @@
                 _taskBarConnectAttempts: 0,
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/FloatingPane.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/FloatingPane.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/FloatingPane.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/FloatingPane.css"),
 
                 fillInFloatingPaneTemplate: function(args, frag){

trunk/src/widget/HslColorPicker.js

@@ -26 +26 @@
 
         //      widget props
-        templatePath: dojo.uri.dojoUri("src/widget/templates/HslColorPicker.svg"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/HslColorPicker.svg"),
         fillInTemplate: function() {
                 this.height = "131px";
@@ -32 +32 @@
                 this.leftGradientColorNode = this.hueNode.ownerDocument.getElementById("leftGradientColor");
                 this.rightGradientColorNode = this.hueNode.ownerDocument.getElementById("rightGradientColor");
-                this.hueNode.setAttributeNS(dojo.dom.xmlns.xlink, "href", dojo.uri.dojoUri("src/widget/templates/images/hue.png"));
+                this.hueNode.setAttributeNS(dojo.dom.xmlns.xlink, "href", dojo.uri.moduleUri("dojo", "widget/templates/images/hue.png"));
                 var hsl = dojo.gfx.color.hex2hsl(this.storedColor);
                 this.hue = hsl[0];

trunk/src/widget/InlineEditBox.js

@@ -22 +22 @@
         },
 {
-        templatePath: dojo.uri.dojoUri("src/widget/templates/InlineEditBox.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/InlineEditBox.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/InlineEditBox.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/InlineEditBox.css"),
 
         // mode: String

trunk/src/widget/Menu2.js

@@ -29 +29 @@
 
         templateString: '<table class="dojoPopupMenu2" border=0 cellspacing=0 cellpadding=0 style="display: none;"><tbody dojoAttachPoint="containerNode"></tbody></table>',
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/Menu2.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Menu2.css"),
         templateCssString: "",
 

trunk/src/widget/MonthlyCalendar.js

@@ -16 +16 @@
                 dayWidth: 'wide',
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/MonthlyCalendar.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/MonthlyCalendar.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/MonthlyCalendar.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/MonthlyCalendar.css"),
 
                 initializer: function(){

trunk/src/widget/ProgressBar.js

@@ -96 +96 @@
                 duration: 1000,
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/ProgressBar.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/ProgressBar.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/ProgressBar.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/ProgressBar.css"),
                 
         

trunk/src/widget/ResizableTextarea.js

@@ -16 +16 @@
         //      <textarea dojoType="ResizableTextArea">...</textarea>
 
-        templatePath: dojo.uri.dojoUri("src/widget/templates/ResizableTextarea.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/ResizableTextarea.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/ResizableTextarea.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/ResizableTextarea.css"),
 
         postMixInProperties: function(){

trunk/src/widget/ResizeHandle.js

@@ -18 +18 @@
         targetElmId: '',
 
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/ResizeHandle.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/ResizeHandle.css"),
         templateString: '<div class="dojoHtmlResizeHandle"><div></div></div>',
 

trunk/src/widget/RichText.js

@@ -511 +511 @@
                         }
                         // opera likes this to be outside the with block
-                        this.iframe.src = dojo.uri.dojoUri("src/widget/templates/richtextframe.html") + ((dojo.doc().domain != currentDomain) ? ("#"+dojo.doc().domain) : "");
+                        this.iframe.src = dojo.uri.moduleUri("dojo", "widget/templates/richtextframe.html") + ((dojo.doc().domain != currentDomain) ? ("#"+dojo.doc().domain) : "");
                         this.iframe.width = this.inheritWidth ? this._oldWidth : "100%";
                         if(this.height){
@@ -655 +655 @@
                                         var url = files[i];
                                         if(url){
-                                                this.addStyleSheet(dojo.uri.dojoUri(url));
+                                                this.addStyleSheet(dojo.uri.moduleUri("dojo", url));
                                         }
                                 }

trunk/src/widget/Show.js

@@ -32 +32 @@
         debugPane: null,
         noClick: false,
-        templatePath: dojo.uri.dojoUri("src/widget/templates/Show.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/Show.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Show.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Show.css"),
         fillInTemplate: function(args, frag){
                 if(args.debugPane){
@@ -299 +299 @@
         debug: false,
         noClick: false,
-        templatePath: dojo.uri.dojoUri("src/widget/templates/ShowSlide.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/ShowSlide.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/ShowSlide.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/ShowSlide.css"),
         postCreate: function(){
                 this.htmlTitle.innerHTML = this.title;

trunk/src/widget/Slider.js

@@ -130 +130 @@
                 activeDrag: false,
 
-                templateCssPath: dojo.uri.dojoUri ("src/widget/templates/Slider.css"),
-                templatePath: dojo.uri.dojoUri ("src/widget/templates/Slider.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Slider.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Slider.html"),
 
                 // This is set to true when a drag is started, so that it is not confused
@@ -141 +141 @@
                 // bottomButtonSrc: String
                 //      down arrow graphic URL
-                bottomButtonSrc: dojo.uri.dojoUri("src/widget/templates/images/slider_down_arrow.png"),
+                bottomButtonSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/slider_down_arrow.png"),
 
                 // topButtonSrc: String
                 //      up arrow graphic URL
-                topButtonSrc: dojo.uri.dojoUri("src/widget/templates/images/slider_up_arrow.png"),
+                topButtonSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/slider_up_arrow.png"),
 
                 // leftButtonSrc: String
                 //      left arrow graphic URL
-                leftButtonSrc: dojo.uri.dojoUri("src/widget/templates/images/slider_left_arrow.png"),
+                leftButtonSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/slider_left_arrow.png"),
 
                 // rightButtonSrc: String
                 //      right arrow graphic URL
-                rightButtonSrc: dojo.uri.dojoUri("src/widget/templates/images/slider_right_arrow.png"),
+                rightButtonSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/slider_right_arrow.png"),
 
                 // backgroundSrc: String
                 //      slider background graphic URL
-                backgroundSrc: dojo.uri.dojoUri("src/widget/templates/images/blank.gif"),
+                backgroundSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/blank.gif"),
 
                 // progressBackgroundSrc: String
                 //      slider background graphic URL to overlay the normal background to show progress
-                progressBackgroundSrc: dojo.uri.dojoUri("src/widget/templates/images/blank.gif"),
+                progressBackgroundSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/blank.gif"),
 
                 // backgroundSize: String
@@ -185 +185 @@
                 // handleSrc: String
                 //      moveable slider graphic URL
-                handleSrc: dojo.uri.dojoUri("src/widget/templates/images/slider-button.png"),
+                handleSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/slider-button.png"),
 
                 // showButtons: Boolean
@@ -719 +719 @@
 
                 backgroundSize: "height:10px;width:200px;",
-                backgroundSrc: dojo.uri.dojoUri("src/widget/templates/images/slider-bg.gif"),
+                backgroundSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/slider-bg.gif"),
 
                 // flip: Boolean
@@ -803 +803 @@
 
                 backgroundSize: "width:10px;height:200px;",
-                backgroundSrc: dojo.uri.dojoUri("src/widget/templates/images/slider-bg-vert.gif"),
+                backgroundSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/slider-bg-vert.gif"),
 
                 // flip: Boolean

trunk/src/widget/SlideShow.js

@@ -24 +24 @@
                 */
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/SlideShow.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/SlideShow.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/SlideShow.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/SlideShow.css"),
 
                 // imgUrls: String[]

trunk/src/widget/Spinner.js

@@ -36 +36 @@
                 timeoutChangeRate: 0.90,
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/Spinner.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/Spinner.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Spinner.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Spinner.css"),
 
                 // incrementSrc: String
                 //      up arrow graphic URL
-                incrementSrc: dojo.uri.dojoUri("src/widget/templates/images/spinnerIncrement.gif"),
+                incrementSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/spinnerIncrement.gif"),
 
                 // decrementSrc: String
                 //      down arrow graphic URL
-                decrementSrc: dojo.uri.dojoUri("src/widget/templates/images/spinnerDecrement.gif"),
+                decrementSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/spinnerDecrement.gif"),
 
                 // does the keyboard related stuff

trunk/src/widget/SplitContainer.js

@@ -31 +31 @@
         isContainer: true,
 
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/SplitContainer.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/SplitContainer.css"),
 
         // activeSizing: Boolean

trunk/src/widget/TabContainer.js

@@ -30 +30 @@
 
         templateString: null,   // override setting in PageContainer
-        templatePath: dojo.uri.dojoUri("src/widget/templates/TabContainer.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/TabContainer.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/TabContainer.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/TabContainer.css"),
 
         fillInTemplate: function() {
@@ -181 +181 @@
                 //      This is an internal widget and shouldn't be instantiated directly.
 
-                imgPath: dojo.uri.dojoUri("src/widget/templates/images/tab_close.gif"),
+                imgPath: dojo.uri.moduleUri("dojo", "widget/templates/images/tab_close.gif"),
                 
                 templateString: "<div class='dojoTab' dojoAttachEvent='onClick;onKey'>"

trunk/src/widget/TaskBar.js

@@ -23 +23 @@
         caption: 'Untitled',
 
-        templatePath: dojo.uri.dojoUri("src/widget/templates/TaskBarItemTemplate.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/TaskBar.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/TaskBarItemTemplate.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/TaskBar.css"),
 
         fillInTemplate: function() {

trunk/src/widget/templates/Checkbox.html

@@ -1 +1 @@
 <span style="display: inline-block;" tabIndex="${this.tabIndex}" waiRole="${this._type}" id="${this.id}">
-        <img dojoAttachPoint="imageNode" class="${this.class}" src="${dojoRoot}src/widget/templates/images/blank.gif" alt="" />
+        <img dojoAttachPoint="imageNode" class="${this.class}" src="${dojoModuleUri}widget/templates/images/blank.gif" alt="" />
         <input type="${this._type}" name="${this.name}" style="display: none" value="${this.value}"
                 dojoAttachPoint="inputNode">

trunk/src/widget/templates/ComboButtonTemplate.html

@@ -11 +11 @@
                 dojoAttachEvent="onMouseOver:rightOver; onMouseOut:rightOut; onMouseDown:rightDown; onMouseUp:rightUp; onClick:rightClick;">
                 <img dojoAttachPoint="arrowBackgroundImage" style="position:absolute;top:0px;left:0px;z-index:1;">
-                <img src="${dojoRoot}src/widget/templates/images/whiteDownArrow.gif"
+                <img src="${dojoModuleUri}widget/templates/images/whiteDownArrow.gif"
                                 style="z-index:2;position:absolute;left:3px;top:50%;">
                 <img dojoAttachPoint="rightImage" style="position:absolute;top:0px;right:0px;">

trunk/src/widget/templates/DatePicker.html

@@ -11 +11 @@
                                                                         dojoAttachEvent="onClick: onIncrementWeek;" 
                                                                         class="incrementControl increase">
-                                                                        <img src="${dojoRoot}src/widget/templates/images/incrementMonth.png" 
+                                                                        <img src="${dojoModuleUri}widget/templates/images/incrementMonth.png" 
                                                                         alt="&darr;" style="width:7px;height:5px;" />
                                                                 </span>
@@ -17 +17 @@
                                                                         dojoAttachPoint="increaseMonthNode" 
                                                                         dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl increase">
-                                                                        <img src="${dojoRoot}src/widget/templates/images/incrementMonth.png" 
+                                                                        <img src="${dojoModuleUri}widget/templates/images/incrementMonth.png" 
                                                                                 alt="&darr;"  dojoAttachPoint="incrementMonthImageNode">
                                                                 </span>
@@ -24 +24 @@
                                                                         dojoAttachEvent="onClick: onIncrementWeek;" 
                                                                         class="incrementControl decrease">
-                                                                        <img src="${dojoRoot}src/widget/templates/images/decrementMonth.png" alt="&uarr;" style="width:7px;height:5px;" />
+                                                                        <img src="${dojoModuleUri}widget/templates/images/decrementMonth.png" alt="&uarr;" style="width:7px;height:5px;" />
                                                                 </span>
                                                                 <span 
                                                                         dojoAttachPoint="decreaseMonthNode" 
                                                                         dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl decrease">
-                                                                        <img src="${dojoRoot}src/widget/templates/images/decrementMonth.png" 
+                                                                        <img src="${dojoModuleUri}widget/templates/images/decrementMonth.png" 
                                                                                 alt="&uarr;" dojoAttachPoint="decrementMonthImageNode">
                                                                 </span>

trunk/src/widget/templates/MonthlyCalendar.html

@@ -6 +6 @@
                 dojoAttachEvent="onClick: onIncrementWeek;" 
                 class="incrementControl">
-                <img src="${dojoRoot}src/widget/templates/decrementWeek.gif" alt="&uarr;" />
+                <img src="${dojoModuleUri}widget/templates/decrementWeek.gif" alt="&uarr;" />
         </span>
         -->
@@ -12 +12 @@
                 dojoAttachPoint="decreaseMonthNode" 
                 dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl">
-                <img src="${dojoRoot}src/widget/templates/decrementMonth.gif" 
+                <img src="${dojoModuleUri}widget/templates/decrementMonth.gif" 
                         alt="&uarr;" dojoAttachPoint="decrementMonthImageNode">
         </span>
@@ -19 +19 @@
                 dojoAttachPoint="increaseMonthNode" 
                 dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl">
-                <img src="${dojoRoot}src/widget/templates/incrementMonth.gif" 
+                <img src="${dojoModuleUri}widget/templates/incrementMonth.gif" 
                         alt="&darr;"  dojoAttachPoint="incrementMonthImageNode">
         </span>
@@ -26 +26 @@
                         dojoAttachEvent="onClick: onIncrementWeek;" 
                         class="incrementControl">
-                        <img src="${dojoRoot}src/widget/templates/incrementWeek.gif" 
+                        <img src="${dojoModuleUri}widget/templates/incrementWeek.gif" 
                         alt="&darr;" />
                 </span>

trunk/src/widget/Textbox.js

@@ -61 +61 @@
                 htmlfloat: "none",
 
-                templatePath: dojo.uri.dojoUri("src/widget/templates/Textbox.html"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Textbox.html"),
         
                 // textbox DomNode:

trunk/src/widget/TimePicker.js

@@ -85 +85 @@
 {
         isContainer: false,
-        templatePath: dojo.uri.dojoUri("src/widget/templates/TimePicker.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/TimePicker.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/TimePicker.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/TimePicker.css"),
 
         postMixInProperties: function(localProperties, frag) {

trunk/src/widget/TitlePane.js

@@ -28 +28 @@
         open: true,
 
-        templatePath: dojo.uri.dojoUri("src/widget/templates/TitlePane.html"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/TitlePane.html"),
 
         postCreate: function() {

trunk/src/widget/Toaster.js

@@ -18 +18 @@
 
                 templateString: '<div dojoAttachPoint="clipNode"><div dojoAttachPoint="containerNode" dojoAttachEvent="onClick:onSelect"><div dojoAttachPoint="contentNode"></div></div></div>',
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/Toaster.css"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Toaster.css"),
                 
                 // messageTopic: String

trunk/src/widget/Toolbar.js

@@ -13 +13 @@
 
         templateString: '<div class="toolbarContainer" dojoAttachPoint="containerNode"></div>',
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/Toolbar.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Toolbar.css"),
 
         getItem: function(name) {
@@ -722 +722 @@
         templateString: '<span unselectable="on" class="toolbarItem toolbarSeparator"></span>',
 
-        defaultIconPath: new dojo.uri.dojoUri("src/widget/templates/buttons/sep.gif"),
+        defaultIconPath: new dojo.uri.moduleUri("dojo", "widget/templates/buttons/sep.gif"),
 
         fillInTemplate: function(args, frag, skip) {
@@ -817 +817 @@
                                         domNode.width = img.width||img.offsetWidth;
                                         domNode.height = img.height||img.offsetHeight;
-                                        domNode.setAttribute("src", dojo.uri.dojoUri("src/widget/templates/images/blank.gif").uri);
+                                        domNode.setAttribute("src", dojo.uri.moduleUri("dojo", "widget/templates/images/blank.gif").uri);
                                         domNode.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+img.src+"',sizingMethod='image')";
                                 } else {

trunk/src/widget/Tooltip.js

@@ -36 +36 @@
                 connectId: "",
 
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/TooltipTemplate.css"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/TooltipTemplate.css"),
 
                 postCreate: function(args, frag){

trunk/src/widget/Tree.js

@@ -69 +69 @@
         DNDAcceptTypes: "",
 
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/images/Tree/Tree.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/Tree.css"),
 
         templateString: '<div class="dojoTree"></div>',
@@ -100 +100 @@
         //
 
-        blankIconSrc: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_blank.gif"),
-
-        gridIconSrcT: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_t.gif"), // for non-last child grid
-        gridIconSrcL: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_l.gif"), // for last child grid
-        gridIconSrcV: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_v.gif"), // vertical line
-        gridIconSrcP: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_p.gif"), // for under parent item child icons
-        gridIconSrcC: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_c.gif"), // for under child item child icons
-        gridIconSrcX: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_x.gif"), // grid for sole root item
-        gridIconSrcY: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_y.gif"), // grid for last rrot item
-        gridIconSrcZ: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_grid_z.gif"), // for under root parent item child icon
-
-        expandIconSrcPlus: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_expand_plus.gif"),
-        expandIconSrcMinus: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_expand_minus.gif"),
-        expandIconSrcLoading: dojo.uri.dojoUri("src/widget/templates/images/Tree/treenode_loading.gif"),
+        blankIconSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_blank.gif"),
+
+        gridIconSrcT: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_t.gif"), // for non-last child grid
+        gridIconSrcL: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_l.gif"), // for last child grid
+        gridIconSrcV: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_v.gif"), // vertical line
+        gridIconSrcP: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_p.gif"), // for under parent item child icons
+        gridIconSrcC: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_c.gif"), // for under child item child icons
+        gridIconSrcX: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_x.gif"), // grid for sole root item
+        gridIconSrcY: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_y.gif"), // grid for last rrot item
+        gridIconSrcZ: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_grid_z.gif"), // for under root parent item child icon
+
+        expandIconSrcPlus: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_expand_plus.gif"),
+        expandIconSrcMinus: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_expand_minus.gif"),
+        expandIconSrcLoading: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/treenode_loading.gif"),
 
 

trunk/src/widget/TreeDisableWrapExtension.js

@@ -13 +13 @@
          * can't unlisten
          */
-        templateCssPath: dojo.uri.dojoUri( "src/widget/templates/TreeDisableWrap.css" ),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/TreeDisableWrap.css" ),
                 
         listenTree: function(tree) {

trunk/src/widget/TreeDocIconExtension.js

@@ -15 +15 @@
          */
         
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/TreeDocIcon.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/TreeDocIcon.css"),
 
         

trunk/src/widget/TreeNode.js

@@ -40 +40 @@
 
         childIconSrc: "",
-        childIconFolderSrc: dojo.uri.dojoUri("src/widget/templates/images/Tree/closed.gif"), // for under root parent item child icon,
-        childIconDocumentSrc: dojo.uri.dojoUri("src/widget/templates/images/Tree/document.gif"), // for under root parent item child icon,
+        childIconFolderSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/closed.gif"), // for under root parent item child icon,
+        childIconDocumentSrc: dojo.uri.moduleUri("dojo", "widget/templates/images/Tree/document.gif"), // for under root parent item child icon,
 
         childIcon: null,

trunk/src/widget/TreeV3.js

@@ -92 +92 @@
 
     // will have cssRoot before it 
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/TreeV3.css"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/TreeV3.css"),
 
         templateString: '<div style="${this.style}">\n</div>',

trunk/src/widget/ValidationTextbox.js

@@ -50 +50 @@
                 lastCheckedValue: null,
         
-                templatePath: dojo.uri.dojoUri("src/widget/templates/ValidationTextbox.html"),
-                templateCssPath: dojo.uri.dojoUri("src/widget/templates/Validate.css"),
+                templatePath: dojo.uri.moduleUri("dojo", "widget/templates/ValidationTextbox.html"),
+                templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Validate.css"),
                 
                 // new DOM nodes

trunk/src/widget/Wizard.js

@@ -19 +19 @@
         //              procedure like an install
         
-        templatePath: dojo.uri.dojoUri("src/widget/templates/Wizard.html"),
-        templateCssPath: dojo.uri.dojoUri("src/widget/templates/Wizard.css"),
+        templatePath: dojo.uri.moduleUri("dojo", "widget/templates/Wizard.html"),
+        templateCssPath: dojo.uri.moduleUri("dojo", "widget/templates/Wizard.css"),
 
         // selected: DomNode