Skip to content

Commit da6ae49

Browse files
author
Sumei
committed
rebase facebook#6345 and fix lint issue
1 parent 932334d commit da6ae49

4 files changed

Lines changed: 16 additions & 27 deletions

File tree

src/isomorphic/classic/element/ReactElement.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'use strict';
1313

1414
var ReactCurrentOwner = require('ReactCurrentOwner');
15-
15+
var ReactDOMInstrumentation = require('ReactDOMInstrumentation');
1616
var warning = require('warning');
1717
var canDefineProperty = require('canDefineProperty');
1818

@@ -152,6 +152,12 @@ ReactElement.createElement = function(type, config, children) {
152152
}
153153
}
154154

155+
if (__DEV__) {
156+
for (propName in config) {
157+
ReactDOMInstrumentation.debugTool.onCreateElement(propName);
158+
}
159+
}
160+
155161
// Children can be more than one argument, and those are transferred onto
156162
// the newly allocated props object.
157163
var childrenLength = arguments.length - 2;

src/renderers/dom/shared/DOMPropertyOperations.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
'use strict';
1313

1414
var DOMProperty = require('DOMProperty');
15-
var ReactDOMInstrumentation = require('ReactDOMInstrumentation');
1615
var ReactPerf = require('ReactPerf');
1716

1817
var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser');
@@ -88,9 +87,6 @@ var DOMPropertyOperations = {
8887
* @return {?string} Markup string, or null if the property was invalid.
8988
*/
9089
createMarkupForProperty: function(name, value) {
91-
if (__DEV__) {
92-
ReactDOMInstrumentation.debugTool.onCreateMarkupForProperty(name, value);
93-
}
9490
var propertyInfo = DOMProperty.properties.hasOwnProperty(name) ?
9591
DOMProperty.properties[name] : null;
9692
if (propertyInfo) {
@@ -134,9 +130,6 @@ var DOMPropertyOperations = {
134130
* @param {*} value
135131
*/
136132
setValueForProperty: function(node, name, value) {
137-
if (__DEV__) {
138-
ReactDOMInstrumentation.debugTool.onSetValueForProperty(node, name, value);
139-
}
140133
var propertyInfo = DOMProperty.properties.hasOwnProperty(name) ?
141134
DOMProperty.properties[name] : null;
142135
if (propertyInfo) {
@@ -192,9 +185,6 @@ var DOMPropertyOperations = {
192185
* @param {string} name
193186
*/
194187
deleteValueForProperty: function(node, name) {
195-
if (__DEV__) {
196-
ReactDOMInstrumentation.debugTool.onDeleteValueForProperty(node, name);
197-
}
198188
var propertyInfo = DOMProperty.properties.hasOwnProperty(name) ?
199189
DOMProperty.properties[name] : null;
200190
if (propertyInfo) {

src/renderers/dom/shared/ReactDOMDebugTool.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,8 @@ var ReactDOMDebugTool = {
5050
}
5151
}
5252
},
53-
onCreateMarkupForProperty(name, value) {
54-
emitEvent('onCreateMarkupForProperty', name, value);
55-
},
56-
onSetValueForProperty(node, name, value) {
57-
emitEvent('onSetValueForProperty', node, name, value);
58-
},
59-
onDeleteValueForProperty(node, name) {
60-
emitEvent('onDeleteValueForProperty', node, name);
53+
onCreateElement(name) {
54+
emitEvent('onCreateElement', name);
6155
},
6256
};
6357

src/renderers/dom/shared/devtools/ReactDOMUnknownPropertyDevtool.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,14 @@ if (__DEV__) {
3434
return;
3535
}
3636

37-
warnedProperties[name] = true;
3837
var lowerCasedName = name.toLowerCase();
3938

39+
if (EventPluginRegistry.possibleRegistrationNames[lowerCasedName] === name) {
40+
return;
41+
}
42+
43+
warnedProperties[name] = true;
44+
4045
// data-* attributes should be lowercase; suggest the lowercase version
4146
var standardName = (
4247
DOMProperty.isCustomAttribute(lowerCasedName) ?
@@ -73,13 +78,7 @@ if (__DEV__) {
7378
}
7479

7580
var ReactDOMUnknownPropertyDevtool = {
76-
onCreateMarkupForProperty(name, value) {
77-
warnUnknownProperty(name);
78-
},
79-
onSetValueForProperty(node, name, value) {
80-
warnUnknownProperty(name);
81-
},
82-
onDeleteValueForProperty(node, name) {
81+
onCreateElement(name) {
8382
warnUnknownProperty(name);
8483
},
8584
};

0 commit comments

Comments
 (0)