Skip to content

Commit 85cd764

Browse files
committed
Restore master
1 parent d8a5472 commit 85cd764

File tree

12 files changed

+12
-210
lines changed

12 files changed

+12
-210
lines changed

app/demo-app.component.ts

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ import { Component, OnInit } from '@angular/core';
4343
<div class="col-sm-12">
4444
<label>General</label><br/>
4545
<form class="form-inline well">
46-
<div class="btn-group">
47-
<button type="button" class="btn btn-default dropdown-toggle" (click)="setLangMenu()">Select Language <span class="caret"></span></button>
48-
<ul class="dropdown-menu" [ngStyle]="{ display: langMenu }">
49-
<li *ngFor="let l of languages"><a (click)="setLanguage(l.code)" style="user-select:none">{{l.name}}</a></li>
50-
</ul>
51-
</div>
5246
<button class="btn btn-default" (click)="doFilter()">{{filterBtn()}}</button>
5347
<button class="btn btn-default" (click)="doSwap()">Swap source</button>
5448
<button class="btn btn-primary" (click)="doReset()">Reset</button>
@@ -60,16 +54,9 @@ import { Component, OnInit } from '@angular/core';
6054
`
6155
})
6256

63-
export class DemoAppComponent implements OnInit {
57+
export class DemoAppComponent implements OnInit{
6458

6559
tab = 1;
66-
langMenu = 'none';
67-
languages = [
68-
{ name: 'English', code: 'en-US' },
69-
{ name: 'French', code: 'fr' },
70-
{ name: 'Spanish', code: 'es' }
71-
];
72-
7360
keepSorted = true;
7461
key:string;
7562
display:string;
@@ -119,7 +106,7 @@ export class DemoAppComponent implements OnInit {
119106
{ key: 30, station: 'Elk Park', state: 'CO' },
120107
{ key: 31, station: 'Silverton', state: 'CO' },
121108
{ key: 32, station: 'Eureka', state: 'CO' }
122-
];
109+
];
123110

124111
private chessmen:Array<any> = [
125112
{ _id: 1, name: 'Pawn' },
@@ -213,20 +200,4 @@ export class DemoAppComponent implements OnInit {
213200
return (this.filter ? 'Hide Filter' : 'Show Filter');
214201
}
215202

216-
setLangMenu() {
217-
if (this.langMenu === 'none') {
218-
this.langMenu = 'inherit';
219-
} else {
220-
this.langMenu = 'none';
221-
}
222-
}
223-
224-
// http://stackoverflow.com/a/40363782
225-
setLanguage(language:string) {
226-
localStorage.setItem('localeId', language);
227-
location.reload(true);
228-
return false;
229-
}
230-
231-
232203
}

app/i18n-providers.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/main.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
22
import { enableProdMode } from '@angular/core';
3-
import { getTranslationProviders } from './i18n-providers';
43

54
import { AppModule } from './app.module';
65

76
const platform = platformBrowserDynamic();
87

98
enableProdMode();
109

11-
// platform.bootstrapModule( AppModule );
12-
13-
getTranslationProviders().then(providers => {
14-
const options = { providers };
15-
platform.bootstrapModule( AppModule, options);
16-
});
10+
platform.bootstrapModule( AppModule );
1711

1812

demo/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
<script src="demo/systemjs.config.js"></script>
2222
<script>
23-
System.config({map:{text:'systemjs-text-plugin.js'}});
2423
System.import('app').catch(function(err){ console.error(err); });
2524
</script>
2625
</head>

index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
<script src="systemjs.config.js"></script>
2727
<script>
28-
System.config({map:{text:'systemjs-text-plugin.js'}});
2928
System.import('app').catch(function(err){ console.error(err); });
3029
</script>
3130
</head>

lib/dual-list.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="listbox">
33
<button type="button" name="addBtn" class="btn btn-primary btn-block"
44
(click)="moveItem(available, confirmed)"
5-
[disabled]="available.pick.length === 0"><span i18n="add button|Add to confirmed list.">Add</span></button>
5+
[disabled]="available.pick.length === 0">Add</button>
66

77
<form *ngIf="filter" class="filter">
88
<input class="form-control" name="filterSource" [(ngModel)]="available.picker" (ngModelChange)="onFilter(available)">
@@ -21,16 +21,16 @@
2121

2222
<div class="button-bar">
2323
<button type="button" class="btn btn-primary pull-left" (click)="selectAll(available)"
24-
[disabled]="isAllSelected(available)"><span i18n="all button|Select all in list.">All</span></button>
24+
[disabled]="isAllSelected(available)">All</button>
2525
<button type="button" class="btn btn-default pull-right" (click)="selectNone(available)"
26-
[disabled]="!isAnySelected(available)"><span i18n="none button|Deselect all in list.">None</span></button>
26+
[disabled]="!isAnySelected(available)">None</button>
2727
</div>
2828
</div>
2929

3030
<div class="listbox" style="margin-left:10px;">
3131
<button type="button" name="removeBtn" class="btn btn-primary btn-block"
3232
(click)="moveItem(confirmed, available)"
33-
[disabled]="confirmed.pick.length === 0"><span i18n="remove button|Remove from confirimed list.">Remove</span></button>
33+
[disabled]="confirmed.pick.length === 0">Remove</button>
3434

3535
<form *ngIf="filter" class="filter">
3636
<input class="form-control" name="filterDestination" [(ngModel)]="confirmed.picker" (ngModelChange)="onFilter(confirmed)">
@@ -49,9 +49,9 @@
4949

5050
<div class="button-bar">
5151
<button type="button" class="btn btn-primary pull-left" (click)="selectAll(confirmed)"
52-
[disabled]="isAllSelected(confirmed)"><span i18n="all button|Select all in list.">All</span></button>
52+
[disabled]="isAllSelected(confirmed)">All</button>
5353
<button type="button" class="btn btn-default pull-right" (click)="selectNone(confirmed)"
54-
[disabled]="!isAnySelected(confirmed)"><span i18n="none button|Deselect all in list.">None</span></button>
54+
[disabled]="!isAnySelected(confirmed)">None</button>
5555
</div>
5656
</div>
5757
</div>

locale/messages.es.xlf

Lines changed: 0 additions & 31 deletions
This file was deleted.

locale/messages.fr.xlf

Lines changed: 0 additions & 31 deletions
This file was deleted.

locale/messages.xlf

Lines changed: 0 additions & 31 deletions
This file was deleted.

locale/messages.xmb

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)