Skip to content

Commit

Permalink
Upgrading Karma to 0.13 for fixing the cannot-load-webpack problem
Browse files Browse the repository at this point in the history
  • Loading branch information
Krasimir Tsonev committed Sep 16, 2015
1 parent ffb9519 commit 06c6164
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 16 deletions.
98 changes: 85 additions & 13 deletions dist/react-slick.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ return /******/ (function(modules) { // webpackBootstrap

var _objectAssign2 = _interopRequireDefault(_objectAssign);

var _json2mq = __webpack_require__(28);
var _json2mq = __webpack_require__(29);

var _json2mq2 = _interopRequireDefault(_json2mq);

var _reactResponsiveMixin = __webpack_require__(30);
var _reactResponsiveMixin = __webpack_require__(31);

var _reactResponsiveMixin2 = _interopRequireDefault(_reactResponsiveMixin);

Expand Down Expand Up @@ -212,7 +212,9 @@ return /******/ (function(modules) { // webpackBootstrap

var _dots = __webpack_require__(26);

var _arrows = __webpack_require__(27);
var _labelling = __webpack_require__(27);

var _arrows = __webpack_require__(28);

var InnerSlider = _react2['default'].createClass({
displayName: 'InnerSlider',
Expand Down Expand Up @@ -303,6 +305,20 @@ return /******/ (function(modules) { // webpackBootstrap
dots = _react2['default'].createElement(_dots.Dots, dotProps);
}

var labelling;

if (this.props.labelling === true && this.state.slideCount > this.props.slidesToShow) {
var labellingProps = {
labellingClass: this.props.labellingClass,
labellingTemplate: this.props.labellingTemplate,
slideCount: this.state.slideCount,
currentSlide: this.state.currentSlide,
slidesToScroll: this.props.slidesToScroll
};

labelling = _react2['default'].createElement(_labelling.Labelling, labellingProps);
}

var prevArrow, nextArrow;

var arrowProps = {
Expand Down Expand Up @@ -345,7 +361,8 @@ return /******/ (function(modules) { // webpackBootstrap
),
prevArrow,
nextArrow,
dots
dots,
labelling
);
}
});
Expand Down Expand Up @@ -2472,6 +2489,61 @@ return /******/ (function(modules) { // webpackBootstrap
value: true
});

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

var _react = __webpack_require__(2);

var _react2 = _interopRequireDefault(_react);

var _classnames = __webpack_require__(14);

var _classnames2 = _interopRequireDefault(_classnames);

var getSlidesCount = function getSlidesCount(spec) {
var slides;
slides = Math.ceil(spec.slideCount / spec.slidesToScroll);
return slides;
};

var Labelling = _react2['default'].createClass({
displayName: 'Labelling',

render: function render() {
var template, className, label;
console.log(this.props.labellingTemplate);
if (this.props.labellingTemplate) {
template = this.props.labellingTemplate;
} else {
template = function (currentSlide, slidesCount) {
return currentSlide + ' / ' + slidesCount;
};
}

className = (0, _classnames2['default'])({ 'slick-labelling': true });
label = template(this.props.currentSlide + 1, getSlidesCount({
slideCount: this.props.slideCount,
slidesToScroll: this.props.slidesToScroll
}));

return _react2['default'].createElement(
'div',
{ className: this.props.labellingClass ? this.props.labellingClass + ' ' + className : className },
label
);
}
});
exports.Labelling = Labelling;

/***/ },
/* 28 */
/***/ function(module, exports, __webpack_require__) {

'use strict';

Object.defineProperty(exports, '__esModule', {
value: true
});

var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
Expand Down Expand Up @@ -2580,10 +2652,10 @@ return /******/ (function(modules) { // webpackBootstrap
exports.NextArrow = NextArrow;

/***/ },
/* 28 */
/* 29 */
/***/ function(module, exports, __webpack_require__) {

var camel2hyphen = __webpack_require__(29);
var camel2hyphen = __webpack_require__(30);

var isDimension = function (feature) {
var re = /[height|width]$/;
Expand Down Expand Up @@ -2636,7 +2708,7 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = json2mq;

/***/ },
/* 29 */
/* 30 */
/***/ function(module, exports) {

var camel2hyphen = function (str) {
Expand All @@ -2650,12 +2722,12 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = camel2hyphen;

/***/ },
/* 30 */
/* 31 */
/***/ function(module, exports, __webpack_require__) {

var canUseDOM = __webpack_require__(31);
var enquire = canUseDOM && __webpack_require__(32);
var json2mq = __webpack_require__(28);
var canUseDOM = __webpack_require__(32);
var enquire = canUseDOM && __webpack_require__(33);
var json2mq = __webpack_require__(29);

var ResponsiveMixin = {
media: function (query, handler) {
Expand Down Expand Up @@ -2685,7 +2757,7 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = ResponsiveMixin;

/***/ },
/* 31 */
/* 32 */
/***/ function(module, exports) {

var canUseDOM = !!(
Expand All @@ -2697,7 +2769,7 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = canUseDOM;

/***/ },
/* 32 */
/* 33 */
/***/ function(module, exports, __webpack_require__) {

var __WEBPACK_AMD_DEFINE_RESULT__;/*!
Expand Down
Loading

1 comment on commit 06c6164

@krasimir
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is more info why we need 0.13 version of Karma: codymikol/karma-webpack#70

Please sign in to comment.