Commit b59876fc authored by dmacfarlane's avatar dmacfarlane
Browse files

Update to angular-2.0.0 and cli 1.0.0-beta.14

parent c00ec927

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
# compiled output

/dist

/tmp

# module dist

/mention



# dependencies

/node_modules

.npmignore

+7 −2
Original line number Diff line number Diff line 
# See http://help.github.com/ignore-files/ for more about ignoring files.



# compiled output

# /dist

/dist

/tmp



# dependencies
@@ -10,6 +10,10 @@ 


# IDEs and editors

/.idea

.project

.classpath

*.launch

.settings/



# misc

/.sass-cache
@@ -26,3 +30,4 @@ testem.log 


#System Files

.DS_Store

Thumbs.db
 
 No newline at end of file

README.md

+10 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ To install and start the demo application: 


### Usage



Copy the mention folder into your own application, or install the package as a dependency using:

Install the package as a dependency using:



    npm install --save ng2-mentions
@@ -24,6 +24,15 @@ Add the CSS to your index.html: 


    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">



Add the module to your module imports:



    import { MentionModule } from 'ng2-mentions/mention/mention.module';



    @NgModule({

        imports: [ MentionModule ],

        ...

    })



Add the `[mention]` directive to your input element:



    <input [mention]="items" class="form-control" type="text">

angular-cli-build.js

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
// Angular-CLI build configuration

// This file lists all the node_modules files that will be used in a build

// Also see https://github.com/angular/angular-cli/wiki/3rd-party-libs



/* global require, module */



var Angular2App = require('angular-cli/lib/broccoli/angular2-app');



module.exports = function(defaults) {

  return new Angular2App(defaults, {

    vendorNpmFiles: [

      'systemjs/dist/system-polyfills.js',

      'systemjs/dist/system.src.js',

      'zone.js/dist/**/*.+(js|js.map)',

      'es6-shim/es6-shim.js',

      'reflect-metadata/**/*.+(ts|js|js.map)',

      'rxjs/**/*.+(js|js.map)',

      '@angular/**/*.+(js|js.map)'

    ]

  });

};

angular-cli.json

+22 −10
Original line number Diff line number Diff line 
{

  "project": {

    "version": "1.0.0-beta.9",

    "version": "1.0.0-beta.11-webpack.9-4",

    "name": "ng2-mentions"

  },

  "apps": [

    {

      "main": "src/main.ts",

      "tsconfig": "src/tsconfig.json",

      "mobile": false

      "root": "src",

      "outDir": "dist",

      "assets": "assets",

      "index": "index.html",

      "main": "main.ts",

      "test": "test.ts",

      "tsconfig": "tsconfig.json",

      "prefix": "app",

      "mobile": false,

      "styles": [

        "styles.css"

      ],

      "scripts": [],

      "environments": {

        "source": "environments/environment.ts",

        "dev": "environments/environment.ts",

        "prod": "environments/environment.prod.ts"

      }

    }

  ],

  "addons": [],

  "packages": [],

  "e2e": {

    "protractor": {

      "config": "config/protractor.conf.js"

      "config": "./protractor.conf.js"

    }

  },

  "test": {

    "karma": {

      "config": "config/karma.conf.js"

      "config": "./karma.conf.js"

    }

  },

  "defaults": {

    "prefix": "app",

    "sourceDir": "src",

    "styleExt": "css",

    "prefixInterfaces": false,

    "lazyRoutePrefix": "+"

    "prefixInterfaces": false

  }

}