From 3ba2ab6d4459ea298be3268a593f18d1d713f837 Mon Sep 17 00:00:00 2001
From: Dmitriy Schekhovtsov <valorkin@gmail.com>
Date: Sat, 16 Jan 2016 12:17:21 +0200
Subject: [PATCH] chore(upgrade): to ng2 beta 1

---
 .gitignore                                |  3 --
 .npmignore                                |  3 --
 components/ng2-select-config.ts           | 16 -------
 components/select/select-pipes.ts         |  2 +-
 components/select/select.ts               | 51 +++++++++++-----------
 demo/components/select-section.ts         | 10 ++---
 demo/components/select/children-demo.html |  4 +-
 demo/components/select/children-demo.ts   | 17 +++-----
 demo/components/select/multiple-demo.ts   | 17 +++-----
 demo/components/select/single-demo.ts     | 17 +++-----
 demo/index-bs4.html                       | 30 -------------
 demo/index.ts                             | 29 ++-----------
 ng2-select.ts                             |  1 -
 package.json                              | 52 ++++++++++++++---------
 tsconfig.json                             |  2 +-
 tsd.d.ts                                  |  2 -
 webpack.config.js                         |  2 +-
 17 files changed, 85 insertions(+), 173 deletions(-)
 delete mode 100644 components/ng2-select-config.ts
 delete mode 100644 demo/index-bs4.html
 delete mode 100644 tsd.d.ts

diff --git a/.gitignore b/.gitignore
index 5d689f8f..f68b09fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,6 @@
 /node_modules
 npm-debug.log
 
-# type script artifacts
-/typings
-
 # WebStorm
 .idea
 
diff --git a/.npmignore b/.npmignore
index 6dfb3920..f4ba59a3 100644
--- a/.npmignore
+++ b/.npmignore
@@ -4,7 +4,4 @@ build
 gulp-tasks
 logs
 
-tsd.d.ts
-typings
-
 webpack.config.js
diff --git a/components/ng2-select-config.ts b/components/ng2-select-config.ts
deleted file mode 100644
index fe42301b..00000000
--- a/components/ng2-select-config.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export enum Ng2SelectTheme {BS3 = 1, BS4 = 2}
-
-export class Ng2SelectConfig {
-  private static _theme: Ng2SelectTheme;
-  static get theme():Ng2SelectTheme {
-    // hack as for now
-    let w: any = window;
-    if (w && w.__theme === 'bs4') {
-      return Ng2SelectTheme.BS4;
-    }
-    return (this._theme || Ng2SelectTheme.BS3);
-  }
-  static set theme(v:Ng2SelectTheme){
-    this._theme = v;
-  }
-}
diff --git a/components/select/select-pipes.ts b/components/select/select-pipes.ts
index 97ca0ecd..03df053a 100644
--- a/components/select/select-pipes.ts
+++ b/components/select/select-pipes.ts
@@ -1,4 +1,4 @@
-import {Pipe} from 'angular2/angular2';
+import {Pipe} from 'angular2/core';
 
 @Pipe({
   name: 'hightlight'
diff --git a/components/select/select.ts b/components/select/select.ts
index fcbeaf1b..a9cb6ce0 100644
--- a/components/select/select.ts
+++ b/components/select/select.ts
@@ -1,42 +1,41 @@
 import {
-  Component, View, OnInit, OnDestroy,
-  Directive, ViewEncapsulation, Self,
-  EventEmitter, ElementRef, ComponentRef,
-  Pipe, CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle,
+  Component, OnInit, OnDestroy,
+  EventEmitter, ElementRef, Pipe,
   bind, forwardRef, ResolvedBinding, Injector
-} from 'angular2/angular2';
+} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from 'angular2/common';
 
 import {SelectItem} from './select-item';
 import {HightlightPipe} from './select-pipes';
 import {IOptionsBehavior} from './select-interfaces';
 
 let optionsTemplate = `
-    <ul *ng-if="optionsOpened && options && options.length > 0 && !itemObjects[0].hasChildren()"
+    <ul *ngIf="optionsOpened && options && options.length > 0 && !itemObjects[0].hasChildren()"
         class="ui-select-choices ui-select-choices-content ui-select-dropdown dropdown-menu">
       <li class="ui-select-choices-group">
-        <div *ng-for="#o of options"
+        <div *ngFor="#o of options"
              class="ui-select-choices-row"
+             [ngClass]="{'active': isActive(o)}"
              (mouseenter)="selectActive(o)"
-             (click)="selectMatch(o, $event)"
-             [ng-class]="{'active': isActive(o)}">
+             (click)="selectMatch(o, $event)">
           <a href="javascript:void(0)" class="ui-select-choices-row-inner">
-            <div [inner-html]="o.text | hightlight:inputValue"></div>
+            <div [innerHtml]="o.text | hightlight:inputValue"></div>
           </a>
         </div>
       </li>
     </ul>
 
-    <ul *ng-if="optionsOpened && options && options.length > 0 && itemObjects[0].hasChildren()"
+    <ul *ngIf="optionsOpened && options && options.length > 0 && itemObjects[0].hasChildren()"
         class="ui-select-choices ui-select-choices-content ui-select-dropdown dropdown-menu">
-      <li *ng-for="#c of options; #index=index" class="ui-select-choices-group">
-        <div class="divider" *ng-if="index > 0"></div>
+      <li *ngFor="#c of options; #index=index" class="ui-select-choices-group">
+        <div class="divider" *ngIf="index > 0"></div>
         <div class="ui-select-choices-group-label dropdown-header">{{c.text}}</div>
 
-        <div *ng-for="#o of c.children"
+        <div *ngFor="#o of c.children"
              class="ui-select-choices-row"
+             [class.active]="isActive(o)"
              (mouseenter)="selectActive(o)"
-             (click)="selectMatch(o, $event)"
-             [ng-class]="{'active': isActive(o)}">
+             (click)="selectMatch(o, $event)">
           <a href="javascript:void(0)" class="ui-select-choices-row-inner">
             <div [inner-html]="o.text | hightlight:inputValue"></div>
           </a>
@@ -46,7 +45,7 @@ let optionsTemplate = `
 `;
 
 @Component({
-  selector: 'ng2-select',
+  selector: 'ng-select',
   properties: [
     'allowClear',
     'placeholder',
@@ -54,9 +53,7 @@ let optionsTemplate = `
     'items',
     'disabled',
     'multiple'],
-  events: ['selected', 'removed', 'typed', 'data']
-})
-@View({
+  events: ['selected', 'removed', 'typed', 'data'],
   template: `
   <div tabindex="0"
      *ng-if="multiple === false"
@@ -133,10 +130,10 @@ export class Select implements OnInit, OnDestroy {
   public active:Array<SelectItem> = [];
   public activeOption:SelectItem;
 
-  private data:EventEmitter = new EventEmitter();
-  private selected:EventEmitter = new EventEmitter();
-  private removed:EventEmitter = new EventEmitter();
-  private typed:EventEmitter = new EventEmitter();
+  private data:EventEmitter<any> = new EventEmitter();
+  private selected:EventEmitter<any> = new EventEmitter();
+  private removed:EventEmitter<any> = new EventEmitter();
+  private typed:EventEmitter<any> = new EventEmitter();
   private allowClear:boolean = false;
   private placeholder:string = '';
   private initData:Array<any> = [];
@@ -237,7 +234,7 @@ export class Select implements OnInit, OnDestroy {
     }
   }
 
-  onInit() {
+  ngOnInit() {
     this.behavior = this.itemObjects[0].hasChildren() ?
       new Select.ChildrenBehavior(this) : new Select.GenericBehavior(this);
     this.offSideClickHandler = this.getOffSideClickHandler(this);
@@ -249,7 +246,7 @@ export class Select implements OnInit, OnDestroy {
     }
   }
 
-  onDestroy() {
+  ngOnDestroy() {
     document.removeEventListener('click', this.offSideClickHandler);
     this.offSideClickHandler = null;
   }
@@ -623,4 +620,4 @@ export module Select {
   }
 }
 
-export const select:Array<any> = [Select];
+export const SELECT_DIRECTIVES:Array<any> = [Select];
diff --git a/demo/components/select-section.ts b/demo/components/select-section.ts
index a4e4ceaa..88e9377a 100644
--- a/demo/components/select-section.ts
+++ b/demo/components/select-section.ts
@@ -1,8 +1,8 @@
-/// <reference path="../../tsd.d.ts" />
-
-import {Component, View, CORE_DIRECTIVES} from 'angular2/angular2';
+import {Component} from 'angular2/core';
+import {CORE_DIRECTIVES} from 'angular2/common';
 
 import {tabs} from 'ng2-bootstrap/ng2-bootstrap';
+
 import {SingleDemo} from './select/single-demo';
 import {MultipleDemo} from './select/multiple-demo';
 import {ChildrenDemo} from './select/children-demo';
@@ -60,9 +60,7 @@ tabDesc.forEach(desc => {
 });
 
 @Component({
-  selector: 'select-section'
-})
-@View({
+  selector: 'select-section',
   template: `
   <section id="${name.toLowerCase()}">
     <div class="row">
diff --git a/demo/components/select/children-demo.html b/demo/components/select/children-demo.html
index 9fadb30a..b63df565 100644
--- a/demo/components/select/children-demo.html
+++ b/demo/components/select/children-demo.html
@@ -1,12 +1,12 @@
 <div class="selectivity-input example-input" style="width: 300px; margin-bottom: 20px;">
     <h3>Select a city by country</h3>
-    <ng2-select [allow-clear]="true"
+    <ng-select [allow-clear]="true"
                 [items]="items"
                 [disabled]="disabled"
                 (data)="refreshValue($event)"
                 (selected)="selected($event)"
                 (removed)="removed($event)"
-                [placeholder]="'No city selected'"></ng2-select>
+                [placeholder]="'No city selected'"></ng-select>
     <p><pre>{{value.text}}</pre></p>
     <div>
         <button type="button" class="btn btn-primary"
diff --git a/demo/components/select/children-demo.ts b/demo/components/select/children-demo.ts
index 07445083..a825a5b6 100644
--- a/demo/components/select/children-demo.ts
+++ b/demo/components/select/children-demo.ts
@@ -1,23 +1,16 @@
-/// <reference path="../../../tsd.d.ts" />
-
-import {
-  Component, View,
-  CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass
-} from 'angular2/angular2';
-
+import {Component} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
 import {ButtonCheckbox} from 'ng2-bootstrap/ng2-bootstrap';
 
-import {select} from '../../../ng2-select';
+import {SELECT_DIRECTIVES} from '../../../ng2-select';
 
 // webpack html imports
 let template = require('./children-demo.html');
 
 @Component({
-  selector: 'children-demo'
-})
-@View({
+  selector: 'children-demo',
   template: template,
-  directives: [select, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
+  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
 })
 export class ChildrenDemo {
   private value:any = {};
diff --git a/demo/components/select/multiple-demo.ts b/demo/components/select/multiple-demo.ts
index 4d6c8c8d..c0877d31 100644
--- a/demo/components/select/multiple-demo.ts
+++ b/demo/components/select/multiple-demo.ts
@@ -1,23 +1,16 @@
-/// <reference path="../../../tsd.d.ts" />
-
-import {
-  Component, View,
-  CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass
-} from 'angular2/angular2';
-
+import {Component} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
 import {ButtonCheckbox} from 'ng2-bootstrap/ng2-bootstrap';
 
-import {select} from '../../../ng2-select';
+import {SELECT_DIRECTIVES} from '../../../ng2-select';
 
 // webpack html imports
 let template = require('./multiple-demo.html');
 
 @Component({
-  selector: 'multiple-demo'
-})
-@View({
+  selector: 'multiple-demo',
   template: template,
-  directives: [select, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
+  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
 })
 export class MultipleDemo {
   private value:any = ['Athens'];
diff --git a/demo/components/select/single-demo.ts b/demo/components/select/single-demo.ts
index aa0c0114..1ff20ac2 100644
--- a/demo/components/select/single-demo.ts
+++ b/demo/components/select/single-demo.ts
@@ -1,23 +1,16 @@
-/// <reference path="../../../tsd.d.ts" />
-
-import {
-  Component, View,
-  CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass
-} from 'angular2/angular2';
-
+import {Component} from 'angular2/core';
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass} from 'angular2/common';
 import {ButtonCheckbox} from 'ng2-bootstrap/ng2-bootstrap';
 
-import {select} from '../../../ng2-select';
+import {SELECT_DIRECTIVES} from '../../../ng2-select';
 
 // webpack html imports
 let template = require('./single-demo.html');
 
 @Component({
-  selector: 'single-demo'
-})
-@View({
+  selector: 'single-demo',
   template: template,
-  directives: [select, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
+  directives: [SELECT_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES, ButtonCheckbox]
 })
 export class SingleDemo {
   private value:any = {};
diff --git a/demo/index-bs4.html b/demo/index-bs4.html
deleted file mode 100644
index 62afda30..00000000
--- a/demo/index-bs4.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>Angular2 Select</title>
-
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="description" content="Angular2 Select">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" href="data:;base64,iVBORw0KGgo=">
-
-  <!--link to bootstrap.css v4.0.0-alpha-->
-  <link rel="stylesheet" href="assets/css/prism-okaidia.css">
-  <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha/css/bootstrap.min.css" rel="stylesheet">
-  <link rel="stylesheet" href="assets/css/style.css">
-  <link rel="stylesheet" href="assets/css/glyphicons.css">
-  <link rel="stylesheet" href="assets/css/ng2-select.css">
-</head>
-<body>
-  <app>Loading...</app>
-
-  <script>window.__theme = 'bs4';</script>
-  <!-- Angular2 files -->
-  <script src="/build/angular2.js"></script>
-  <!-- Angular2 select script -->
-  <script src="/build/angular2-select.js"></script>
-  <!-- App script -->
-  <script src="/build/angular2-select-demo.js"></script>
-</body>
-</html>
diff --git a/demo/index.ts b/demo/index.ts
index 9384e67b..d4058697 100644
--- a/demo/index.ts
+++ b/demo/index.ts
@@ -1,25 +1,14 @@
-/// <reference path="../tsd.d.ts" />
-import {Component, View, bootstrap, NgClass} from 'angular2/angular2';
-
-import {Ng2SelectConfig, Ng2SelectTheme} from '../ng2-select';
-
-let w:any = window;
-if (w && w.__theme === 'bs4') {
-  Ng2SelectConfig.theme = Ng2SelectTheme.BS4;
-}
-
+import {bootstrap} from 'angular2/bootstrap';
+import {Component} from 'angular2/core';
+import {NgClass} from 'angular2/common';
 
 import {SelectSection} from './components/select-section';
 
 let gettingStarted = require('./getting-started.md');
 
 @Component({
-  selector: 'app'
-})
-@View({
+  selector: 'app',
   template: `
-  <!--<demo-header>Loading header</demo-header>-->
-
   <main class="bd-pageheader">
     <div class="container">
       <h1>ng2-select</h1>
@@ -33,15 +22,6 @@ let gettingStarted = require('./getting-started.md');
   </main>
 
   <div class="container">
-    <div class="col-md-12 card card-block panel panel-default">
-      <selection>
-          <h1>ng2-select available with:
-          <a class="btn btn-default btn-secondary btn-lg" [ng-class]="{active: isBs3}" href="./">Bootstrap 3</a>
-          <a class="btn btn-default btn-secondary btn-lg" [ng-class]="{active: !isBs3}" href="./index-bs4.html">Bootstrap 4</a>
-          </h1>
-      </selection>
-    </div>
-    <br>
     <section id="getting-started">${gettingStarted}</section>
 
     <select-section class="col-md-12"></select-section>
@@ -60,7 +40,6 @@ let gettingStarted = require('./getting-started.md');
   ]
 })
 export class Demo {
-  private isBs3:boolean = Ng2SelectConfig.theme === Ng2SelectTheme.BS3;
 }
 
 bootstrap(Demo);
diff --git a/ng2-select.ts b/ng2-select.ts
index bb8d1d19..7138b2e2 100644
--- a/ng2-select.ts
+++ b/ng2-select.ts
@@ -1,2 +1 @@
 export * from './components/select/select';
-export * from './components/ng2-select-config';
diff --git a/package.json b/package.json
index 91235834..6aae6b3f 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "ng2-select",
-  "version": "0.44.0",
-  "description": "angular2 select component",
+  "version": "1.0.0-beta.0",
+  "description": "Angular2 based replacement for select boxes",
   "scripts": {
     "deploy": "NODE_ENV=production webpack -p --progress --color --optimize-minimize --optimize-dedupe --optimize-occurence-order",
-    "prepublish": "gulp clean",
+    "prepublish": "gulp clean && tsc",
     "dev": "webpack-dev-server --hot --inline --colors --display-error-details --display-cached",
     "start": "npm run dev",
     "test": "gulp lint"
@@ -27,37 +27,51 @@
     "url": "https://github.com/valor-software/ng2-select/issues"
   },
   "homepage": "https://github.com/valor-software/ng2-select#readme",
-  "dependencies": {
-    "angular2": "2.0.0-alpha.44",
-    "reflect-metadata": "0.1.2",
-    "zone.js": "0.5.8"
-  },
+  "dependencies": {},
   "devDependencies": {
-    "bootstrap": "3.3.5",
-    "clean-webpack-plugin": "0.1.3",
+    "angular2": "2.0.0-beta.1",
+    "bootstrap": "3.3.6",
+    "clean-webpack-plugin": "0.1.6",
     "compression-webpack-plugin": "0.2.0",
+    "es6-shim": "0.33.13",
     "eslint": "1.10.3",
     "exports-loader": "0.6.2",
-    "file-loader": "0.8.4",
+    "file-loader": "0.8.5",
     "gulp": "3.9.0",
     "gulp-clean": "0.3.1",
     "gulp-eslint": "1.1.1",
     "gulp-size": "2.0.0",
-    "gulp-tsc": "1.1.1",
-    "gulp-tslint": "4.3.0",
-    "html-loader": "0.3.0",
+    "gulp-tsc": "1.1.4",
+    "gulp-tslint": "4.2.2",
+    "html-loader": "0.4.0",
     "markdown-loader": "0.1.7",
     "marked": "0.3.5",
     "moment": "2.11.1",
-    "ng2-bootstrap": "0.44.3",
-    "pre-commit": "1.1.1",
+    "ng2-bootstrap": "1.0.0-beta.2",
+    "pre-commit": "1.1.2",
     "prismjs": "valorkin/prism",
     "prismjs-loader": "0.0.2",
     "raw-loader": "0.5.1",
+    "reflect-metadata": "0.1.2",
     "require-dir": "0.3.0",
+    "rxjs": "5.0.0-beta.0",
     "ts-loader": "0.7.2",
+    "tslint": "3.2.1",
     "typescript": "1.7.5",
-    "webpack": "1.12.2",
-    "webpack-dev-server": "1.14.1"
-  }
+    "webpack": "1.12.10",
+    "webpack-dev-server": "1.14.0",
+    "zone.js": "0.5.10"
+  },
+  "contributors": [
+    {
+      "name": "Vyacheslav Chub",
+      "email": "vyacheslav.chub@valor-software.com",
+      "url": "https://github.com/buchslava"
+    },
+    {
+      "name": "Dmitriy Shekhovtsov",
+      "email": "valorkin@gmail.com",
+      "url": "https://github.com/valorkin"
+    }
+  ]
 }
diff --git a/tsconfig.json b/tsconfig.json
index c61a69e0..0648cae7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.7.3",
+  "version": "1.7.5",
   "compilerOptions": {
     "target": "es5",
     "module": "commonjs",
diff --git a/tsd.d.ts b/tsd.d.ts
deleted file mode 100644
index 34291dc2..00000000
--- a/tsd.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference path="node_modules/angular2/typings/es6-shim/es6-shim.d.ts"/>
-declare function require(path:string): any;
diff --git a/webpack.config.js b/webpack.config.js
index d0f543c6..fdd2f178 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -90,7 +90,7 @@ var config = {
   module: {
     loaders: [
       // support markdown
-      {test: /\.md$/, loader: 'html!markdown'},
+      {test: /\.md$/, loader: 'html?minimize=false!markdown'},
 
       // Support for *.json files.
       {test: /\.json$/, loader: 'json'},