Skip to content

Commit

Permalink
Fixed akiran#165
Browse files Browse the repository at this point in the history
  • Loading branch information
kiran committed Nov 14, 2015
1 parent b4dbd53 commit 9b6ab58
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/index.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var React = require('react');
var ReactDOM = require('react-dom');
var ReactDOM = require('../src/mixins/ReactDOM');
var Docs = require('./docs');

React.initializeTouchEvents && React.initializeTouchEvents(true);
Expand Down
6 changes: 6 additions & 0 deletions src/mixins/ReactDOM.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import React from 'react';
import ReactDOM14 from 'react-dom';

var ReactDOM = (React.version >= '0.14.0') ? ReactDOM14: React;

export default ReactDOM;
9 changes: 4 additions & 5 deletions src/mixins/helpers.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'use strict';

import React from 'react';
import ReactDOM from 'react-dom';
import ReactDOM from './ReactDOM';
import ReactTransitionEvents from 'react/lib/ReactTransitionEvents';
import {getTrackCSS, getTrackLeft, getTrackAnimateCSS} from './trackHelper';
import assign from 'object-assign';

var helpers = {
initialize: function (props) {
var slideCount = React.Children.count(props.children);
var listWidth = this.getWidth(this.refs.list);
var listWidth = this.getWidth(ReactDOM.findDOMNode(this.refs.list));
var trackWidth = this.getWidth(ReactDOM.findDOMNode(this.refs.track));
var slideWidth = this.getWidth(ReactDOM.findDOMNode(this))/props.slidesToShow;

Expand All @@ -21,7 +21,6 @@ var helpers = {
listWidth: listWidth,
trackWidth: trackWidth,
currentSlide: currentSlide

}, function () {

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

Expand Down Expand Up @@ -68,7 +67,7 @@ var helpers = {
if (this.props.adaptiveHeight) {
var selector = '[data-index="' + this.state.currentSlide +'"]';
if (this.refs.list) {
var slickList = this.refs.list;
var slickList = ReactDOM.findDOMNode(this.refs.list);
slickList.style.height = slickList.querySelector(selector).offsetHeight + 'px';
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/trackHelper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
import ReactDOM from 'react-dom';
import ReactDOM from './ReactDOM';

var checkSpecKeys = function (spec, keysArray) {
return keysArray.reduce((value, key) => {
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
commonjs2: 'react-dom',
commonjs: 'react-dom',
amd: 'react-dom'
},
}
}
],

Expand Down
6 changes: 3 additions & 3 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ module.exports = {
entry: {
'docs.js': [
'./docs/index.jsx',
'webpack/hot/only-dev-server',
'webpack-dev-server/client?http://localhost:8000'
// 'webpack/hot/only-dev-server',
// 'webpack-dev-server/client?http://localhost:8000'
]
},
output: {
Expand All @@ -32,7 +32,7 @@ module.exports = {
extensions: ['', '.js', '.jsx']
},
plugins: [
new webpack.HotModuleReplacementPlugin(),
// new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin(),
new webpack.IgnorePlugin(/vertx/)
]
Expand Down

0 comments on commit 9b6ab58

Please sign in to comment.