Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit ad3d49d

Browse files
emmadavieswilcoxemmadavieswilcox
committed
Use ReactDOMFactories' DOM in place of React.DOM
1 parent 73e9628 commit ad3d49d

12 files changed

+30
-25
lines changed

‎src/optionsStyles/font.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
React = require '../reactGUI/React-shim'
1+
DOM = require '../reactGUI/ReactDOMFactories-shim'
22
createReactClass = require '../reactGUI/createReactClass-shim'
33
{defineOptionsStyle} = require './optionsStyles'
44
{_} = require '../core/localization'
@@ -109,7 +109,7 @@ defineOptionsStyle 'font', createReactClass
109109
render: ->
110110
lc = @props.lc
111111

112-
{div, input, select, option, br, label, span, optgroup} = React.DOM
112+
{div, input, select, option, br, label, span, optgroup} = DOM
113113

114114
(div {className: 'lc-font-settings'},
115115
(select {value: @state.fontSizeIndex, onChange: @handleFontSize},

‎src/optionsStyles/line-options-and-stroke-width.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
React = require '../reactGUI/React-shim'
1+
DOM = require '../reactGUI/ReactDOMFactories-shim'
22
createReactClass = require '../reactGUI/createReactClass-shim'
33
{defineOptionsStyle} = require './optionsStyles'
44
StrokeWidthPicker = React.createFactory require '../reactGUI/StrokeWidthPicker'
@@ -16,7 +16,7 @@ defineOptionsStyle 'line-options-and-stroke-width', createReactClass
1616
mixins: [createSetStateOnEventMixin('toolChange')]
1717

1818
render: ->
19-
{div, ul, li, img} = React.DOM
19+
{div, ul, li, img} = DOM
2020
toggleIsDashed = =>
2121
@props.tool.isDashed = !@props.tool.isDashed
2222
@setState @getState()

‎src/optionsStyles/null.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
React = require '../reactGUI/React-shim'
1+
DOM = require '../reactGUI/ReactDOMFactories-shim'
22
createReactClass = require '../reactGUI/createReactClass-shim'
33
{defineOptionsStyle} = require './optionsStyles'
44

55

66
defineOptionsStyle 'null', createReactClass
77
displayName: 'NoOptions'
8-
render: -> React.DOM.div()
8+
render: -> DOM.div()
99

1010

1111
module.exports = {}

‎src/optionsStyles/polygon-and-stroke-width.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
React = require '../reactGUI/React-shim'
1+
DOM = require '../reactGUI/ReactDOMFactories-shim'
22
createReactClass = require '../reactGUI/createReactClass-shim'
33
{defineOptionsStyle} = require './optionsStyles'
44
StrokeWidthPicker = React.createFactory require '../reactGUI/StrokeWidthPicker'
@@ -33,7 +33,7 @@ defineOptionsStyle 'polygon-and-stroke-width', createReactClass
3333

3434
render: ->
3535
lc = @props.lc
36-
{div, img} = React.DOM
36+
{div, img} = DOM
3737

3838
polygonFinishOpen = () =>
3939
lc.trigger 'lc-polygon-finishopen'

‎src/reactGUI/ClearButton.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
React = require './React-shim'
1+
DOM = require '../reactGUI/ReactDOMFactories-shim'
22
createReactClass = require '../reactGUI/createReactClass-shim'
33
createSetStateOnEventMixin = require './createSetStateOnEventMixin'
44
{_} = require '../core/localization'
@@ -11,7 +11,7 @@ ClearButton = createReactClass
1111
mixins: [createSetStateOnEventMixin('drawingChange')]
1212

1313
render: ->
14-
{div} = React.DOM
14+
{div} = DOM
1515
{lc} = @props
1616

1717
className = classSet

‎src/reactGUI/ColorWell.coffee‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
React = require './React-shim'
2+
DOM = require '../reactGUI/ReactDOMFactories-shim'
23
createReactClass = require '../reactGUI/createReactClass-shim'
34
PureRenderMixin = require 'react-addons-pure-render-mixin'
45
{classSet, requestAnimationFrame, cancelAnimationFrame} = require '../core/util'
@@ -30,7 +31,7 @@ ColorGrid = React.createFactory createReactClass
3031
displayName: 'ColorGrid'
3132
mixins: [PureRenderMixin]
3233
render: ->
33-
{div} = React.DOM
34+
{div} = DOM
3435
(div {},
3536
@props.rows.map((row, ix) =>
3637
return (div \
@@ -131,7 +132,7 @@ ColorWell = createReactClass
131132
@setColor(getHSLAString(hsla))
132133

133134
render: ->
134-
{div, label, br} = React.DOM
135+
{div, label, br} = DOM
135136
(div \
136137
{
137138
className: classSet({
@@ -168,7 +169,7 @@ ColorWell = createReactClass
168169
)
169170

170171
renderPicker: ->
171-
{div, label, input} = React.DOM
172+
{div, label, input} = DOM
172173
return null unless @state.isPickerVisible
173174

174175
renderLabel = (text) =>

‎src/reactGUI/Options.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
React = require './React-shim'
1+
DOM = require '../reactGUI/ReactDOMFactories-shim'
22
createReactClass = require '../reactGUI/createReactClass-shim'
33
createSetStateOnEventMixin = require './createSetStateOnEventMixin'
44
{optionsStyles} = require '../optionsStyles/optionsStyles'
@@ -20,7 +20,7 @@ Options = createReactClass
2020
lc: @props.lc, tool: @state.tool, imageURLPrefix: @props.imageURLPrefix})
2121

2222
render: ->
23-
{div} = React.DOM
23+
{div} = DOM
2424
(div {className: 'lc-options horz-toolbar'},
2525
this.renderBody()
2626
)

‎src/reactGUI/Picker.coffee‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
React = require './React-shim'
2+
DOM = require '../reactGUI/ReactDOMFactories-shim'
23
createReactClass = require '../reactGUI/createReactClass-shim'
34

45
ClearButton = React.createFactory require './ClearButton'
@@ -12,7 +13,7 @@ ColorPickers = React.createFactory createReactClass
1213
displayName: 'ColorPickers'
1314
render: ->
1415
{lc} = @props
15-
{div} = React.DOM
16+
{div} = DOM
1617
(div {className: 'lc-color-pickers'},
1718
(ColorWell {lc, colorName: 'primary', label: _('stroke')})
1819
(ColorWell {lc, colorName: 'secondary', label: _('fill')}),
@@ -24,7 +25,7 @@ Picker = createReactClass
2425
displayName: 'Picker'
2526
getInitialState: -> {selectedToolIndex: 0}
2627
renderBody: ->
27-
{div} = React.DOM
28+
{div} = DOM
2829
{toolButtonComponents, lc, imageURLPrefix} = @props
2930
(div {className: 'lc-picker-contents'},
3031
toolButtonComponents.map((component, ix) =>
@@ -54,7 +55,7 @@ Picker = createReactClass
5455
)
5556
)
5657
render: ->
57-
{div} = React.DOM
58+
{div} = DOM
5859
(div {className: 'lc-picker'},
5960
this.renderBody()
6061
)

‎src/reactGUI/StrokeWidthPicker.coffee‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
React = require './React-shim'
1+
DOM = require '../reactGUI/ReactDOMFactories-shim'
22
createReactClass = require '../reactGUI/createReactClass-shim'
33
createSetStateOnEventMixin = require '../reactGUI/createSetStateOnEventMixin'
44
{classSet} = require '../core/util'
@@ -14,7 +14,7 @@ module.exports = createReactClass
1414
componentWillReceiveProps: (props) -> @setState @getState(props.tool)
1515

1616
render: ->
17-
{ul, li, svg, circle, div} = React.DOM
17+
{ul, li, svg, circle, div} = DOM
1818
strokeWidths = @props.lc.opts.strokeWidths
1919

2020
(div {},

‎src/reactGUI/UndoRedoButtons.coffee‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
React = require './React-shim'
2+
DOM = require '../reactGUI/ReactDOMFactories-shim'
23
createReactClass = require '../reactGUI/createReactClass-shim'
34
createSetStateOnEventMixin = require './createSetStateOnEventMixin'
45
{classSet} = require '../core/util'
@@ -22,7 +23,7 @@ createUndoRedoButtonComponent = (undoOrRedo) -> createReactClass
2223
mixins: [createSetStateOnEventMixin('drawingChange')]
2324

2425
render: ->
25-
{div, img} = React.DOM
26+
{div, img} = DOM
2627
{lc, imageURLPrefix} = @props
2728
title = if undoOrRedo == 'undo' then 'Undo' else 'Redo'
2829

@@ -45,7 +46,7 @@ RedoButton = React.createFactory createUndoRedoButtonComponent('redo')
4546
UndoRedoButtons = createReactClass
4647
displayName: 'UndoRedoButtons'
4748
render: ->
48-
{div} = React.DOM
49+
{div} = DOM
4950
(div {className: 'lc-undo-redo'}, UndoButton(@props), RedoButton(@props))
5051

5152
module.exports = UndoRedoButtons

0 commit comments

Comments
 (0)