Revert "Merge pull request #6184 from gaearon/fix-svg-warning"

This reverts commit 36798f7395, reversing
changes made to b89e7d25d5.
This commit is contained in:
Paul O’Shannessy
2016-03-09 10:50:34 -08:00
parent e8005bf01a
commit 2fb74cd1ac
2 changed files with 6 additions and 42 deletions
@@ -449,39 +449,6 @@ describe('ReactDOMComponent', function() {
expect(console.error.argsForCall[0][0]).toContain('clip-path');
});
it('should only warn once about deprecated SVG attributes', function() {
spyOn(console, 'error');
var container = document.createElement('div');
ReactDOM.render(
<svg clipPath="0 0 100 100">
<rect strokeWidth={1} />
<rect strokeWidth={10} />
</svg>,
container
);
expect(console.error.argsForCall.length).toBe(2);
expect(console.error.argsForCall[0][0]).toContain('clipPath');
expect(console.error.argsForCall[0][0]).toContain('clip-path');
expect(console.error.argsForCall[1][0]).toContain('strokeWidth');
expect(console.error.argsForCall[1][0]).toContain('stroke-width');
ReactDOM.render(
<svg clipPath="0 0 100 100">
<rect strokeWidth={1} strokeOpacity={0.5} />
<rect strokeWidth={10} />
<rect strokeWidth={100} />
</svg>,
container
);
expect(console.error.argsForCall.length).toBe(3);
expect(console.error.argsForCall[0][0]).toContain('clipPath');
expect(console.error.argsForCall[0][0]).toContain('clip-path');
expect(console.error.argsForCall[1][0]).toContain('strokeWidth');
expect(console.error.argsForCall[1][0]).toContain('stroke-width');
expect(console.error.argsForCall[2][0]).toContain('strokeOpacity');
expect(console.error.argsForCall[2][0]).toContain('stroke-opacity');
});
it('should update arbitrary hyphenated attributes for SVG tags', function() {
var container = document.createElement('div');
@@ -25,23 +25,20 @@ if (__DEV__) {
var warnedSVGAttributes = {};
var warnDeprecatedSVGAttribute = function(name) {
if (reactProps.hasOwnProperty(name) && reactProps[name]) {
return;
}
if (!DOMProperty.properties.hasOwnProperty(name)) {
return;
}
if (reactProps.hasOwnProperty(name) && reactProps[name] ||
warnedSVGAttributes.hasOwnProperty(name) && warnedSVGAttributes[name]) {
return;
}
var { attributeName, attributeNamespace } = DOMProperty.properties[name];
if (attributeNamespace || name === attributeName) {
return;
}
if (warnedSVGAttributes.hasOwnProperty(name) && warnedSVGAttributes[name]) {
return;
}
warnedSVGAttributes[name] = true;
warning(
false,
'SVG property %s is deprecated. Use the original attribute name ' +