Merge pull request #3851 from borisyankov/def/angular

angular: import should bring in the type information as well
This commit is contained in:
Basarat Ali Syed
2015-03-13 08:48:40 +11:00
23 changed files with 93 additions and 88 deletions

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.angularFileUpload {
declare module angular.angularFileUpload {
interface IUploadService {

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.hotkeys {
declare module angular.hotkeys {
interface HotkeysProvider {
template: string;

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.httpAuth {
declare module angular.httpAuth {
interface IAuthService {
loginConfirmed(data?:any, configUpdater?:Function):void;
loginCancelled(data?:any, reason?:any):void;

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.idle {
declare module angular.idle {
/**
* Used to configure the $keepalive service.
@@ -131,4 +131,4 @@ declare module ng.idle {
*/
unwatch(): void;
}
}
}

View File

@@ -12,55 +12,53 @@ interface TestScope extends ng.IScope {
property: string;
}
module ng.local.storage.tests {
export class TestController {
constructor($scope: TestScope, localStorageService: ng.local.storage.ILocalStorageService<string>) {
// isSupported
if (localStorageService.isSupported) {
// do something
}
// getStorageType
var storageType: string = localStorageService.getStorageType();
// set
$scope.submit = (key, value) => {
return localStorageService.set(key, value);
};
// get
$scope.getItem = (key) => {
return localStorageService.get(key);
};
// remove
$scope.removeItem = (key) => {
return localStorageService.remove(key);
};
// clearAll(regexp)
$scope.clearNumbers = () => {
return localStorageService.clearAll(/^\d+$/);
};
// clearAll
$scope.clearAll = () => {
return localStorageService.clearAll();
};
// keys
var lsKeys = localStorageService.keys();
// bind
localStorageService.set('property', 'oldValue');
$scope.unbind = localStorageService.bind($scope, 'property');
// deriveKey
console.log(localStorageService.deriveKey('property')); // ls.property
// length
var lsLength: number = localStorageService.length();
export class TestController {
constructor($scope: TestScope, localStorageService: ng.local.storage.ILocalStorageService<string>) {
// isSupported
if (localStorageService.isSupported) {
// do something
}
// getStorageType
var storageType: string = localStorageService.getStorageType();
// set
$scope.submit = (key, value) => {
return localStorageService.set(key, value);
};
// get
$scope.getItem = (key) => {
return localStorageService.get(key);
};
// remove
$scope.removeItem = (key) => {
return localStorageService.remove(key);
};
// clearAll(regexp)
$scope.clearNumbers = () => {
return localStorageService.clearAll(/^\d+$/);
};
// clearAll
$scope.clearAll = () => {
return localStorageService.clearAll();
};
// keys
var lsKeys = localStorageService.keys();
// bind
localStorageService.set('property', 'oldValue');
$scope.unbind = localStorageService.bind($scope, 'property');
// deriveKey
console.log(localStorageService.deriveKey('property')); // ls.property
// length
var lsLength: number = localStorageService.length();
}
}
@@ -72,4 +70,4 @@ app.config(function (localStorageServiceProvider: ng.local.storage.ILocalStorage
.setNotify(true, true);
});
app.controller('TestController', ng.local.storage.tests.TestController);
app.controller('TestController', TestController);

View File

@@ -5,7 +5,7 @@
/// <reference path='../angularjs/angular.d.ts' />
declare module ng.local.storage {
declare module angular.local.storage {
interface ILocalStorageServiceProvider extends IServiceProvider {
/**
* Setter for the prefix

View File

@@ -4,7 +4,7 @@
// Definitions: https://github.com/borisyankov/DefinitelyTyped
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.material {
declare module angular.material {
interface MDBottomSheetOptions {
templateUrl?: string;

View File

@@ -5,7 +5,7 @@
///<reference path="../angularjs/angular.d.ts" />
declare module ng.cgNotify {
declare module angular.cgNotify {
interface INotifyService {
@@ -113,4 +113,4 @@ declare module ng.cgNotify {
*/
close():void;
}
}
}

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.translate {
declare module angular.translate {
interface ITranslatePartialLoaderService {
addPart(name: string): ITranslatePartialLoaderService;

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.ui.bootstrap {
declare module angular.ui.bootstrap {
interface IAccordionConfig {
/**
@@ -630,4 +630,4 @@ declare module ng.ui.bootstrap {
animation?: boolean;
}
}
}

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.ui {
declare module angular.ui {
interface IState {
name?: string;

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts" />
declare module ng.ui {
declare module angular.ui {
interface UISortableOptions<T> extends SortableOptions<T> {
'ui-floating'?: string|boolean;

View File

@@ -5,23 +5,21 @@ interface TestScope extends ng.IScope {
viewType: string;
}
module ng.LocalStorageTests {
export class TestController {
constructor(private $scope: TestScope, private storage: ng.localStorage.ILocalStorageService) {
storage.bind($scope, 'varName');
storage.bind($scope,'varName', { defaultValue: 'randomValue123', storeName: 'customStoreKey' });
$scope.viewType = 'ANYTHING';
storage.unbind($scope, 'viewType');
export class TestController {
constructor(private $scope: TestScope, private storage: ng.localStorage.ILocalStorageService) {
storage.bind($scope, 'varName');
storage.bind($scope,'varName', { defaultValue: 'randomValue123', storeName: 'customStoreKey' });
$scope.viewType = 'ANYTHING';
storage.unbind($scope, 'viewType');
storage.set('key', 'value');
storage.get('key');
storage.remove('key');
storage.set('key', 'value');
storage.get('key');
storage.remove('key');
storage.clearAll();
}
storage.clearAll();
}
}
var app = angular.module('angularLocalStorageTests', ['angularLocalStorage']);
app.controller('testCtrl', ['$scope', 'storage', ($scope: TestScope, storage: ng.localStorage.ILocalStorageService) => new ng.LocalStorageTests.TestController($scope, storage)]);
app.controller('testCtrl', ['$scope', 'storage', ($scope: TestScope, storage: ng.localStorage.ILocalStorageService) => new TestController($scope, storage)]);

View File

@@ -5,7 +5,7 @@
/// <reference path="../angularjs/angular.d.ts"/>
declare module ng.localStorage {
declare module angular.localStorage {
interface ILocalStorageService {
set(key: string, value: any): any;
get(key: string): any;

View File

@@ -0,0 +1,7 @@
/// <reference path="angular.d.ts" />
import localName = require('angular');
var mod: localName.IModule = localName.module('mod', []);
// Remain compatible with the ambient version
var mod2: angular.IModule = mod;

View File

@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////
// ngAnimate module (angular-animate.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng.animate {
declare module angular.animate {
///////////////////////////////////////////////////////////////////////////
// AnimateService

View File

@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////
// ngCookies module (angular-cookies.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng.cookies {
declare module angular.cookies {
///////////////////////////////////////////////////////////////////////////
// CookieService

View File

@@ -14,7 +14,7 @@ declare var inject: (...fns: Function[]) => any;
///////////////////////////////////////////////////////////////////////////////
// ngMock module (angular-mocks.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng {
declare module angular {
///////////////////////////////////////////////////////////////////////////
// AngularStatic

View File

@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////
// ngResource module (angular-resource.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng.resource {
declare module angular.resource {
/**
* Currently supported options for the $resource factory options argument.
@@ -146,7 +146,7 @@ declare module ng.resource {
}
/** extensions to base ng based on using angular-resource */
declare module ng {
declare module angular {
interface IModule {
/** creating a resource service factory */

View File

@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////
// ngRoute module (angular-route.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng.route {
declare module angular.route {
///////////////////////////////////////////////////////////////////////////
// RouteParamsService

View File

@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////
// ngSanitize module (angular-sanitize.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng.sanitize {
declare module angular.sanitize {
///////////////////////////////////////////////////////////////////////////
// SanitizeService

View File

@@ -6,13 +6,15 @@
/// <reference path="../jquery/jquery.d.ts" />
declare var angular: ng.IAngularStatic;
declare var angular: angular.IAngularStatic;
// Support for painless dependency injection
interface Function {
$inject?: string[];
}
// Collapse angular into ng
import ng = angular;
// Support AMD require
declare module 'angular' {
export = angular;
@@ -21,7 +23,7 @@ declare module 'angular' {
///////////////////////////////////////////////////////////////////////////////
// ng module (angular.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng {
declare module angular {
// not directly implemented, but ensures that constructed class implements $get
interface IServiceProviderClass {

View File

@@ -3,7 +3,7 @@
// Definitions by: Luke Forder <https://github.com/LukeForder>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
declare module ng.progressLite {
declare module angular.progressLite {
export interface INgProgressLite {
set(num: number): INgProgressLite;
@@ -25,4 +25,4 @@ declare module ng.progressLite {
export interface INgProgressLiteProvider {
settings: IConfigurationOptions;
}
}
}