Update tasks, fix jsonp test that failed because end point API changed.

requirejs · Dec 24, 2011 · bd9f08a · bd9f08a
1 parent 79d798a
commit bd9f08a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/tasks.txt b/tasks.txt
@@ -1,23 +1,20 @@
 Release Notes
 -------------------
 
-- check for latest uglifyjs before releasing.
-
 1.1 items?
 --------------
 - map stuff
 - remove special jquery detection, only do it for define() calls.
 - check bug list
 - robust handling for anon modules loaded outside loader.
-
+- read config from main.js file for build?
 
 Next release
 --------------
 
-- global and local? nocontext thing?
+- update optimization page to mention copying config to build.
 
-- almond update for jQuery
-  - Test example with underscore and backbone
+- global and local? nocontext thing?
 
 - make a decision matrix of when to use what. Mention lowercase names for file name convention.
 

diff --git a/tests/jsonp/jsonp.html b/tests/jsonp/jsonp.html
@@ -12,34 +12,26 @@
                 require: "../../require"
             }
         },
-        ["require", "lamp", "http://www.google.com/jsapi?callback=define"],
-        function (require, lamp, googleAjaxReady) {
-            //JSAPI is now loaded, load the language API pack
-            google.load("language", "1", {
-                callback: function () {
-                    //Language API pack now loaded, use it.
-                    google.language.translate("book", "en", "es", function(result) {
-                        doh.register(
-                            "jsonp",
-                            [
-                                function jsonp(t){
-                                    t.is("libro", result.translation);
-                                    t.is('blue', lamp.color);
-                                }
-                            ]
-                        );
-                        doh.run();
-                    });
-                }
-            });
+        ["require", "lamp", "https://api.twitter.com/1/users/show.json?screen_name=jrburke&callback=define"],
+        function (require, lamp, user) {
+            doh.register(
+                "jsonp",
+                [
+                    function jsonp(t){
+                        t.is("James Burke", user.name);
+                        t.is('blue', lamp.color);
+                    }
+                ]
+            );
+            doh.run();
         }
     );
     </script>
 </head>
 <body>
     <h1>require.js: JSONP Test</h1>
     <p>Test for usage of a JSONP URL as a dependency.</p>
-    <strong>REQUIRES access to internet/Google to run the test. Otherwise it will fail.</strong>
+    <strong>REQUIRES access to internet/Twitter to run the test. Otherwise it will fail.</strong>
     <p>Check console for messages</p>
 </body>
 </html>