Merge branch 'dev' of github.com:mozilla/browserid into dev

mozilla · May 4, 2012 · 4ecc153 · 4ecc153
2 parents af324ae + 6b273a7
commit 4ecc153
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/resources/static/include_js/include.js b/resources/static/include_js/include.js
@@ -1111,20 +1111,18 @@
     };
 
     navigator.id = {
-      // The experimental API, not yet final
-      experimental: {
-        request: function(options) {
-          checkCompat(false);
-          return internalRequest(options);
-        },
-        watch: function(options) {
-          checkCompat(false);
-          internalWatch(options);
-        }
+      request: function(options) {
+        options = options || {};
+        checkCompat(false);
+        return internalRequest(options);
+      },
+      watch: function(options) {
+        checkCompat(false);
+        internalWatch(options);
       },
       // logout from the current website
-      // NOTE: callback argument will be deprecated when experimental API lands, to
-      //       be replaced with the .onlogout observer of the watch api.
+      // The callback parameter is DEPRECATED, instead you should use the
+      // the .onlogout observer of the .watch() api.
       logout: function(callback) {
         // allocate iframe if it is not allocated
         _open_hidden_iframe();

diff --git a/resources/static/test/cases/include.js b/resources/static/test/cases/include.js
@@ -16,18 +16,11 @@
     _.each([
       "get",
       "getVerifiedEmail",
-      "logout"
-    ], function(item, index) {
-      equal(typeof navigator.id[ item ], "function", "navigator.id." + item + " is available");
-    });
-  });
-
-  test("expected experimental API function is available", function() {
-    _.each([
+      "logout",
       "request",
       "watch"
     ], function(item, index) {
-      equal(typeof navigator.id.experimental[ item ], "function", "navigator.id." + item + " is available");
+      equal(typeof navigator.id[ item ], "function", "navigator.id." + item + " is available");
     });
   });