Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 7ad8cbf

Browse files
author
Josh Graber
committed
Merge pull request #245 from SamGraber/master
Standardizing 'transform' terminology
2 parents e2735ee + 8f5f25c commit 7ad8cbf

19 files changed

+2409
-2413
lines changed

bootstrapper/app.html

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<div class="row">
2+
<div class="col-xs-2">
3+
<ul class="nav nav-pills nav-stacked">
4+
<li><a ui-sref="/">Home</a></li>
5+
<li><a ui-sref="inputs">Inputs</a></li>
6+
<li><a ui-sref="buttons">Buttons</a></li>
7+
<li><a ui-sref="popup">Popup content</a></li>
8+
<li><a ui-sref="cards">Cards</a></li>
9+
<li><a ui-sref="tabs">Tabs</a></li>
10+
<li><a ui-sref="forms">Forms</a></li>
11+
<li><a ui-sref="messageLog">Message log</a></li>
12+
<li><a ui-sref="misc">Misc</a></li>
13+
</ul>
14+
</div>
15+
16+
<div class="col-xs-10">
17+
<div ui-view class="view-window"></div>
18+
</div>
19+
</div>

bootstrapper/app.js

+2,303-2,287
Large diffs are not rendered by default.

bootstrapper/bootstrapApp.d.ts

Whitespace-only changes.

bootstrapper/bootstrapApp.js

-71
This file was deleted.

bootstrapper/bootstrapper.js

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bootstrapper/bootstrapper.ts

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ import { moduleName as formModuleName } from './forms/formsBootstrapper';
1414
import { moduleName as miscModuleName } from './misc/miscBootstrapper';
1515
import { moduleName as textModuleName } from './text/text';
1616

17+
const bootstrapper: angular.IComponentOptions = {
18+
template: require('./app.html'),
19+
}
20+
1721
angular.module('app', [
1822
componentsModule,
1923
'ui.router',
@@ -28,6 +32,7 @@ angular.module('app', [
2832
miscModuleName,
2933
textModuleName,
3034
])
35+
.component('tsBootstrapper', bootstrapper)
3136
.config(BaseRoute)
3237
.config(notificationConfig);
3338

bootstrapper/inputs/inputs.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ <h3><a href="https://github.com/SamGraber/TypeScript-Angular-Components/blob/mas
2121
</div>
2222
<div>
2323
<label><a href="https://github.com/SamGraber/TypeScript-Angular-Components/tree/master/source/components/select/select.md">Select</a>:</label>
24-
<rl-select ng-model="input.dropdownSelection" get-options="input.getOptions()" selector="'name'" null-option="None"></rl-select>
25-
<rl-select ng-model="input.dropdownSelection" get-options="input.getOptions()" selector="'name'">
24+
<rl-select ng-model="input.dropdownSelection" get-options="input.getOptions()" transform="'name'" null-option="None"></rl-select>
25+
<rl-select ng-model="input.dropdownSelection" get-options="input.getOptions()" transform="'name'">
2626
<div class="row">
2727
<div class="col-sm-6">{{$item.name}}</div>
2828
<div class="col-sm-6">{{$item.value}}</div>
2929
</div>
3030
</rl-select>
31-
<rl-select ng-model="input.dropdownSelection" get-options="input.getOptions()" selector="'name'" item-as="TestItem">
31+
<rl-select ng-model="input.dropdownSelection" get-options="input.getOptions()" transform="'name'" item-as="TestItem">
3232
{{TestItem.name}}
3333
</rl-select>
3434
</div>

index.html

+2-18
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,8 @@
2020
<script src="/node_modules/typescript-angular-utilities/output/utilities.js"></script>
2121
<script src="/bootstrapper/app.js"></script>
2222

23-
<div ng-app="app" class="row">
24-
<div class="col-xs-2">
25-
<ul class="nav nav-pills nav-stacked">
26-
<li><a ui-sref="/">Home</a></li>
27-
<li><a ui-sref="inputs">Inputs</a></li>
28-
<li><a ui-sref="buttons">Buttons</a></li>
29-
<li><a ui-sref="popup">Popup content</a></li>
30-
<li><a ui-sref="cards">Cards</a></li>
31-
<li><a ui-sref="tabs">Tabs</a></li>
32-
<li><a ui-sref="forms">Forms</a></li>
33-
<li><a ui-sref="messageLog">Message log</a></li>
34-
<li><a ui-sref="misc">Misc</a></li>
35-
</ul>
36-
</div>
37-
38-
<div class="col-xs-10">
39-
<div ui-view class="view-window"></div>
40-
</div>
23+
<div ng-app="app">
24+
<ts-bootstrapper></ts-bootstrapper>
4125
</div>
4226
</body>
4327
</html>

0 commit comments

Comments
 (0)