Commit b2f50bc8 authored by dmacfarlane's avatar dmacfarlane
Browse files

Updated to angular 2.0.0-rc.6

parent 612236c4

README.md

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Where `items` is a string array of the items to suggest. For example: 


- Remove debug (always)

- Improve NPM package structure

- Configurable prefix

- Document configurable prefix

- Configurable limit on number of items shown via config

- Load items via http (config number of chars before search)

- Styled menu items

e2e/app.e2e-spec.ts

+5 −5
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ describe('ng2-mentions App', function() { 
      expect(getValue(el, tagName)).toEqual('Hello @Aaron and @Gavin and !!');

      

      // and insert another mention

      el.sendKeys('@he', protractor.Key.ENTER, protractor.Key.BACK_SPACE);

      el.sendKeys('@he', protractor.Key.ENTER);

      browser.sleep(500);

      expect(menu.isDisplayed()).toBe(false);

      expect(getValue(el, tagName)).toEqual('Hello @Aaron and @Gavin and @Henry!!');

package.json

+33 −33
Original line number Diff line number Diff line
@@ -24,19 +24,19 @@ 
  },

  "private": false,

	"dependencies": {

    "@angular/common": "2.0.0-rc.4",

    "@angular/compiler": "2.0.0-rc.4",

    "@angular/core": "2.0.0-rc.4",

    "@angular/forms": "0.2.0",

    "@angular/http": "2.0.0-rc.4",

    "@angular/platform-browser": "2.0.0-rc.4",

    "@angular/platform-browser-dynamic": "2.0.0-rc.4",

    "@angular/router": "3.0.0-beta.2",

		"@angular/common": "2.0.0-rc.6",

		"@angular/compiler": "2.0.0-rc.6",

		"@angular/core": "2.0.0-rc.6",

		"@angular/forms": "2.0.0-rc.6",

		"@angular/http": "2.0.0-rc.6",

		"@angular/platform-browser": "2.0.0-rc.6",

		"@angular/platform-browser-dynamic": "2.0.0-rc.6",

		"@angular/router": "3.0.0-rc.2",

		"es6-shim": "0.35.1",

		"reflect-metadata": "0.1.3",

    "rxjs": "5.0.0-beta.6",

		"rxjs": "5.0.0-beta.11",

		"systemjs": "0.19.26",

    "zone.js": "0.6.12"

		"zone.js": "0.6.17"

	},

	"devDependencies": {

		"angular-cli": "1.0.0-beta.9",

src/app/app.component.ts

+4 −6
Original line number Diff line number Diff line
@@ -5,11 +5,9 @@ import { COMMON_NAMES } from './common-names'; 
import { TinyMCE } from './tinymce.component';



@Component({

    moduleId: module.id,

  selector: 'app-root',

    templateUrl: 'app.component.html',

    //styleUrls: ['app.component.css'],

    directives: [Mention, TinyMCE]

  templateUrl: 'app/app.component.html',

  //styleUrls: ['app/app.component.css'],

})

export class AppComponent {

  items: string[] = COMMON_NAMES;

src/app/app.module.ts

0 → 100644
+20 −0
Original line number Diff line number Diff line 
import { BrowserModule } from '@angular/platform-browser';

import { NgModule } from '@angular/core';



import { AppComponent } from './app.component';

import { MentionModule } from '../mention/mention.module';

import { TinyMCE } from './tinymce.component';



@NgModule({

  imports: [

    BrowserModule,

    MentionModule

  ],

  declarations: [

    AppComponent,

    TinyMCE

  ],

  providers: [],

  bootstrap: [AppComponent]

})

export class AppModule { }