Allow for an xhtml config option that uses document.createElementNS if it is true.

jrburke · jrburke · commit bae4af51c258 · 2011-06-13T22:00:27.000-07:00
diff --git a/docs/api.html b/docs/api.html
@@ -574,6 +574,8 @@ <h2>
 
 <p id="config-priority"><strong>priority</strong>: An array of module/file names to load immediately, before tracing down any other dependencies. This allows you to set up a small set of files that are downloaded in parallel that contain most of the modules and their dependencies already built in. More information is in the <a href="faq-optimization#priority">Optimization FAQ, Priority Downloads</a>.<b>Note:</b> resources loaded by loader plugins (like 'text!template.html') <b>cannot</b> be specified in the priority array: the priority mechanism only works with regular JavaScript resources.</p>
 
+<p id="config-xhtml"><strong>xhtml</strong>: If set to true, document.createElementNS() will be used to create script elements.</p>
+
 <p id="config-urlArgs"><strong>urlArgs</strong>: Extra query string arguments appended to URLs that RequireJS uses to fetch resources. Most useful to cache bust when the browser or server is not configured correctly. Example cache bust setting for urlArgs:</p>
 
 <pre><code>urlArgs: "bust=" +  (new Date()).getTime()
diff --git a/order.js b/order.js
@@ -132,7 +132,7 @@
                         req: req,
                         onLoad: onLoad
                     });
-                    require.attach(url, "", name, scriptCacheCallback, "script/cache");
+                    require.attach(url, null, name, scriptCacheCallback, "script/cache");
                 }
             }
         }
diff --git a/require.js b/require.js
@@ -1499,8 +1499,8 @@ var require, define;
      * @param {Object} url the URL to the module.
      */
     req.load = function (context, moduleName, url) {
-        var contextName = context.contextName,
-            loaded = context.loaded;
+        var loaded = context.loaded;
+
         isDone = false;
 
         //Only set loaded to false for tracking if it has not already been set.
@@ -1509,7 +1509,7 @@ var require, define;
         }
 
         context.scriptCount += 1;
-        req.attach(url, contextName, moduleName);
+        req.attach(url, context, moduleName);
 
         //If tracking a jQuery, then make sure its ready callbacks
         //are put on hold to prevent its ready callbacks from
@@ -1669,17 +1669,19 @@ var require, define;
      * environment. Right now only supports browser loading,
      * but can be redefined in other environments to do the right thing.
      * @param {String} url the url of the script to attach.
-     * @param {String} contextName the name of the context that wants the script.
+     * @param {Object} context the context that wants the script.
      * @param {moduleName} the name of the module that is associated with the script.
      * @param {Function} [callback] optional callback, defaults to require.onScriptLoad
      * @param {String} [type] optional type, defaults to text/javascript
      */
-    req.attach = function (url, contextName, moduleName, callback, type) {
-        var node, loaded, context;
+    req.attach = function (url, context, moduleName, callback, type) {
+        var node, loaded;
         if (isBrowser) {
             //In the browser so use a script tag
             callback = callback || req.onScriptLoad;
-            node = document.createElement("script");
+            node = context && context.config && context.config.xhtml ?
+                    document.createElementNS("http://www.w3.org/1999/xhtml", "html:script") :
+                    document.createElement("script");
             node.type = type || "text/javascript";
             node.charset = "utf-8";
             //Use async so Gecko does not block on executing the script if something
@@ -1694,7 +1696,7 @@ var require, define;
             //plugin
             node.async = !s.skipAsync[url];
 
-            node.setAttribute("data-requirecontext", contextName);
+            node.setAttribute("data-requirecontext", context.contextName);
             node.setAttribute("data-requiremodule", moduleName);
 
             //Set up load listener. Test attachEvent first because IE9 has
@@ -1737,7 +1739,6 @@ var require, define;
             //are in play, the expectation that a build has been done so that
             //only one script needs to be loaded anyway. This may need to be
             //reevaluated if other use cases become common.
-            context = contexts[contextName];
             loaded = context.loaded;
             loaded[moduleName] = false;
 
diff --git a/tasks.txt b/tasks.txt
@@ -19,6 +19,20 @@ https://github.com/mozilla/chromeless/commit/cdc5e90ff2cb3316caa8e0c17533cc8d6c5
 https://github.com/mozilla/chromeless/blob/cdc5e90ff2cb3316caa8e0c17533cc8d6c5b3ea0/tests/requirejs/require.js.patch
 
 
+- anonymous define call 4th case:
+We found a fourth path, two calls to define() in one file.
+require-debug.js reports this error as:
+      Second anonymous define(): <the text of the second function found>
+so then you can search for the text of the second function to perhaps understand the problem.
+
+Docs:
+- http://requirejs.org/docs/api.html#jsfiles make the "plain script tag rules"
+  more of a bulleted list to call them out.
+- Update api.html#define to indicate commonjs wrapper.
+- Interaction of node_modules and paths in r.js
+- Pointer to motivations behind current thing, reason for dependencies.
+
+
 - Update the coffeescript plugin to use the writeFile API?
 
 - jjb's diagnostic/debug branch with dependency mappings
@@ -49,12 +63,6 @@ https://github.com/mozilla/chromeless/blob/cdc5e90ff2cb3316caa8e0c17533cc8d6c5b3
   selenium tests.
   - http://trac.dojotoolkit.org/ticket/13113
 
-Docs:
-- http://requirejs.org/docs/api.html#jsfiles make the "plain script tag rules"
-  more of a bulleted list to call them out.
-- Update api.html#define to indicate commonjs wrapper.
-- Pointer to motivations behind current thing, reason for dependencies.
-
 - https://github.com/jrburke/requirejs/pull/71: process by 2/21
 
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`req: req,`
`133`	`133`	`onLoad: onLoad`
`134`	`134`	`});`
`135`		`- require.attach(url, "", name, scriptCacheCallback, "script/cache");`
	`135`	`+ require.attach(url, null, name, scriptCacheCallback, "script/cache");`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`}`