Commit a7fe21197079ef3961696e80c5b91e017c8367f9
1 parent
abcac913
Added the ng.ui.bootstrap typescript definitions
Showing
3 changed files
with
12 additions
and
9 deletions
Show diff stats
src/app/layout/blocks/block.component.ts
... | ... | @@ -18,7 +18,7 @@ export class BlockComponent { |
18 | 18 | @Input() block: noosfero.Block; |
19 | 19 | @Input() owner: noosfero.Profile | noosfero.Environment; |
20 | 20 | |
21 | - private modalInstance: any = null; | |
21 | + private modalInstance: ng.ui.bootstrap.IModalServiceInstance; | |
22 | 22 | originalBlock: noosfero.Block; |
23 | 23 | |
24 | 24 | currentUser: noosfero.User; |
... | ... | @@ -26,7 +26,8 @@ export class BlockComponent { |
26 | 26 | editionMode = false; |
27 | 27 | designMode = false; |
28 | 28 | |
29 | - constructor(private $uibModal: any, | |
29 | + constructor( | |
30 | + private $uibModal: ng.ui.bootstrap.IModalService, | |
30 | 31 | private $scope: ng.IScope, |
31 | 32 | private $state: ng.ui.IStateService, |
32 | 33 | private $rootScope: ng.IRootScopeService, | ... | ... |
src/app/profile/custom-content/custom-content.component.ts
1 | -import {Component, Input, Inject} from 'ng-forward'; | |
2 | -import {ProfileService} from '../../../lib/ng-noosfero-api/http/profile.service'; | |
3 | -import {NotificationService} from '../../shared/services/notification.service'; | |
4 | -import {PermissionDirective} from '../../shared/components/permission/permission.directive'; | |
5 | -import {DesignModeService} from '../../admin/layout-edit/designMode.service'; | |
1 | +import { Component, Input, Inject } from 'ng-forward'; | |
2 | +import { ProfileService } from '../../../lib/ng-noosfero-api/http/profile.service'; | |
3 | +import { NotificationService } from '../../shared/services/notification.service'; | |
4 | +import { PermissionDirective } from '../../shared/components/permission/permission.directive'; | |
5 | +import { DesignModeService } from '../../admin/layout-edit/designMode.service'; | |
6 | 6 | |
7 | 7 | @Component({ |
8 | 8 | selector: 'custom-content', |
... | ... | @@ -21,9 +21,10 @@ export class CustomContentComponent { |
21 | 21 | |
22 | 22 | content: string; |
23 | 23 | originalContent: string; |
24 | - private modalInstance: any = null; | |
24 | + private modalInstance: ng.ui.bootstrap.IModalServiceInstance; | |
25 | 25 | |
26 | - constructor(private $uibModal: any, | |
26 | + constructor( | |
27 | + private $uibModal: ng.ui.bootstrap.IModalService, | |
27 | 28 | private $scope: ng.IScope, |
28 | 29 | private profileService: ProfileService, |
29 | 30 | private notificationService: NotificationService, | ... | ... |
typings.json
... | ... | @@ -8,6 +8,7 @@ |
8 | 8 | "angular-mocks": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-mocks.d.ts", |
9 | 9 | "angular-translate": "github:DefinitelyTyped/DefinitelyTyped/angular-translate/angular-translate.d.ts#19850bf86c876e0c2544842114878ece4664941a", |
10 | 10 | "angular-ui-router": "github:DefinitelyTyped/DefinitelyTyped/angular-ui-router/angular-ui-router.d.ts#655f8c1bf3c71b0e1ba415b36309604f79326ac8", |
11 | + "angular-ui-bootstrap": "github:DefinitelyTyped/DefinitelyTyped/angular-ui-bootstrap/angular-ui-bootstrap.d.ts", | |
11 | 12 | "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c", |
12 | 13 | "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4", |
13 | 14 | "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#470954c4f427e0805a2d633636a7c6aa7170def8", | ... | ... |
-
Pq colocou alterações de custom-content e block nesse branch?
-
È somente uma declaração de tipo do
$uiModal
doangular-bootstrap
após a atualização da definição do typings de typescript. Não fazia sentido criar um branch só pra isso :)