material removed, angular updated to b16

This commit is contained in:
nixa 2016-05-11 12:55:46 +03:00
parent f375f936d8
commit a1e49ecc9b
8 changed files with 55 additions and 123 deletions

View file

@ -4,7 +4,7 @@ import {layoutPaths} from '../../../theme';
@Pipe({name: 'appPicture'})
export class AppPicturePipe implements PipeTransform {
transform(input:string, args:any[]):string {
transform(input:string):string {
return layoutPaths.images.root + input;
}
}

View file

@ -4,8 +4,7 @@ import {layoutPaths} from '../../../theme';
@Pipe({name: 'profilePicture'})
export class ProfilePicturePipe implements PipeTransform {
transform(input:string, args:string[]):string {
let ext = args[0] || 'png';
transform(input:string, ext = 'png'):string {
return layoutPaths.images.profile + input + '.' + ext;
}
}

View file

@ -1,37 +0,0 @@
import {MdButton, MdAnchor} from '@angular2-material/button';
import {MD_CARD_DIRECTIVES} from '@angular2-material/card';
import {MdCheckbox} from '@angular2-material/checkbox';
import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav';
import {MD_INPUT_DIRECTIVES} from '@angular2-material/input';
import {MD_LIST_DIRECTIVES} from '@angular2-material/list';
import {MdRadioGroup, MdRadioButton, MdRadioDispatcher} from '@angular2-material/radio';
import {MdSpinner, MdProgressCircle} from '@angular2-material/progress-circle';
import {MdToolbar} from '@angular2-material/toolbar';
/*
* we are grouping the module so we only need to manage the imports in one location
*/
export const MATERIAL_PIPES = [
];
export const MATERIAL_DIRECTIVES = [
...MD_SIDENAV_DIRECTIVES,
...[
MdAnchor,
MdButton,
MdToolbar,
MdCheckbox,
MdRadioButton,
MdSpinner,
MdProgressCircle
],
...MD_INPUT_DIRECTIVES,
...MD_LIST_DIRECTIVES,
...MD_CARD_DIRECTIVES
];
export const MATERIAL_PROVIDERS = [
MdRadioDispatcher
];

View file

@ -7,14 +7,9 @@ import {provide, PLATFORM_DIRECTIVES} from 'angular2/core';
// Angular 2 Router
import {ROUTER_DIRECTIVES} from 'angular2/router';
// Angular 2 Material 2
// TODO(gdi2290): replace with @angular2-material/all
import {MATERIAL_DIRECTIVES} from './angular2-material2';
// application_directives: directives that are global through out the application
export const APPLICATION_DIRECTIVES = [
...ROUTER_DIRECTIVES,
...MATERIAL_DIRECTIVES
...ROUTER_DIRECTIVES
];
export const DIRECTIVES = [

View file

@ -11,11 +11,9 @@ import {FORM_PROVIDERS} from 'angular2/common';
// Angular 2 Http
import {HTTP_PROVIDERS} from 'angular2/http';
// Angular 2 Router
import {ROUTER_PROVIDERS, LocationStrategy, PathLocationStrategy} from 'angular2/router';
import {ROUTER_PROVIDERS} from 'angular2/router';
// Angular 2 Material
// TODO(gdi2290): replace with @angular2-material/all
import {MATERIAL_PROVIDERS} from './angular2-material2';
import {LocationStrategy, PathLocationStrategy} from 'angular2/platform/common'
/*
* Application Providers/Directives/Pipes
@ -24,7 +22,6 @@ import {MATERIAL_PROVIDERS} from './angular2-material2';
export const APPLICATION_PROVIDERS = [
...FORM_PROVIDERS,
...HTTP_PROVIDERS,
...MATERIAL_PROVIDERS,
...ROUTER_PROVIDERS,
provide(LocationStrategy, { useClass: PathLocationStrategy })
];

View file

@ -16,22 +16,12 @@ import 'rxjs/add/operator/map';
import 'rxjs/add/operator/mergeMap';
// Web dependencies
// TODO: make sure this is a correct place
import 'jquery';
import 'bootstrap-loader';
import 'font-awesome-sass-loader';
// Angular 2 Material 2
// TODO(gdi2290): uncomment when material is fixed
// import '@angular2-material/sidenav';
// import '@angular2-material/toolbar';
// import '@angular2-material/button';
// import '@angular2-material/checkbox';
// import '@angular2-material/radio';
// import '@angular2-material/progress-circle';
// import '@angular2-material/card';
// look in platform/directives and platform/providers
if ('production' === ENV) {
// Production