Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
* master:
  feat: speed up draw speed by drawing a subset of category on load (#54)
  chore(deps): update dependency bootstrap to v4.1.0 (#47)
  chore(deps): update dependency semantic-release to v15.1.7
  chore(deps): update dependency rxjs to v5.5.10

# Conflicts:
#	src/lib/picker/picker.component.ts
  • Loading branch information
scttcper committed Apr 13, 2018
2 parents 4f8431e + a29514d commit d031706
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 23 deletions.
36 changes: 18 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@angular/platform-browser-dynamic": "5.2.9",
"@angular/router": "5.2.9",
"@ctrl/ngx-github-buttons": "1.0.9",
"bootstrap": "4.0.0",
"bootstrap": "4.1.0",
"core-js": "2.5.5",
"rxjs": "5.5.9",
"rxjs": "5.5.10",
"zone.js": "0.8.26"
},
"devDependencies": {
Expand Down Expand Up @@ -69,7 +69,7 @@
"ng-packagr": "2.4.2",
"protractor": "5.3.1",
"rimraf": "2.6.2",
"semantic-release": "15.1.6",
"semantic-release": "15.1.7",
"travis-deploy-once": "4.4.1",
"stringify-object": "3.2.2",
"ts-node": "5.0.1",
Expand Down
2 changes: 0 additions & 2 deletions src/lib/picker/picker.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ export class PickerComponent implements OnInit, AfterViewInit {
} else {
const target = this.scrollRef.nativeElement;
// check scroll is not at bottom
console.log(target.scrollTop);
if (target.scrollTop === 0) {
// hit the TOP
activeCategory = this.categories.find(n => n.first === true);
Expand All @@ -297,7 +296,6 @@ export class PickerComponent implements OnInit, AfterViewInit {
this.scrollTop = target.scrollTop;
}
if (activeCategory) {
console.log(activeCategory.name);
this.selected = activeCategory.name;
}
}
Expand Down

0 comments on commit d031706

Please sign in to comment.