Skip to content

Reactive #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rascada wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reactive #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb4a11d
update to flexstyl 1
rascada Feb 9, 2016
0ec29c8
es6 rx5
rascada Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
@import '~flexstyl/index'
@import '~flexstyl/flex'

.sled
.arrows
top 0
width 100%
height 100%
position absolute
@extend .flex, .between, .acenter
flex styl
align center
justify between

.arrow
border 0
Expand All @@ -15,7 +17,8 @@
width 2.5em
height @width

@extend .flex, .center
flex styl
flex center

outline none
cursor pointer
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@sled/core": "^1.3"
},
"dependencies": {
"flexstyl": "0.0.4",
"rx": "^4.0.7"
"flexstyl": "^1.0.1",
"rxjs-es": "^5.0.0-beta.1"
}
}
8 changes: 4 additions & 4 deletions src/Arrows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import rx from 'rx';
import { Observable } from 'rxjs-es/Observable';

class Arrows {
constructor() {
Expand All @@ -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');
}
Expand Down
1 change: 1 addition & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
],
Expand Down