zpao

diff --git a/.travis.yml b/.travis.yml
index c12cae6..cf0ded3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,15 +31,7 @@ env:
   matrix:
   - TEST_TYPE=test
   - TEST_TYPE=lint
-  - TEST_TYPE=perf:full
-  - TEST_TYPE=test:coverage

zpao

diff --git a/src/browser/ui/dom/HTMLDOMPropertyConfig.js b/src/browser/ui/dom/HTMLDOMPropertyConfig.js
index b3f569e..c2448f3 100644
--- a/src/browser/ui/dom/HTMLDOMPropertyConfig.js
+++ b/src/browser/ui/dom/HTMLDOMPropertyConfig.js
@@ -137,6 +137,12 @@ var HTMLDOMPropertyConfig = {
     autoCorrect: null, // Supported in Mobile Safari for keyboard hints
     property: null // Supports OG in meta tags
   },
+  OverrideProperties: {
+    progress: {

zpao

/** @jsx React.DOM */

var SWF = React.createClass({
  componentDidMount: function() {
    var newNode = document.createElement('div');
    var myNode = this.getDOMNode();
    myNode.appendChild(newNode);
    swfobject.embedSWF(this.props.file, newNode);
  },

zpao

diff --git a/src/browser/ui/ReactDefaultInjection.js b/src/browser/ui/ReactDefaultInjection.js
index c290403..8a79942 100644
--- a/src/browser/ui/ReactDefaultInjection.js
+++ b/src/browser/ui/ReactDefaultInjection.js
@@ -49,7 +49,7 @@ var ServerReactRootIndex = require('ServerReactRootIndex');
 var SimpleEventPlugin = require('SimpleEventPlugin');
 var BeforeInputEventPlugin = require('BeforeInputEventPlugin');
 
-var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
+var ReactRAFBatchingStrategy = require('ReactRAFBatchingStrategy');

zpao

// normal express stuff

app.set('view engine', 'jsx');
app.engine('jsx', require('express-react-views').__express);

// the rest of it

zpao

/* @jsx m.dom */

function m(type, props, children) {
  // assuming m() looks something like this.
  return {
    type: type,
    props: props,
    children: children
  };
}

zpao

--- build/react-with-addons.js	2014-03-18 11:00:26.000000000 -0700
+++ build/react-with-addons.old.js	2014-03-18 11:00:08.000000000 -0700
@@ -58,45 +58,45 @@
             };
             if ('production' !== 'development') {
                 React.addons.TestUtils = _require(8);
             }
             module.exports = React;
         },
         function (module, exports) {

zpao

Things I would say if somebody asked me about browserify

It works fine.

I don't want to murder somebody every time I work with browserify.

There are other things like it but everybody else is using browserify so we do too.

@substack is wicked smart, it must do the right thing.

zpao

<snippet>
  <content><![CDATA[
var ${1:component} = React.createClass({
  render: function() {
    return (
      ${2:<div />}
    );
  }
});
]]></content>

zpao

diff --git a/docs/docs/04-multiple-components.md b/docs/docs/04-multiple-components.md
index 38d1a9c..8295f5d 100644
--- a/docs/docs/04-multiple-components.md
+++ b/docs/docs/04-multiple-components.md
@@ -134,15 +134,16 @@ The situation gets more complicated when the children are shuffled around (as in
 
 When React reconciles the keyed children, it will ensure that any child with `key` will be reordered (instead of clobbered) or destroyed (instead of reused).
 
-Keys can also be specified as object properties. However it is important to remember that JavaScript does not guarantee the ordering of properties will be preserved. In practice browsers will preserve property order **except** for properties that can be parsed as a 32-bit unsigned integers. Numeric properties will be ordered sequentially and before other properties. If this happens React will render components out of order. This can be avoided by adding a string prefix to the key:
+You can also key children by passing an object. The object keys will