Skip to content

Commit

Permalink
fix(package.json): update to angular beta.17
Browse files Browse the repository at this point in the history
  • Loading branch information
JonnyBGod committed May 3, 2016
1 parent bcd926e commit 2e1fbf5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
"immutable": "^3.8.0"
},
"devDependencies": {
"angular2": "~2.0.0-beta.15",
"commitizen": "~2.7.2",
"angular2": "~2.0.0-beta.17",
"commitizen": "~2.8.1",
"cz-conventional-changelog": "~1.1.5",
"es6-shim": "^0.35.0",
"jasmine-core": "~2.4.1",
"karma": "~0.13.21",
"karma-chrome-launcher": "~0.2.2",
"karma-chrome-launcher": "~1.0.1",
"karma-firefox-launcher": "~0.1.7",
"karma-jasmine": "~0.3.6",
"karma-typescript-preprocessor": "0.0.21",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"rxjs": "5.0.0-beta.6",
"semantic-release": "^4.3.5",
"systemjs": "~0.19.6",
"tslint": "^3.2.1",
"typescript": "~1.8.10",
"typings": "^0.7.12",
"zone.js": "~0.6.4"
"typings": "^0.8.1",
"zone.js": "~0.6.12"
},
"bugs": {
"url": "http://github.com/jonnybgod/ng2-scrollspy/issues"
Expand Down
2 changes: 1 addition & 1 deletion src/core/element.directive.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Directive, Injectable, Input, OnInit, OnDestroy} from 'angular2/core';
import {ReplaySubject} from 'rxjs/subject/ReplaySubject';

This comment has been minimized.

Copy link
@hhsadiq

hhsadiq May 4, 2016

Hi there, can you tell whey you removed subject..?? It is causing error on angular2 v15...

This comment has been minimized.

Copy link
@JonnyBGod

JonnyBGod May 4, 2016

Author Owner

It changed with rxjs5.0.0.beta.6. And since angular2 beta.17 this is the used version of rxjs.
If you are still using beta.15 you should be using the previous version of this library.

import {ReplaySubject} from 'rxjs/ReplaySubject';
import {ScrollSpyService} from './service';

@Injectable()
Expand Down
2 changes: 1 addition & 1 deletion src/core/window.directive.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Directive, Injectable, OnInit} from 'angular2/core';
import {ReplaySubject} from 'rxjs/subject/ReplaySubject';
import {ReplaySubject} from 'rxjs/ReplaySubject';
import {ScrollSpyService} from './service';

@Injectable()
Expand Down
12 changes: 6 additions & 6 deletions src/plugin/index.render.directive.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Injectable, Input, ElementRef, DynamicComponentLoader, OnInit, AfterViewInit, ComponentRef, OnDestroy, ChangeDetectionStrategy} from 'angular2/core';
import {Component, Injectable, Input, ElementRef, DynamicComponentLoader, OnInit, AfterViewInit, ComponentRef, ViewContainerRef, ViewChild, OnDestroy, ChangeDetectionStrategy} from 'angular2/core';
import {BrowserDomAdapter} from 'angular2/platform/browser';

import {ScrollSpyService} from '../index';
Expand All @@ -21,6 +21,7 @@ export interface ScrollSpyIndexRenderOptions {
})
export class ScrollSpyIndexRenderDirective implements OnInit, AfterViewInit, OnDestroy {
@Input('scrollSpyIndexRender') options: ScrollSpyIndexRenderOptions;
@ViewChild('container', {read: ViewContainerRef}) viewContainerRef: ViewContainerRef;

private defaultOptions: ScrollSpyIndexRenderOptions = {
spyId: 'window',
Expand Down Expand Up @@ -113,11 +114,10 @@ export class ScrollSpyIndexRenderDirective implements OnInit, AfterViewInit, OnD
markup += '</ul>';

this.removeChildren();
this.loader.loadIntoLocation(
this.loader.loadNextToLocation(
this.compileToComponent(markup, [], () => this.getItemsToHighlight()),
this.elRef,
'container'
).then((ref) => {
this.viewContainerRef
).then((ref: ComponentRef) => {
this._children.push(ref);
});
//this.DOM.setInnerHTML(this.el, markup);
Expand Down Expand Up @@ -235,7 +235,7 @@ export class ScrollSpyIndexRenderDirective implements OnInit, AfterViewInit, OnD
}

removeChildren() {
this._children.forEach(cmp => cmp.dispose());
this._children.forEach(cmp => cmp.destroy());
this._children = [];
}

Expand Down

0 comments on commit 2e1fbf5

Please sign in to comment.