Skip to content

Commit

Permalink
Merge pull request #425 from videogular/fix/vg-scrub-bar-for
Browse files Browse the repository at this point in the history
fix(controls): Add vgFor input property to VgControls
  • Loading branch information
Elecash authored Feb 25, 2017
2 parents bb1c3ce + 3a5d118 commit b863b90
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
},
"dependencies": {
"core-js": "2.4.1",
"reflect-metadata": "0.1.9",
"reflect-metadata": "0.1.10",
"rxjs": "5.0.0-beta.12",
"systemjs": "0.19.40",
"zone.js": "0.7.4"
"systemjs": "0.20.9",
"zone.js": "0.7.7"
},
"devDependencies": {
"@angular/common": "2.2.3",
Expand All @@ -23,24 +23,24 @@
"@angular/platform-server": "2.2.3",
"@types/core-js": "0.9.35",
"@types/jasmine": "2.5.38",
"codelyzer": "2.0.0-beta.1",
"commitizen": "2.9.3",
"cz-conventional-changelog": "1.2.0",
"codelyzer": "2.0.1",
"commitizen": "2.9.6",
"cz-conventional-changelog": "2.0.0",
"es6-module-loader": "0.17.11",
"ghooks": "2.0.0",
"http-server": "0.9.0",
"jasmine-core": "2.5.2",
"karma": "1.3.0",
"karma": "1.5.0",
"karma-chrome-launcher": "2.0.0",
"karma-coverage": "1.1.1",
"karma-jasmine": "1.1.0",
"karma-spec-reporter": "0.0.26",
"karma-spec-reporter": "0.0.30",
"parallelshell": "2.0.0",
"remap-istanbul": "0.8.0",
"semantic-release": "6.3.2",
"tslint": "4.2.0",
"tslint": "4.4.2",
"typescript": "2.0.10",
"watch": "1.0.1"
"watch": "1.0.2"
},
"scripts": {
"prebuild": "npm run clean",
Expand Down
2 changes: 1 addition & 1 deletion src/controls/vg-controls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import 'rxjs/add/observable/fromEvent';
})
export class VgControls implements OnInit, AfterViewInit {
elem: HTMLElement;
vgFor: string;
target: any;

@HostBinding('style.pointer-events') isAdsPlaying: string = 'initial';
@HostBinding('class.hide') hideControls: boolean = false;

@Input() vgFor: string;
@Input() vgAutohide: boolean = false;
@Input() vgAutohideTime: number = 3;

Expand Down

0 comments on commit b863b90

Please sign in to comment.