Skip to content

Commit 43018c4

Browse files
jquensejquense
committed
merge 0.13 branch
2 parents 601dbd5 + 53f1657 commit 43018c4

23 files changed

+262
-64
lines changed

‎docs/components/pages/Calendar.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,14 @@ var Calendar = React.createClass({
105105
<p>
106106
A formatter for the header button of the month view
107107
</p>
108+
108109
<EditableExample codeText={
109110
require('../examples/prop')(widgetName, 'headerFormat', '"MMM yy"')}/>
110-
111111
<PropHeader type='String | Function(Date? date)' default="'D'">footerFormat</PropHeader>
112112
<p>
113113
A formatter for the Calendar footer, formats Today's Date as a string.
114114
</p>
115+
115116
<EditableExample codeText={require('../examples/prop')(
116117
widgetName, { footerFormat: "\"'today is:' dddd\"", footer: true })}/>
117118

‎karma.conf.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
'use strict';
2+
3+
module.exports = function (config) {
4+
5+
6+
//console.log(process.env.TRAVIS_CI)
7+
8+
config.set({
9+
10+
basePath: '',
11+
12+
frameworks: ['mocha', 'expect'],
13+
14+
files: [
15+
'./vendor/phantomjs-shim.js',
16+
'https://cdnjs.cloudflare.com/ajax/libs/react/0.12.2/react-with-addons.js',
17+
'./vendor/sinon-1.10.3.js',
18+
'./vendor/jquery-1.11.2.min.js',
19+
'test.js',
20+
],
21+
22+
reporters: ['mocha'],
23+
24+
port: 9876,
25+
colors: true,
26+
autoWatch: process.env.TRAVIS_CI ? false : true,
27+
singleRun: process.env.TRAVIS_CI ? true : false,
28+
29+
logLevel: config.LOG_INFO,
30+
31+
browsers: [ 'PhantomJS'],
32+
33+
preprocessors: {
34+
'test.js': ['webpack']
35+
},
36+
37+
webpack: require('./webpack.configs').test,
38+
webpackServer: {
39+
noInfo: true
40+
}
41+
});
42+
};

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,14 @@
9595
"mocha": "~1.21.4",
9696
"phantomjs": "~1.9.10",
9797
"raw-loader": "^0.5.1",
98-
"react": "^0.12.0",
99-
"react-a11y": "0.0.6",
98+
10099
"react-bootstrap": "^0.13.0",
101100
"react-hot-loader": "^1.2.0",
101+
102102
"react-router": "^0.11.6",
103103
"scriptjs": "^2.5.7",
104+
"react": "^0.12.2",
105+
104106
"style-loader": "^0.7.0",
105107
"url-loader": "^0.5.5",
106108
"webpack": "^1.7.0",

‎src/Calendar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ var Calendar = React.createClass({
276276
this.setTimeout('focus', () => {
277277

278278
if(focused)
279-
this.getDOMNode().focus()
279+
compat.findDOMNode(this).focus()
280280

281281
if( focused !== this.state.focused){
282282
this.notify(focused ? 'onFocus' : 'onBlur', e)

‎src/Combobox.jsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ var React = require('react')
66
, Popup = require('./Popup')
77
, Btn = require('./WidgetButton')
88
, Input = require('./ComboboxInput')
9-
10-
, createUncontrolledWidget = require('uncontrollable')
9+
, compat = require('./util/compat')
1110
, CustomPropTypes = require('./util/propTypes')
1211
, PlainList = require('./List')
1312
, GroupableList = require('./ListGroupable')
14-
, validateList = require('./util/validateListInterface');
13+
, validateList = require('./util/validateListInterface')
14+
, createUncontrolledWidget = require('uncontrollable');
1515

1616
var propTypes = {
1717
//-- controlled props -----------
@@ -199,11 +199,15 @@ var ComboBox = React.createClass({
199199
onChange={this._inputTyping}
200200
onKeyDown={this._inputKeyDown}/>
201201

202-
<Popup {..._.pick(this.props, Object.keys(Popup.type.propTypes))}
202+
<Popup
203+
{..._.pick(
204+
this.props
205+
, Object.keys(compat.type(Popup).propTypes))
206+
}
203207
onRequestClose={this.close}>
204208
<div>
205209
<List ref="list"
206-
{..._.pick(this.props, Object.keys(List.type.propTypes))}
210+
{..._.pick(this.props, Object.keys(compat.type(List).propTypes))}
207211
id={listID}
208212
optID={optID}
209213
aria-hidden={ !this.props.open }
@@ -318,7 +322,7 @@ var ComboBox = React.createClass({
318322

319323
function select(item, fromList) {
320324
if(!item)
321-
return self.change(self.refs.input.getDOMNode().value, false)
325+
return self.change(compat.findDOMNode(self.refs.input).value, false)
322326

323327
self.refs.input.accept(true); //removes caret
324328

‎src/ComboboxInput.jsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22
var React = require('react')
3-
, caretPos = require('./util/caret');
3+
, caretPos = require('./util/caret')
4+
, compat = require('./util/compat');
45

56
module.exports = React.createClass({
67

@@ -10,7 +11,7 @@ module.exports = React.createClass({
1011
},
1112

1213
componentDidUpdate: function() {
13-
var input = this.getDOMNode()
14+
var input = compat.findDOMNode(this)
1415
, val = this.props.value;
1516

1617
if ( this.isSuggesting() ){
@@ -50,11 +51,11 @@ module.exports = React.createClass({
5051
},
5152

5253
accept: function(removeCaret){
53-
var val = this.getDOMNode().value || ''
54+
var val = compat.findDOMNode(this).value || ''
5455
, end = val.length;
5556

5657
this._last = null
57-
removeCaret && caretPos(this.getDOMNode(), end, end)
58+
removeCaret && caretPos(compat.findDOMNode(this), end, end)
5859
},
5960

6061
_change: function(e){
@@ -64,6 +65,6 @@ module.exports = React.createClass({
6465
},
6566

6667
focus: function(){
67-
this.getDOMNode().focus()
68+
compat.findDOMNode(this).focus()
6869
}
6970
});

‎src/DateInput.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
var React = require('react')
33
, cx = require('classnames')
44
, dates = require('./util/dates')
5+
, compat = require('./util/compat')
56
, CustomPropTypes = require('./util/propTypes');
67

78
module.exports = React.createClass({
@@ -80,7 +81,7 @@ module.exports = React.createClass({
8081
},
8182

8283
focus: function(){
83-
this.getDOMNode().focus()
84+
compat.findDOMNode(this).focus()
8485
}
8586

8687
});

‎src/DateTimePicker.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ var DateTimePicker = React.createClass({
290290

291291
this.setTimeout('focus', () => {
292292

293-
if(focused) input.getDOMNode().focus()
293+
if(focused) compat.findDOMNode(input).focus()
294294
else this.close()
295295

296296
if( focused !== this.state.focused){

‎src/DropdownList.jsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
var React = require('react')
33
, _ = require('./util/_')
44
, cx = require('classnames')
5-
6-
, createUncontrolledWidget = require('uncontrollable')
5+
, compat = require('./util/compat')
76
, CustomPropTypes = require('./util/propTypes')
87
, Popup = require('./Popup')
98
, PlainList = require('./List')
109
, GroupableList = require('./ListGroupable')
11-
, validateList = require('./util/validateListInterface');
10+
, validateList = require('./util/validateListInterface')
11+
, createUncontrolledWidget = require('uncontrollable');
1212

1313

1414
var propTypes = {
@@ -153,12 +153,15 @@ var DropdownList = React.createClass({
153153
: this._dataText(valueItem)
154154
}
155155
</div>
156-
<Popup {..._.pick(this.props, Object.keys(Popup.type.propTypes))}
156+
<Popup {..._.pick(this.props, Object.keys(compat.type(Popup).propTypes))}
157157
onRequestClose={this.close}>
158158

159159
<div>
160160
<List ref="list"
161-
{..._.pick(this.props, Object.keys(List.type.propTypes))}
161+
{..._.pick(
162+
this.props
163+
, Object.keys(compat.type(List).propTypes))
164+
}
162165
optID={optID}
163166
aria-hidden={!this.props.open}
164167
selected={this.state.selectedItem}
@@ -175,7 +178,7 @@ var DropdownList = React.createClass({
175178

176179
this.setTimeout('focus', () => {
177180

178-
if(focused) this.getDOMNode().focus()
181+
if(focused) compat.findDOMNode(this).focus()
179182
else this.close()
180183

181184
if( focused !== this.state.focused){

‎src/List.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22
var React = require('react')
33
, CustomPropTypes = require('./util/propTypes')
4+
, compat = require('./util/compat')
45
, cx = require('classnames')
56
, _ = require('./util/_');
67

@@ -104,7 +105,7 @@ module.exports = React.createClass({
104105
},
105106

106107
_setScrollPosition: function(){
107-
var list = this.getDOMNode()
108+
var list = compat.findDOMNode(this)
108109
, idx = this._data().indexOf(this.props.focused)
109110
, selected = list.children[idx];
110111

‎src/ListGroupable.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22
var React = require('react')
33
, CustomPropTypes = require('./util/propTypes')
4+
, compat = require('./util/compat')
45
, cx = require('classnames')
56
, _ = require('./util/_');
67

@@ -189,11 +190,11 @@ module.exports = React.createClass({
189190

190191
if( !selected ) return
191192

192-
this.notify('onMove', [ selected, this.getDOMNode() ])
193+
this.notify('onMove', [ selected, compat.findDOMNode(this) ])
193194
},
194195

195196
getItemDOMNode(item){
196-
var list = this.getDOMNode()
197+
var list = compat.findDOMNode(this)
197198
, groups = this.state.groups
198199
, idx = -1
199200
, itemIdx, child;

‎src/Multiselect.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
var React = require('react')
33
, cx = require('classnames')
44
, _ = require('./util/_')
5+
, compat = require('./util/compat')
56
, SelectInput = require('./MultiselectInput')
67
, TagList = require('./MultiselectTagList')
78
, Popup = require('./Popup')
@@ -134,7 +135,7 @@ var Multiselect = React.createClass({
134135
, dropUp = this.props.dropUp
135136

136137
, List = this.props.listComponent || (this.props.groupBy && GroupableList) || PlainList
137-
, listProps = _.pick(this.props, Object.keys(List.type.propTypes));
138+
, listProps = _.pick(this.props, Object.keys(compat.type(List).propTypes));
138139

139140
return (
140141
<div {...props}
@@ -184,7 +185,7 @@ var Multiselect = React.createClass({
184185
onFocus={this._inputFocus}
185186
maxLength={this.props.maxLength}/>
186187
</div>
187-
<Popup {..._.pick(this.props, Object.keys(Popup.type.propTypes))}
188+
<Popup {..._.pick(this.props, Object.keys(compat.type(Popup).propTypes))}
188189
onRequestClose={this.close}>
189190

190191
<div>

‎src/MultiselectInput.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
2-
var React = require('react');
2+
var React = require('react')
3+
, compat = require('./util/compat');
34

45
module.exports = React.createClass({
56

@@ -38,7 +39,7 @@ module.exports = React.createClass({
3839
},
3940

4041
focus: function(){
41-
this.getDOMNode().focus()
42+
compat.findDOMNode(this).focus()
4243
}
4344

4445
})

‎src/NumberPicker.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
var React = require('react')
33
, cx = require('classnames')
44
, _ = require('./util/_') //omit
5+
, compat = require('./util/compat')
56
, CustomPropTypes = require('./util/propTypes')
67
, createUncontrolledWidget = require('uncontrollable')
78
, directions = require('./util/constants').directions
@@ -182,7 +183,7 @@ var NumberPicker = React.createClass({
182183
_focus: function(focused, e){
183184

184185
this.setTimeout('focus', () => {
185-
var el = this.refs.input.getDOMNode()
186+
var el = compat.findDOMNode(this.refs.input)
186187

187188
focused && el.focus()
188189

0 commit comments

Comments
 (0)