Skip to content

Angular 1 0 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heisaf wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Angular 1 0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1072b8d
angulardart 1.0 upgrade
Dec 7, 2014
d712f14
karma - package.json added
Dec 7, 2014
fb87814
example converted
Dec 8, 2014
7dd2ea5
generated js files and source maps should be ignored
heisaf Dec 14, 2014
cc40af4
app/example/pubspec.yaml - angular version fixed
heisaf Dec 15, 2014
518f8e1
folder npm_modules ignored
heisaf Dec 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@
*.iml
pubspec.lock
packages
**/packages
**/packages
*.dart.js
*.js_
*.js.deps
*.js.map
app/example/.pub/*
.pub/*
node_modules/*
6 changes: 3 additions & 3 deletions app/example/lib/example_pager/example_pager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<button ng-click="m.paginator.goPrev()">Prev</button>
<span>Page {{m.paginator.pageNum}} ({{m.paginator.currentFirst}}&mdash;{{m.paginator.currentLast}} of {{m.paginator.itemsTotal}})</span>
<button ng-click="m.paginator.goNext()">Next</button>
<button ng-click="paginator.goPrev()">Prev</button>
<span>Page {{paginator.pageNum}} ({{paginator.currentFirst}}&mdash;{{paginator.currentLast}} of {{paginator.itemsTotal}})</span>
<button ng-click="paginator.goNext()">Next</button>
</div>
2 changes: 1 addition & 1 deletion app/example/lib/example_pager/module.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ part 'example_pager.dart';

class ExamplePagerModule extends Module {
ExamplePagerModule() {
type(NgxExamplePager);
bind(NgxExamplePager);
}
}
2 changes: 1 addition & 1 deletion app/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: Egor Day <edaydev@gmail.com>
description: Example for angular_pagination
homepage: https://github.com/daydev/angular_pagination.git
dependencies:
angular: any
angular: '>=1.0.0 <2.0.0'
angular_pagination:
path: ../..
browser: any
Expand Down
8 changes: 4 additions & 4 deletions app/example/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
<meta charset="UTF-8">
<title>Angular Pagination Example</title>
</head>
<body list-ctrl>
<body>

<ngx-example-pager paginator="ctrl.paginator"></ngx-example-pager>
<ngx-example-pager paginator="paginator"></ngx-example-pager>

<table>
<tr>
<th>Number</th>
<th>Name</th>
</tr>
<tr ng-repeat="item in ctrl.items | pagination:ctrl.paginator.instance">
<tr ng-repeat="item in items | pagination:paginator.instance">
<td>{{item.number}}</td>
<td>{{item.name}}</td>
</tr>
</table>

<ngx-example-pager paginator="ctrl.paginator"></ngx-example-pager>
<ngx-example-pager paginator="paginator"></ngx-example-pager>

<script type="application/dart" src="main.dart"></script>
<script src="packages/browser/dart.js"></script>
Expand Down
8 changes: 2 additions & 6 deletions app/example/web/list_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
part of angular.pagination.example;

@Controller(
selector: "[list-ctrl]",
publishAs: "ctrl")
@Injectable()
class ListController {
final Scope scope;

final List<Item> items = [];

Paginator paginator = new Paginator.empty();

ListController(this.scope) {
ListController() {
_fillItems();
paginator.itemsTotal = items.length;
}
Expand Down
3 changes: 1 addition & 2 deletions app/example/web/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ class AngularPaginationExampleModule extends Module {
AngularPaginationExampleModule() {
install(new AngularPaginationModule());
install(new ExamplePagerModule());

type(ListController);
}
}

main() {
applicationFactory()
.rootContextType(ListController)
.addModule(new AngularPaginationExampleModule())
.run();
}
10 changes: 8 additions & 2 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ module.exports = function (config) {
captureTimeout: 5000,

plugins: [
'karma-dart'
]
'karma-dart',
'karma-htmlfile-reporter'
],
reporters: ['progress', 'html'],

htmlReporter: {
outputFile: 'test/units.html'
}
});
};
2 changes: 1 addition & 1 deletion lib/formatter/module.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ part 'src/pagination_formatter.dart';

class AngularPaginationModule extends Module {
AngularPaginationModule() {
type(PaginationFormatter);
bind(PaginationFormatter);
}
}

9 changes: 9 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "angular_pagination",
"devDependencies": {
"karma": "~0.12.0",
"karma-chrome-launcher": "~0.1.3",
"karma-dart": "~0.2.8",
"karma-htmlfile-reporter": "^0.1.2"
}
}
8 changes: 4 additions & 4 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ author: Egor Day <edaydev@gmail.com>
description: Pagination formatter for angular.dart
homepage: https://github.com/daydev/angular_pagination.git
dependencies:
angular: any
angular: '>=1.0.0 <2.0.0'
quiver: any
dev_dependencies:
browser: any
browser: '>=0.10.0 <0.11.0'
hop: any
mock: any
unittest: any
mock: '>=0.10.0 <0.12.0'
unittest: '>=0.10.1 <0.12.0'