Convert text plugin to use question mark instead of bang for the strip option, and confirm code works for a built xdomain case.

jrburke · jrburke · commit 77dec29e0dc8 · 2011-05-26T17:16:08.000-07:00
diff --git a/docs/api.html b/docs/api.html
@@ -414,9 +414,9 @@ <h3><a name="text">Specify a Text File Dependency</a><span class="sectionMark">&
 
 <p>Notice the .html and .css suffixes to specify the extension of the file. The "some/module" part of the path will be resolved according to normal module name resolution: it will use the <strong>baseUrl</strong> and <strong>paths</strong> <a href="#config">configuration options</a> to map that name to a path.</p>
 
-<p>For HTML/XML/SVG files, there is another option. You can pass !strip, which strips XML declarations so that external SVG and XML documents can be added to a document without worry. Also, if the string is an HTML document, only the part inside the body tag is returned. Example:</p>
+<p>For HTML/XML/SVG files, there is another option. You can pass ?strip, which strips XML declarations so that external SVG and XML documents can be added to a document without worry. Also, if the string is an HTML document, only the part inside the body tag is returned. Example:</p>
 
-<pre><code>require(["text!some/module.html!strip"],
+<pre><code>require(["text!some/module.html?strip"],
     function(html) {
         //the html variable will be the text of the
         //some/module.html file, but only the part
diff --git a/tasks.txt b/tasks.txt
@@ -5,11 +5,12 @@ Release Notes
   See the optimization.html for the requireLib example.
 - New optimizer/node/rhino adapter: r.js
 - Removed support for lib in packages.
-
+- text plugin API changed? Uses ?strip instead of !strip now.
 Next release
 --------------
 
 - text plugins after a build load xdomain?
+  - Send impl to list
 
 - relative modules IDs?
   - excludeShallow not excluding files loaded with the text plugin: email thread. Exclusions.
@@ -19,6 +20,8 @@ Next release
 
 - empty: protocol support for build profiles?
 
+- Put in helpful error in r.js if running it without -o option.
+
 - replacement for modify that intercepts callbacks, holds off until another module loads them?
   - A way to show dependency graph too?
 - Minify the require.js files with UglifyJS.
diff --git a/tests/text/separate.js b/tests/text/separate.js
@@ -0,0 +1,2 @@
+//Stub file for testing optimization of all plugin resources in a build.
+define(['text!resources/sample.html?strip'], function () {});
diff --git a/tests/text/subwidget.js b/tests/text/subwidget.js
@@ -1,5 +1,5 @@
 require.def("subwidget",
-  ["text!subwidget.html!strip", "text!subwidget2.html"],
+  ["text!subwidget.html?strip", "text!subwidget2.html"],
   function(template, template2) {
     return {
       name: "subwidget",
diff --git a/tests/text/text.html b/tests/text/text.html
@@ -12,7 +12,7 @@
                 text: "../../text"
             } //, priority: ['widgetlayer']
         },
-        ["require", "widget", "local", "text!resources/sample.html!strip"],
+        ["require", "widget", "local", "text!resources/sample.html?strip"],
         function(require, widget, local, sampleText) {
             doh.register(
                 "text",
diff --git a/tests/text/textOnly.html b/tests/text/textOnly.html
@@ -12,7 +12,7 @@
                 text: "../../text"
             }
         },
-        ["text!resources/sample.html!strip"],
+        ["text!resources/sample.html?strip"],
         function(sampleText) {
             doh.register(
                 "textOnly",
diff --git a/text.js b/text.js
@@ -138,7 +138,7 @@
 
             /**
              * Parses a resource name into its component parts. Resource names
-             * look like: module/name.ext!strip, where the !strip part is
+             * look like: module/name.ext?strip, where the ?strip part is
              * optional.
              * @param {String} name the resource name
              * @returns {Object} with properties "moduleName", "ext" and "strip"
@@ -149,7 +149,7 @@
                     modName = name.substring(0, index),
                     ext = name.substring(index + 1, name.length);
 
-                index = ext.indexOf("!");
+                index = ext.indexOf("?");
                 if (index !== -1) {
                     //Pull off the strip arg.
                     strip = ext.substring(index + 1, ext.length);
@@ -201,15 +201,16 @@
             },
 
             load: function (name, req, onLoad, config) {
-                //Name has format: some.module.filext!strip
+                //Name has format: some.module.filext?strip
                 //The strip part is optional.
                 //if strip is present, then that means only get the string contents
                 //inside a body tag in an HTML string. For XML/SVG content it means
                 //removing the <?xml ...?> declarations so the content can be inserted
                 //into the current doc without problems.
 
                 var parsed = text.parseName(name),
-                    url = req.toUrl(parsed.moduleName + "." + parsed.ext);
+                    nonStripName = parsed.moduleName + '.' + parsed.ext,
+                    url = req.toUrl(nonStripName);
 
                 //Load the text. Use XHR if possible and in a browser.
                 if (!hasLocation || text.canUseXhr(url)) {
@@ -220,8 +221,8 @@
                     //Need to fetch the resource across domains. Assume
                     //the resource has been optimized into a JS module. Fetch
                     //by the module name + extension, but do not include the
-                    //!strip part to avoid file system issues.
-                    req([name], function (content) {
+                    //?strip part to avoid file system issues.
+                    req([nonStripName], function (content) {
                         text.finishLoad(parsed.moduleName + '.' + parsed.ext,
                                         parsed.strip, content, onLoad, config);
                     });
@@ -246,7 +247,7 @@
 
                 //Leverage own load() method to load plugin value, but only
                 //write out values that do not have the strip argument,
-                //to avoid any potential issues with ! in file names.
+                //to avoid any potential issues with ? in file names.
                 text.load(nonStripName, req, function (value) {
                     //Use own write() method to construct full module value.
                     text.write(pluginName, nonStripName, function (contents) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+//Stub file for testing optimization of all plugin resources in a build.`
	`2`	`+define(['text!resources/sample.html?strip'], function () {});`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`text: "../../text"`
`13`	`13`	`}`
`14`	`14`	`},`
`15`		`- ["text!resources/sample.html!strip"],`
	`15`	`+ ["text!resources/sample.html?strip"],`
`16`	`16`	`function(sampleText) {`
`17`	`17`	`doh.register(`
`18`	`18`	`"textOnly",`