Add GCF meta tag, update baseUrl refs in docs to not include slash, document that JSONP support is restricted to objects only. Closes requirejs#60

jrburke · jrburke · commit cc0c64d2aa06 · 2011-02-05T20:55:27.000-08:00
diff --git a/dist/pre.html b/dist/pre.html
@@ -2,10 +2,14 @@
 <html>
 <head>
     <title>RequireJS</title>
+
+    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+
     <link rel="stylesheet" type="text/css" href="main.css">
     <link rel="icon" type="image/x-icon" href="/favicon.png">
     <!--[if IE]> <link rel="stylesheet" type="text/css" href="ie.css" /> <![endif]-->
     <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/dojo/1.4/dojox/highlight/resources/highlight.css">
+
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
     <script type="text/javascript" src="init.js"></script>
     <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.4/dojo/dojo.xd.js"></script>
diff --git a/docs/api.html b/docs/api.html
@@ -422,6 +422,8 @@ <h3><a name="jsonp">Specify a JSONP Service Dependency</a><span class="sectionMa
 
 <p>This use of JSONP should be limited to JSONP services for initial application setup. If the JSONP service times out, it means other modules you define via define() may not get executed, so the error handling is not robust.</p>
 
+<p><strong>Only JSONP return values that are JSON objects are supported</strong>. A JSONP response that is an array, a string or a number will not work.</p>
+
 <p>This functionality should not be used for long-polling JSONP connections -- APIs that deal with real time streaming. Those kinds of APIs should do more script cleanup after receiving each response, and RequireJS will only fetch a JSONP URL once -- subsequent uses of the same URL as a dependency in a require() or define() call will get a cached value.</p>
 
 <p>Errors in loading a JSONP service are normally surfaced via timeouts for the service, since script tag loading does not give much detail into network problems. To detect errors, you can override require.onError() to get errors. The error object passed to the onerror function will contain two properties if it is a timeout issue:</p>
@@ -475,7 +477,7 @@ <h2>
 <pre><code>&lt;script type="text/javascript" src="scripts/require.js"&gt;&lt;/script&gt;
 &lt;script type="text/javascript"&gt;
   require({
-          baseUrl: "/another/path/",
+          baseUrl: "/another/path",
           paths: {
               "some": "some/v1.0"
           },
@@ -813,7 +815,7 @@ <h3><a name="multiversion">Multiversion Support</a><span class="sectionMark">&se
 &lt;script type="text/javascript"&gt;
 require({
       context: "version1",
-      baseUrl: "version1/"
+      baseUrl: "version1"
     },
     ["require", "alpha", "beta",],
     function(require, alpha, beta) {
@@ -833,7 +835,7 @@ <h3><a name="multiversion">Multiversion Support</a><span class="sectionMark">&se
 
 require({
       context: "version2",
-      baseUrl: "version2/"
+      baseUrl: "version2"
     },
     ["require", "alpha", "beta"],
     function(require, alpha, beta) {
diff --git a/docs/faq-advanced.html b/docs/faq-advanced.html
@@ -26,7 +26,7 @@ <h4>1) Modify the source of require.js</h4>
     //just use an simple object literal, {}. You may need
     //to at least set baseUrl.
     var require = {
-        baseUrl: '../'
+        baseUrl: '..'
     };
 
     //INSERT require.js CONTENTS HERE
diff --git a/docs/jquery-require-sample/webapp/scripts/app.build.js b/docs/jquery-require-sample/webapp/scripts/app.build.js
@@ -1,6 +1,6 @@
 ({
     appDir: "../",
-    baseUrl: "scripts/",
+    baseUrl: "scripts",
     dir: "../../webapp-build",
     //Comment out the optimize line if you want
     //the code minified by Closure Compiler using
diff --git a/docs/jquery.html b/docs/jquery.html
@@ -106,7 +106,7 @@ <h2>
 
 <pre><code>({
     appDir: "../",
-    baseUrl: "scripts/",
+    baseUrl: "scripts",
     dir: "../../webapp-build",
     //Comment out the optimize line if you want
     //the code minified by Closure Compiler using
diff --git a/docs/optimization.html b/docs/optimization.html
@@ -192,7 +192,7 @@ <h2><a name="wholeproject">Optimizing a whole project</a><span class="sectionMar
 
 <pre><code>({
     appDir: "../",
-    baseUrl: "scripts/",
+    baseUrl: "scripts",
     dir: "../../appdirectory-build",
     modules: [
         {
@@ -244,7 +244,7 @@ <h2><a name="hasjs">Integration with has.js</a><span class="sectionMark">&sect;
 
 <pre><code>
 ({
-    baseUrl: "./",
+    baseUrl: ".",
     name: "hasTestModule",
     out: "builds/hasTestModule.js",
     has: {
diff --git a/tasks.txt b/tasks.txt
@@ -6,13 +6,12 @@ Release Notes
 * Node adapter now assumes old node modules always on require.paths: em.com.
 
 - Update documentation for new tools.
+- Document that JSONP support only works with objects: https://github.com/jrburke/requirejs/issues/#issue/60
+- Update AMD page to mention require scanning means only do them at the top.
+- Update docs to mention r.js is rhino and node adapter?
 
 - update to jQuery 1.5: or just put in the version detection?
 
-- Remove / from baseUrl examples.
-
-- Update docs to mention r.js is rhino and node adapter?
-
 - "libs/static.lib.02", //kaaahhhhnnnn!!!
 - build jquery, but use allplugins file, specify an order dependency,
   the build breaks because of partial order! plugin evaluation. Need to
@@ -21,6 +20,7 @@ Release Notes
 
 - .js removal from main packages config?
 - data-main change/baseUrl change?
+   - baseUrlMatch is no longer needed?
 
 - Build the optimizer as its own project, at least enough to take out the
   work from jquery-require-sample
@@ -40,8 +40,6 @@ Release Notes
 
 - Update copyrights to 2011
 - How to use with Dojo page: http://trac.dojotoolkit.org/ticket/12200
-- Document that JSONP support only works with objects: https://github.com/jrburke/requirejs/issues/#issue/60
-- add gcf to pages
 
 - From Richard Backhouse: As an FYI I have been doing my own investigation of using UglifyJS for compression
 and one thing I found when trying to compress dojo 1.5 code was that I had ensure that "make_seqs"
@@ -51,8 +49,6 @@ flag was set to false when calling ast_squeeze. If I left this flag set to true
 
 - Don't put use strict at the top of files? https://github.com/jrburke/requirejs/issues#issue/61
 
-- Update AMD page to mention require scanning means only do them at the top.
-
 - Build with requireplugins-jquery.js uses bad definition for require/text, probably other plugins. Use a jqueryStub.js
   for builds that need it with plain define, and allow the build system to load
   the plugins. A problem, since previously built layers with plugins in them
@@ -69,11 +65,6 @@ flag was set to false when calling ast_squeeze. If I left this flag set to true
 
 - ending slash in paths should throw error: https://github.com/jrburke/requirejs/issues/issue/49/
 
-- John's email about an error callback, also allow loader to abort a plugin-loaded resource?
-
-- jquery/jqueryDynamic2.html in IE8: sometimes if using cache, the jquery ready callbacks do not fire,
-  even though we seem to indicate it correctly? Trace latest jQuery 1.4.4.
-
 - Document new closure compiler options from neonstalwart
 - require.modify alternative syntax/patch.
 - has.js plugins
