Skip to content

Commit 9b6ab58

Browse files
author
kiran
committed
Fixed #165
1 parent b4dbd53 commit 9b6ab58

File tree

6 files changed

+16
-11
lines changed

6 files changed

+16
-11
lines changed

docs/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
var React = require('react');
4-
var ReactDOM = require('react-dom');
4+
var ReactDOM = require('../src/mixins/ReactDOM');
55
var Docs = require('./docs');
66

77
React.initializeTouchEvents && React.initializeTouchEvents(true);

src/mixins/ReactDOM.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import React from 'react';
2+
import ReactDOM14 from 'react-dom';
3+
4+
var ReactDOM = (React.version >= '0.14.0') ? ReactDOM14: React;
5+
6+
export default ReactDOM;

src/mixins/helpers.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
'use strict';
22

33
import React from 'react';
4-
import ReactDOM from 'react-dom';
4+
import ReactDOM from './ReactDOM';
55
import ReactTransitionEvents from 'react/lib/ReactTransitionEvents';
66
import {getTrackCSS, getTrackLeft, getTrackAnimateCSS} from './trackHelper';
77
import assign from 'object-assign';
88

99
var helpers = {
1010
initialize: function (props) {
1111
var slideCount = React.Children.count(props.children);
12-
var listWidth = this.getWidth(this.refs.list);
12+
var listWidth = this.getWidth(ReactDOM.findDOMNode(this.refs.list));
1313
var trackWidth = this.getWidth(ReactDOM.findDOMNode(this.refs.track));
1414
var slideWidth = this.getWidth(ReactDOM.findDOMNode(this))/props.slidesToShow;
1515

@@ -21,7 +21,6 @@ var helpers = {
2121
listWidth: listWidth,
2222
trackWidth: trackWidth,
2323
currentSlide: currentSlide
24-
2524
}, function () {
2625

2726
var targetLeft = getTrackLeft(assign({
@@ -40,7 +39,7 @@ var helpers = {
4039
// This method has mostly same code as initialize method.
4140
// Refactor it
4241
var slideCount = React.Children.count(props.children);
43-
var listWidth = this.getWidth(this.refs.list);
42+
var listWidth = this.getWidth(ReactDOM.findDOMNode(this.refs.list));
4443
var trackWidth = this.getWidth(ReactDOM.findDOMNode(this.refs.track));
4544
var slideWidth = this.getWidth(ReactDOM.findDOMNode(this))/props.slidesToShow;
4645

@@ -68,7 +67,7 @@ var helpers = {
6867
if (this.props.adaptiveHeight) {
6968
var selector = '[data-index="' + this.state.currentSlide +'"]';
7069
if (this.refs.list) {
71-
var slickList = this.refs.list;
70+
var slickList = ReactDOM.findDOMNode(this.refs.list);
7271
slickList.style.height = slickList.querySelector(selector).offsetHeight + 'px';
7372
}
7473
}

src/mixins/trackHelper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
import ReactDOM from 'react-dom';
2+
import ReactDOM from './ReactDOM';
33

44
var checkSpecKeys = function (spec, keysArray) {
55
return keysArray.reduce((value, key) => {

webpack.config.dist.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports = {
3434
commonjs2: 'react-dom',
3535
commonjs: 'react-dom',
3636
amd: 'react-dom'
37-
},
37+
}
3838
}
3939
],
4040

webpack.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module.exports = {
77
entry: {
88
'docs.js': [
99
'./docs/index.jsx',
10-
'webpack/hot/only-dev-server',
11-
'webpack-dev-server/client?http://localhost:8000'
10+
// 'webpack/hot/only-dev-server',
11+
// 'webpack-dev-server/client?http://localhost:8000'
1212
]
1313
},
1414
output: {
@@ -32,7 +32,7 @@ module.exports = {
3232
extensions: ['', '.js', '.jsx']
3333
},
3434
plugins: [
35-
new webpack.HotModuleReplacementPlugin(),
35+
// new webpack.HotModuleReplacementPlugin(),
3636
new webpack.NoErrorsPlugin(),
3737
new webpack.IgnorePlugin(/vertx/)
3838
]

0 commit comments

Comments
 (0)