From bb4a11dc1a70ee6dbb2dcc755fadbffdfaab6e12 Mon Sep 17 00:00:00 2001 From: rascada Date: Tue, 9 Feb 2016 11:16:57 +0100 Subject: [PATCH 1/2] update to flexstyl 1 --- index.styl | 9 ++++++--- package.json | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/index.styl b/index.styl index 2bb3839..6894621 100644 --- a/index.styl +++ b/index.styl @@ -1,4 +1,4 @@ -@import '~flexstyl/index' +@import '~flexstyl/flex' .sled .arrows @@ -6,7 +6,9 @@ width 100% height 100% position absolute - @extend .flex, .between, .acenter + flex styl + align center + justify between .arrow border 0 @@ -15,7 +17,8 @@ width 2.5em height @width - @extend .flex, .center + flex styl + flex center outline none cursor pointer diff --git a/package.json b/package.json index 07c2855..58db24e 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@sled/core": "^1.3" }, "dependencies": { - "flexstyl": "0.0.4", + "flexstyl": "^1.0.1", "rx": "^4.0.7" } } From 0ec29c82d2483569dde7d452a967712d224cb570 Mon Sep 17 00:00:00 2001 From: rascada Date: Tue, 9 Feb 2016 11:30:34 +0100 Subject: [PATCH 2/2] es6 rx5 --- package.json | 2 +- src/Arrows.js | 8 ++++---- webpack.config.js | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 58db24e..e588c14 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,6 @@ }, "dependencies": { "flexstyl": "^1.0.1", - "rx": "^4.0.7" + "rxjs-es": "^5.0.0-beta.1" } } diff --git a/src/Arrows.js b/src/Arrows.js index e142cb7..5842ada 100644 --- a/src/Arrows.js +++ b/src/Arrows.js @@ -1,4 +1,4 @@ -import rx from 'rx'; +import { Observable } from 'rxjs-es/Observable'; class Arrows { constructor() { @@ -21,20 +21,20 @@ class Arrows { } hide$(slides) { - return rx.Observable + return Observable .fromEvent(slides, 'change') .filter(n => this.isEnd(n, slides.$$)); } show$(slides) { - return rx.Observable + return Observable .fromEvent(slides, 'change') .filter(_ => this.hidden !== null) .filter(n => !this.isEnd(n, slides.$$)); } arrow$(slides) { - return rx.Observable + return Observable .fromEvent(this.$$, 'click') .pluck('target', 'previousSibling'); } diff --git a/webpack.config.js b/webpack.config.js index 6641cb3..723215f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -33,6 +33,7 @@ module.exports = { test: /\.js$/, include: [ path.resolve(__dirname, 'node_modules/@sled'), + path.resolve(__dirname, 'node_modules/rxjs-es'), path.resolve(__dirname, './index'), path.resolve(__dirname, './src'), ],