mirror of
https://github.com/facebook/react.git
synced 2025-11-01 09:12:30 +00:00
Merge branch 'reorg'
This commit is contained in:
@@ -10,7 +10,7 @@ var reactVersionExp = /\bReact\.version\s*=\s*['"]([^'"]+)['"];/;
|
||||
|
||||
module.exports = function() {
|
||||
var reactVersion = reactVersionExp.exec(
|
||||
grunt.file.read('./src/core/React.js')
|
||||
grunt.file.read('./src/browser/React.js')
|
||||
)[1];
|
||||
var npmReactVersion = grunt.file.readJSON('./npm-react/package.json').version;
|
||||
var reactToolsVersion = grunt.config.data.pkg.version;
|
||||
|
||||
@@ -16,9 +16,8 @@
|
||||
* @jsx React.DOM
|
||||
* @emails react-core
|
||||
*/
|
||||
/*jslint evil: true */
|
||||
|
||||
"use strict";
|
||||
/*jslint evil: true */
|
||||
|
||||
var React = require('React');
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ var SyntheticUIEvent = require('SyntheticUIEvent');
|
||||
|
||||
/**
|
||||
* @interface TouchEvent
|
||||
* @see http://www.w3.org/TR/touch-events/
|
||||
* @see http://www.w3.org/TR/DOM-Level-3-Events/
|
||||
*/
|
||||
var TouchEventInterface = {
|
||||
touches: null,
|
||||
Reference in New Issue
Block a user