example/php-tictactoe/tic-tac-toe.js

@@ -35,7 +35,7 @@ JX.behavior('tic-tac-toe', function() {
             changeState(board, 'play');
           }
         })
-        .setData({game: JX.JSON.serialize(game)})
+        .setData({game: JX.JSON.stringify(game)})
         .send();
     });
 

scripts/sync-to-facebook.php

@@ -5,7 +5,7 @@
 require_once 'sync-spec.php';
 
 if ($argc != 2) {
-  echo "usage: sync-to-facebook <php_root>\n";
+  echo "usage: sync-to-facebook.php <php_root>\n";
   exit(1);
 }
 

src/core/Stratcom.js

@@ -582,6 +582,12 @@ JX.install('Stratcom', {
         var index = meta_id[1];
         if (block && (index in block)) {
           return block[index];
+        } else if (__DEV__) {
+          JX.$E(
+            'JX.Stratcom.getData(<node>): Tried to access data (block ' +
+            meta_id[0] + ', index ' + index + ') that was not present. This ' +
+            'probably means you are calling getData() before the block ' +
+            'is provided by mergeData().');
         }
       }
 

src/core/__tests__/stratcom.js

@@ -149,6 +149,23 @@ describe('Stratcom Tests', function() {
     });
   });
 
+  it('should throw when accessing data in an unloaded block', function() {
+    ensure__DEV__(true, function() {
+
+      var n = JX.$N('div');
+      n.setAttribute('data-meta', '9999999_9999999');
+
+      var caught;
+      try {
+        JX.Stratcom.getData(n);
+      } catch (error) {
+        caught = error;
+      }
+
+      expect(caught instanceof Error).toEqual(true);
+    });
+  });
+
   // it('can set data serializer', function() {
   //   var uri = new JX.URI('http://www.facebook.com/home.php?key=value');
   //   uri.setQuerySerializer(JX.PHPQuerySerializer.serialize);

src/docs/facebook.diviner

@@ -34,7 +34,7 @@ Now you should be able to build the individual binaries:
 
 To synchronize Javelin **from** Facebook trunk, run the synchronize script:
 
-  javelin/ $ ./scripts/synchronize-from-facebook.php ~/www
+  javelin/ $ ./scripts/sync-from-facebook.php ~/www
 
 ...where ##~/www## is the root you want to pull Javelin files from. The script
 will copy files out of ##html/js/javelin## and build packages, and leave the
@@ -44,7 +44,7 @@ then push, diff, or send a pull request.
 To synchronize Javelin **to** Facebook trunk, run the, uh, reverse-synchronize
 script:
 
-  javelin/ $ ./scripts/synchronize-to-facebook.php ~/www
+  javelin/ $ ./scripts/sync-to-facebook.php ~/www
 
 ...where ##~/www## is the root you want to push Javelin files to. The script
 will copy files out of the working copy into your ##www## and leave you with a

src/lib/DOM.js

@@ -536,7 +536,8 @@ JX.install('DOM', {
         var type = elements[ii].type;
         var tag  = elements[ii].tagName;
         if ((type in {radio: 1, checkbox: 1} && elements[ii].checked) ||
-             type in {text: 1, hidden: 1, password: 1, email: 1} ||
+             type in {text: 1, hidden: 1, password: 1, email: 1, tel: 1,
+                      number: 1} ||
              tag in {TEXTAREA: 1, SELECT: 1}) {
           data.push([elements[ii].name, elements[ii].value]);
         }

src/lib/behavior.js

@@ -42,15 +42,19 @@ JX.behavior = function(name, control_function) {
         'initialization function is not a function.');
     }
     // IE does not enumerate over these properties
-    var enumerables = [
-      'toString', 'hasOwnProperty', 'valueOf', 'isPrototypeOf',
-      'propertyIsEnumerable', 'toLocaleString', 'constructor'
-    ];
-    if (~enumerables.indexOf(name)) {
+    var enumerables = {
+      toString: true,
+      hasOwnProperty: true,
+      valueOf: true,
+      isPrototypeOf: true,
+      propertyIsEnumerable: true,
+      toLocaleString: true,
+      constructor: true
+    };
+    if (enumerables[name]) {
       JX.$E(
         'JX.behavior("' + name + '", <garbage>): ' +
-        'do not use any of these properties as behaviors: ' +
-        enumerables.join(', ')
+        'do not use this property as a behavior.'
       );
     }
   }

src/lib/control/typeahead/source/TypeaheadSource.js

@@ -55,8 +55,15 @@ JX.install('TypeaheadSource', {
      *    - **name**: the string used for matching against user input.
      *    - **uri**: the URI corresponding with the object (must be present
      *      but need not be meaningful)
+     *
+     * You can also give:
      *    - **display**: the text or nodes to show in the DOM. Usually just the
      *      same as ##name##.
+     *    - **tokenizable**: if you want to tokenize something other than the
+     *      ##name##, for the typeahead to complete on, specify it here.  A
+     *      selected entry from the typeahead will still insert the ##name##
+     *      into the input, but the ##tokenizable## field lets you complete on
+     *      non-name things.
      *
      * The default transformer expects a three element list with elements
      * [name, uri, id]. It assigns the first element to both ##name## and
@@ -167,7 +174,7 @@ JX.install('TypeaheadSource', {
       }
 
       this._raw[obj.id] = obj;
-      var t = this.tokenize(obj.name);
+      var t = this.tokenize(obj.tokenizable || obj.name);
       for (var jj = 0; jj < t.length; ++jj) {
         this._lookup[t[jj]] = this._lookup[t[jj]] || [];
         this._lookup[t[jj]].push(obj.id);

support/javelinsymbols/javelinsymbols.cpp

@@ -17,31 +17,39 @@ typedef map<string, int> symbol_t;
 
 string get_static_member_symbol(Node *node);
 
-void find_symbols(Node *node, symbol_t &installs, symbol_t &uses) {
+void find_symbols(Node *node, symbol_t &installs, symbol_t &behaviors,
+                  symbol_t &uses) {
   if (node == NULL) {
     return;
   }
-  
+
   if (typeid(*node) == typeid(NodeStaticMemberExpression)) {
     string symbol = get_static_member_symbol(node);
     if (symbol[0] == 'J' && symbol[1] == 'X' && symbol[2] == '.') {
       uses[symbol] = node->lineno();
     }
   }
-  
+
   if (typeid(*node) == typeid(NodeFunctionCall)) {
     Node *call = *node->childNodes().begin();
     if (static_cast<NodeStaticMemberExpression *>(call)) {
-      if (get_static_member_symbol(call) == "JX.install") {
-        NodeArgList *args = static_cast<NodeArgList*>(*(++node->childNodes().begin()));
-        NodeStringLiteral* lit = static_cast<NodeStringLiteral*>(*args->childNodes().begin());
-        installs[lit->unquoted_value()] = node->lineno();
+      string symbol = get_static_member_symbol(call);
+      if (symbol == "JX.install" || symbol == "JX.behavior") {
+        NodeArgList *args =
+          static_cast<NodeArgList*>(*(++node->childNodes().begin()));
+        NodeStringLiteral* lit =
+          static_cast<NodeStringLiteral*>(*args->childNodes().begin());
+        if (symbol == "JX.install") {
+          installs[lit->unquoted_value()] = node->lineno();
+        } else {
+          behaviors[lit->unquoted_value()] = node->lineno();
+        }
       }
     }
   }
-  
+
   for_nodes(node, ii) {
-    find_symbols(*ii, installs, uses);
+    find_symbols(*ii, installs, behaviors, uses);
   }
 }
 
@@ -65,26 +73,30 @@ string get_static_member_symbol(Node *node) {
       symbol += get_static_member_symbol(*ii);
     }
   }
-  
+
   return symbol;
 }
 
 int main(int argc, char* argv[]) {
   try {
     NodeProgram root(stdin); // parses
-    
+
     symbol_t installs;
+    symbol_t behaviors;
     symbol_t uses;
-    
-    find_symbols(&root, installs, uses);
-    
+
+    find_symbols(&root, installs, behaviors, uses);
+
     for (symbol_t::iterator ii = installs.begin(); ii != installs.end(); ++ii) {
       cout << "+" << ii->first << ":" << ii->second << endl;
     }
+    for (symbol_t::iterator ii = behaviors.begin(); ii != behaviors.end(); ++ii) {
+      cout << "*" << ii->first << ":" << ii->second << endl;
+    }
     for (symbol_t::iterator ii = uses.begin(); ii != uses.end(); ++ii) {
       cout << "?" << ii->first << ":" << ii->second << endl;
     }
-    
+
   } catch (ParseException ex) {
     printf("Parse Error: %s\n", ex.what());
     return 1;