From 16c05fde7401d5cedc12dddc91f663e576935dde Mon Sep 17 00:00:00 2001 From: Ariel Date: Sat, 24 Sep 2016 21:51:40 -0400 Subject: [PATCH 01/56] Change banner height to min-height --- public/resources/css/module/_banner.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/resources/css/module/_banner.scss b/public/resources/css/module/_banner.scss index 3fd0dd9932..f11a0a78af 100644 --- a/public/resources/css/module/_banner.scss +++ b/public/resources/css/module/_banner.scss @@ -11,7 +11,7 @@ font-size: 18px; font-weight: 200; padding: ($unit * 4) ($unit * 6); - height: 97px; + min-height: 97px; include respond-to('mobile') { padding: ($unit * 2); @@ -30,4 +30,4 @@ line-height: 32px; margin: 0; } -} \ No newline at end of file +} From 4f9f51cb4b6581b6ae53f3930d1bc96e7a01d4d1 Mon Sep 17 00:00:00 2001 From: Chase Date: Fri, 30 Sep 2016 15:28:45 -0600 Subject: [PATCH 02/56] Fixed minor typos in testing (#2515) Fixed minor typos in testing --- public/docs/ts/latest/guide/testing.jade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade index 7a99679ff4..6c952085d7 100644 --- a/public/docs/ts/latest/guide/testing.jade +++ b/public/docs/ts/latest/guide/testing.jade @@ -897,9 +897,9 @@ a(href="#top").to-top Back to top The testing goal is to verify that such bindings work as expected. The tests should set input values and listen for output events. - The `DashboardHeroComponent` is tiny example of a component in this role. - It displays an individual heroe provided by the `DashboardComponent`. - Clicking that hero tells the the `DashboardComponent` that the user has selected the hero. + The `DashboardHeroComponent` is a tiny example of a component in this role. + It displays an individual hero provided by the `DashboardComponent`. + Clicking that hero tells the `DashboardComponent` that the user has selected the hero. The `DashboardHeroComponent` is embedded in the `DashboardComponent` template like this: +makeExample('testing/ts/app/dashboard/dashboard.component.html', 'dashboard-hero', 'app/dashboard/dashboard.component.html (excerpt)')(format='.') @@ -1075,7 +1075,7 @@ a(href="#top").to-top Back to top +makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'router-stub', 'app/dashboard/dashboard.component.spec.ts (Router Stub)')(format='.') :marked Now we setup the testing module with the test stubs for the `Router` and `HeroService` and - create a test instance of the `DashbaordComponent` for subsequent testing. + create a test instance of the `DashboardComponent` for subsequent testing. +makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'compile-and-create-body', 'app/dashboard/dashboard.component.spec.ts (compile and create)')(format='.') :marked The following test clicks the displayed hero and confirms (with the help of a spy) that `Router.navigateByUrl` is called with the expected url. @@ -1266,7 +1266,7 @@ a(href="#top").to-top Back to top Fortunately, the `TestBed.configureTestingModule` parameter parallels the metadata passed to the `@NgModule` decorator - which means you can also specify `providers` and `imports. + which means you can also specify `providers` and `imports`. The `HeroDetailComponent` requires a lot of help despite its small size and simple construction. In addition to the support it receives from the default testing module `CommonModule`, it needs: From 1591bcc0e1935e644b0a21038401f60a3cb6d55e Mon Sep 17 00:00:00 2001 From: Chase Date: Fri, 30 Sep 2016 15:29:16 -0600 Subject: [PATCH 03/56] docs(testing): fix link (#2514) Fixed link --- public/docs/ts/latest/guide/testing.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade index 6c952085d7..cad063a337 100644 --- a/public/docs/ts/latest/guide/testing.jade +++ b/public/docs/ts/latest/guide/testing.jade @@ -855,7 +855,7 @@ a(href="#top").to-top Back to top Notice the `async` call in the `beforeEach`, made necessary by the asynchronous `TestBed.compileComponents` method. The `async` function arranges for the tester's code to run in a special _async test zone_ - that hides the mechanics of asynchronous execution, just as it does when passed to an [_it_ test)(#async). + that hides the mechanics of asynchronous execution, just as it does when passed to an [_it_ test](#async). #compile-components :marked From 98d438ed9bb207b189130996905ca7500a42c6ba Mon Sep 17 00:00:00 2001 From: Chase Date: Fri, 30 Sep 2016 15:29:49 -0600 Subject: [PATCH 04/56] docs(testing): delete extra 'with' (#2513) Deleted extra 'with' --- public/docs/ts/latest/guide/testing.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade index cad063a337..e73e2bbc15 100644 --- a/public/docs/ts/latest/guide/testing.jade +++ b/public/docs/ts/latest/guide/testing.jade @@ -408,7 +408,7 @@ a(href="#top").to-top Back to top +makeExample('testing/ts/app/banner.component.spec.ts', 'simple-example-it', 'app/banner.component.spec.ts (simplified)')(format='.') :marked A comprehensive review of the Angular testing utilities appears [later in the chapter](#atu-apis). - Let's dive right into Angular testing, starting with with the components of a sample application. + Let's dive right into Angular testing, starting with the components of a sample application. a(href="#top").to-top Back to top From c548f9700b4b6695d8df4f98c633988f7de94146 Mon Sep 17 00:00:00 2001 From: Jonas Felix Date: Fri, 30 Sep 2016 23:30:20 +0200 Subject: [PATCH 05/56] docs(style-guide): add missing word in bootstrapping remark (#2512) --- public/docs/ts/latest/guide/style-guide.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/ts/latest/guide/style-guide.jade b/public/docs/ts/latest/guide/style-guide.jade index 1e85323ddc..1191c4f188 100644 --- a/public/docs/ts/latest/guide/style-guide.jade +++ b/public/docs/ts/latest/guide/style-guide.jade @@ -405,7 +405,7 @@ a(href="#toc") Back to top .s-rule.do :marked - **Do** include error handling the bootstrapping logic. + **Do** include error handling in the bootstrapping logic. .s-rule.avoid :marked From d5eec33960b69d70cee24d9b39afafda657c8609 Mon Sep 17 00:00:00 2001 From: StdVectorBool Date: Fri, 30 Sep 2016 14:32:46 -0700 Subject: [PATCH 06/56] docs(style-guide): example of underscore prefix to avoid. (#2501) --- .../ts/03-04/app/core/toast.service.avoid.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/docs/_examples/style-guide/ts/03-04/app/core/toast.service.avoid.ts b/public/docs/_examples/style-guide/ts/03-04/app/core/toast.service.avoid.ts index e2e21b8e4c..0f3a7c25ea 100644 --- a/public/docs/_examples/style-guide/ts/03-04/app/core/toast.service.avoid.ts +++ b/public/docs/_examples/style-guide/ts/03-04/app/core/toast.service.avoid.ts @@ -8,19 +8,19 @@ import { Injectable } from '@angular/core'; export class ToastService { message: string; - private toastCount: number; + private _toastCount: number; hide() { - this.toastCount--; - this.log(); + this._toastCount--; + this._log(); } show() { - this.toastCount++; - this.log(); + this._toastCount++; + this._log(); } - private log() { + private _log() { console.log(this.message); } } From 7796f485fdbe1912bd9eba5fdfbee1d200e5d40c Mon Sep 17 00:00:00 2001 From: Alireza Mirian Date: Sat, 1 Oct 2016 01:03:26 +0330 Subject: [PATCH 07/56] fix(guide/form): fix a broken link (#2498) --- public/docs/ts/latest/guide/dependency-injection.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/ts/latest/guide/dependency-injection.jade b/public/docs/ts/latest/guide/dependency-injection.jade index 94761c9c67..ec54abf0dd 100644 --- a/public/docs/ts/latest/guide/dependency-injection.jade +++ b/public/docs/ts/latest/guide/dependency-injection.jade @@ -362,7 +362,7 @@ block ctor-syntax .l-sub-section :marked - Learn more in [Testing](../testing/index.html). + Learn more in [Testing](./testing.html). :marked ### When the service needs a service From 66e3eca8eb7f323b95c95c7ef945c98823953fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20Rodri=CC=81guez?= Date: Fri, 30 Sep 2016 23:49:42 +0200 Subject: [PATCH 08/56] docs(rc4-to-rc5): change cleanup closes #2516 --- public/docs/dart/latest/cookbook/_data.json | 6 - .../docs/dart/latest/cookbook/rc4-to-rc5.jade | 1 - public/docs/js/latest/cookbook/_data.json | 6 - .../docs/js/latest/cookbook/rc4-to-rc5.jade | 1 - public/docs/ts/latest/cookbook/_data.json | 5 - .../docs/ts/latest/cookbook/rc4-to-rc5.jade | 127 ------------------ 6 files changed, 146 deletions(-) delete mode 100644 public/docs/dart/latest/cookbook/rc4-to-rc5.jade delete mode 100644 public/docs/js/latest/cookbook/rc4-to-rc5.jade delete mode 100644 public/docs/ts/latest/cookbook/rc4-to-rc5.jade diff --git a/public/docs/dart/latest/cookbook/_data.json b/public/docs/dart/latest/cookbook/_data.json index e12d383b14..a747acd83f 100644 --- a/public/docs/dart/latest/cookbook/_data.json +++ b/public/docs/dart/latest/cookbook/_data.json @@ -53,12 +53,6 @@ "hide": true }, - "rc4-to-rc5": { - "title": "RC4 to RC5 Migration", - "intro": "Migrate your RC4 app to RC5 in minutes.", - "hide": true - }, - "set-document-title": { "title": "Set the Document Title", "intro": "Setting the document or window title using the Title service." diff --git a/public/docs/dart/latest/cookbook/rc4-to-rc5.jade b/public/docs/dart/latest/cookbook/rc4-to-rc5.jade deleted file mode 100644 index c743361ac8..0000000000 --- a/public/docs/dart/latest/cookbook/rc4-to-rc5.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp diff --git a/public/docs/js/latest/cookbook/_data.json b/public/docs/js/latest/cookbook/_data.json index 5660152bd5..3f319736d6 100644 --- a/public/docs/js/latest/cookbook/_data.json +++ b/public/docs/js/latest/cookbook/_data.json @@ -48,12 +48,6 @@ "hide": true }, - "rc4-to-rc5": { - "title": "RC4 to RC5 Migration", - "intro": "Migrate your RC4 app to RC5 in minutes.", - "hide": true - }, - "set-document-title": { "title": "Set the Document Title", "intro": "Setting the document or window title using the Title service." diff --git a/public/docs/js/latest/cookbook/rc4-to-rc5.jade b/public/docs/js/latest/cookbook/rc4-to-rc5.jade deleted file mode 100644 index c743361ac8..0000000000 --- a/public/docs/js/latest/cookbook/rc4-to-rc5.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp diff --git a/public/docs/ts/latest/cookbook/_data.json b/public/docs/ts/latest/cookbook/_data.json index 10c8792d5b..7a45a91e77 100644 --- a/public/docs/ts/latest/cookbook/_data.json +++ b/public/docs/ts/latest/cookbook/_data.json @@ -51,11 +51,6 @@ "intro": "Translate the app's template text into multiple languages" }, - "rc4-to-rc5": { - "title": "RC4 to RC5 Migration", - "intro": "Migrate your RC4 app to RC5 in minutes." - }, - "set-document-title": { "title": "Set the Document Title", "intro": "Setting the document or window title using the Title service." diff --git a/public/docs/ts/latest/cookbook/rc4-to-rc5.jade b/public/docs/ts/latest/cookbook/rc4-to-rc5.jade deleted file mode 100644 index 6e2d4639da..0000000000 --- a/public/docs/ts/latest/cookbook/rc4-to-rc5.jade +++ /dev/null @@ -1,127 +0,0 @@ -include ../_util-fns - -:marked - # Angular Modules (NgModules) have landed in Angular RC5! - - _Angular Modules_, also known as _NgModules_, are the powerful new way to organize and bootstrap your Angular application. -.l-sub-section - :marked - Read more in the ["RC5 and NgModules" announcement](https://angularjs.blogspot.com). - - Learn the details of NgModule in the [Angular Module](../guide/ngmodule.html) chapter. -:marked - The new `@NgModule` decorator gives you module-level components, directives, and pipes without - the need to specify them repeatedly in every component of your application. - - The `@NgModule` metadata give the Angular compiler the context needed so that you can use the same code - regardless of whether you are running Angular in [Ahead-of-time](../glossary.html#aot) or [Just - in Time](../glossary.html#jit) mode. - - ## How do I use them? - - If you were previously writing an Angular application, your app should continue to work in RC5. - We’ve worked hard to ensure that applications that worked with RC4 continue to work while you migrate. - For this to work, we’re doing 2 things automatically for you: - - * We create an implicit `NgModule` for you as part of the `bootstrap()` command - * We automatically hoist your components, pipes, and directives - - While your application will continue to work today, - it’s important that you update your application to ensure future updates and deprecations don’t negatively affect you. - To make it easier, you can think of the process as having 5 steps. - - 1. **Update to RC5** - Your application should continue to work without modification, but it’s important that you are running the latest version of Angular. - - 2. **Create an _NgModule_** - Create the root `NgModule` that you’ll use to bootstrap your application. - - 3. **Update your bootstrap** - Bootstrap that module instead of your root component - - 4. **Update your 3rd party libraries** - Take advantage of the latest from Forms, Material, Http, and more - - 5. **Cleanup** - Clean up your code. - The deprecated classes, methods and properties will be removed from Angular very soon. - - Prefer to look at code and diffs? - Check out the upgrade in [one commit](https://github.com/StephenFluin/ngmodule-migration/commit/9f9c6ae099346e491fc31d77bf65ed440e1f164c). - - ## 1. Update to RC5 - If you use npm, you should be able to either update your `package.json` file and run `npm install`. - Or alternatively you can run the following command: - -code-example(format='.' language='bash'). - npm install @angular/{core,common,compiler,platform-browser,platform-browser-dynamic} --save - -:marked - Update your optional libraries - -code-example(format='.' language='bash'). - npm install @angular/router - npm install @angular/forms - npm install @angular2-material/{core,button,card,...}@latest - -:marked - Update the Angular CLI if you're using that tool - -code-example(format='.' language='bash'). - npm install angular-cli @angular/tsc-wrapped --save-dev - -:marked - ## 2. Create an _NgModule_ - Create a new file called app.module.ts. Populate it with your root component as follows: - -code-example(format='.' language='javascript'). - import { NgModule } from '@angular/core'; - import { BrowserModule } from '@angular/platform-browser'; - import { AppComponent } from './app.component'; - - @NgModule({ - declarations: [AppComponent], - imports: [BrowserModule], - bootstrap: [AppComponent], - }) - export class AppModule {} - -:marked - ## 3. Update your bootstrap - Update your `main.ts` file to bootstrap using the "Just-in-time" (JiT) compiler. - -code-example(format='.' language='javascript'). - import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - import { AppModule } from './app/app.module'; - - platformBrowserDynamic().bootstrapModule(AppModule); - -:marked - ## 4. Import library modules in your _NgModule_ - Remove the Angular and 3rd party library providers from your `AppComponent` providers - and switch to `NgModule` imports as seen in this example. - -code-example(format='.' language='javascript'). - imports: [ - BrowserModule, - // Router - RouterModule.forRoot(config), - // Forms - FormsModule, - // Material Design - MdSlideToggleModule, - MdButtonModule, - MdToolbarModule, - MdCardModule, - MdInputModule, - ], - -:marked - ## 5. Cleanup - For RC5, you can leave your components, directives and pipes - in the `directives` and `pipes` properties of your `@Component` metadata. - In fact, we automatically hoist (add) them to the NgModule to which they belong. - -.alert.is-important - :marked - This option is temporary for backward compatibility. - It will be removed in the final release of Angular 2.0. - - Get ahead of the game and start moving your component `directives` and `pipes` - into module `declarations` as soon as possible. - We intend to delete _all_ deprecated class, methods, and properties in the next RC. From ba6b681ed43a1eecf0bdfe42ee0efc281aeb0ab3 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Fri, 30 Sep 2016 19:14:41 -0700 Subject: [PATCH 09/56] docs(i18n): incorporate corrections and feedback from Victor Berchet (#2517) See PR #2491 --- .../cb-i18n/ts/app/i18n-providers.ts | 8 +-- .../ts/{i18n/fr => locale}/messages.fr.xlf | 0 .../{i18n/fr => locale}/messages.fr.xlf.html | 0 .../ts/{i18n => locale}/trans-unit.html | 0 public/docs/_examples/cb-i18n/ts/plnkr.json | 4 +- .../_examples/toh-6-aot/ts/dist/build.js.gz | Bin 0 -> 102759 bytes public/docs/ts/latest/cookbook/i18n.jade | 65 +++++++++++------- 7 files changed, 45 insertions(+), 32 deletions(-) rename public/docs/_examples/cb-i18n/ts/{i18n/fr => locale}/messages.fr.xlf (100%) rename public/docs/_examples/cb-i18n/ts/{i18n/fr => locale}/messages.fr.xlf.html (100%) rename public/docs/_examples/cb-i18n/ts/{i18n => locale}/trans-unit.html (100%) create mode 100644 public/docs/_examples/toh-6-aot/ts/dist/build.js.gz diff --git a/public/docs/_examples/cb-i18n/ts/app/i18n-providers.ts b/public/docs/_examples/cb-i18n/ts/app/i18n-providers.ts index c27afc88d7..84328f0d22 100644 --- a/public/docs/_examples/cb-i18n/ts/app/i18n-providers.ts +++ b/public/docs/_examples/cb-i18n/ts/app/i18n-providers.ts @@ -9,13 +9,13 @@ export function getTranslationProviders(): Promise { // return no providers if fail to get translation file for locale const noProviders: Object[] = []; - // No locale or English: no translation providers - if (!locale || locale === 'en') { + // No locale or U.S. English: no translation providers + if (!locale || locale === 'en-US') { return Promise.resolve(noProviders); } - // Ex: 'i18n/fr/messages.fr.xlf` - const translationFile = `./i18n/${locale}/messages.${locale}.xlf`; + // Ex: 'locale/messages.fr.xlf` + const translationFile = `./locale/messages.${locale}.xlf`; return getTranslationsWithSystemJs(translationFile) .then( (translations: string ) => [ diff --git a/public/docs/_examples/cb-i18n/ts/i18n/fr/messages.fr.xlf b/public/docs/_examples/cb-i18n/ts/locale/messages.fr.xlf similarity index 100% rename from public/docs/_examples/cb-i18n/ts/i18n/fr/messages.fr.xlf rename to public/docs/_examples/cb-i18n/ts/locale/messages.fr.xlf diff --git a/public/docs/_examples/cb-i18n/ts/i18n/fr/messages.fr.xlf.html b/public/docs/_examples/cb-i18n/ts/locale/messages.fr.xlf.html similarity index 100% rename from public/docs/_examples/cb-i18n/ts/i18n/fr/messages.fr.xlf.html rename to public/docs/_examples/cb-i18n/ts/locale/messages.fr.xlf.html diff --git a/public/docs/_examples/cb-i18n/ts/i18n/trans-unit.html b/public/docs/_examples/cb-i18n/ts/locale/trans-unit.html similarity index 100% rename from public/docs/_examples/cb-i18n/ts/i18n/trans-unit.html rename to public/docs/_examples/cb-i18n/ts/locale/trans-unit.html diff --git a/public/docs/_examples/cb-i18n/ts/plnkr.json b/public/docs/_examples/cb-i18n/ts/plnkr.json index aa6421b303..e7074f222d 100644 --- a/public/docs/_examples/cb-i18n/ts/plnkr.json +++ b/public/docs/_examples/cb-i18n/ts/plnkr.json @@ -4,8 +4,8 @@ "app/**/*.css", "app/**/*.html", "app/**/*.ts", - "i18n/messages.xlf", - "i18n/fr/messages.fr.xlf", + "locale/messages.xlf", + "locale/messages.fr.xlf", "!**/*.[1].*", diff --git a/public/docs/_examples/toh-6-aot/ts/dist/build.js.gz b/public/docs/_examples/toh-6-aot/ts/dist/build.js.gz new file mode 100644 index 0000000000000000000000000000000000000000..0f71e85c96cb66b5e590fb6a753aec134c3b55fb GIT binary patch literal 102759 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
    #)rWq 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 literal 0 HcmV?d00001 diff --git a/public/docs/ts/latest/cookbook/i18n.jade b/public/docs/ts/latest/cookbook/i18n.jade index 8f58098f9d..250d07e3a0 100644 --- a/public/docs/ts/latest/cookbook/i18n.jade +++ b/public/docs/ts/latest/cookbook/i18n.jade @@ -1,16 +1,16 @@ include ../_util-fns :marked - Angular's _internationalization_ ("_i18n_") tools help make your app availble in multiple languages. + Angular's _internationalization_ ("_i18n_") tools help make your app available in multiple languages. ## Table of contents * [Angular and i18n template translation](#angular-i18n) * [Mark text with the _i18n_ attribute](#i18n-attribute) - * [Extract text with ng-xi18n](#ng-xi18n) + * [Create a translation source file with the _ng-xi18n_ tool](#ng-xi18n) * [Translate](#translate) - * [Merge the translation file into the app](#merge) + * [Merge the completed translation file into the app](#merge) * [JiT configuration](#jit) * [AoT configuration](#aot) @@ -30,6 +30,7 @@ a#angular-i18n This page describes the _i18n_ tools to assist translation of component template text into multiple languages. + .l-sub-section :marked Practitioners of _internationalization_ refer to a translatable text as a "_message_". @@ -61,7 +62,9 @@ a#i18n-attribute .alert.is-helpful :marked - `i18n` is not an Angular _directive_. It's a custom _attribute_, recognized by Angular tools and compilers. + `i18n` is not an Angular _directive_. + It's a custom _attribute_, recognized by Angular tools and compilers. + It will be removed by the compiler _after_ translation. :marked In the accompanying sample, an `

    ` tag displays a simple English language greeting which you will translate to French: @@ -87,16 +90,17 @@ a#i18n-attribute While all appearance of a message with the _same_ meaning should have the _same_ translation, a message with *different meanings* could have different translations. The Angular extraction tool preserves both the _meaning_ and the _description_ in the translation source file - to facilitiate contextually-specific transations. + to facilitiate contextually-specific translations. a#ng-xi18n .l-main-section :marked - ## Extract translatable text with the _ng-xi18n_ command + ## Create a translation source file with the _ng-xi18n_ tool - Use the `ng-xi18n` extraction tool to generate a translation source file in an industry standard format. + Use the `ng-xi18n` extraction tool to extract the `i18n`-marked texts + into a translation source file in an industry standard format. - This is an Angular CLI tool based on the `ngc` compiler in the `@angular/compiler-cli` npm package. + This is an Angular CLI tool in the `@angular/compiler-cli` npm package. If you haven't already installed the CLI and its `platform-server` peer dependency, do so now: code-example(language="sh" class="code-shell"). @@ -151,18 +155,26 @@ a#translate The next step is to translate the English language template text into the specific language translation files. The cookbook sample creates a French translation file. -a#i18n-file-structure +a#localization-folder :marked - ### Create an i18n project structure + ### Create a localization folder You will probably translate into more than one other language so it's a good idea for the project structure to reflect your entire internationalization effort. - One approach is to create an `i18n` folder with subfolders for each language or locale, e.g. `i18n/fr` for French. - This sample puts `i18n/fr` under the project root. + One approach is to dedicate a folder to localization and store related assets + (e.g. internationalization files) there. +.l-sub-section + :marked + Localization and internationalization are + different but closely related terms. +:marked + This sample follows that suggestion. It has `locale` folder immediately under the project root. + Assets within the folder carry a filename extension that matches a language-culture code from a + well-known codeset. - Move the `messages.xlf` into the `i18n` folder where it will become the source for all language-specific translations. - Then copy `messages.xlf` into `i18n/fr` and rename it as `messages.fr.xlf` . + Move `messages.xlf` into the `locale` folder where it will become the source for all language-specific translations. + Then make a copy for the French language named `messages.fr.xlf` . Follow the same convention for each target language. @@ -174,17 +186,17 @@ a#i18n-file-structure This sample file is easy to translate without a special editor or knowledge of French. Open `messages.fr.xlf` and find the `` section: -+makeExample('cb-i18n/ts/i18n/trans-unit.html', '', 'i18n/messages.fr.xlf ()')(format=".") ++makeExample('cb-i18n/ts/locale/trans-unit.html', '', 'locale/messages.fr.xlf ()')(format=".") :marked This XML element represents the translation of the `

    ` greeting tag you marked with the `i18n` attribute. Using the _source_, _description_, and _meaning_ elements to guide your translation, replace the `` tag with the French greeting: -+makeExample('cb-i18n/ts/i18n/fr/messages.fr.xlf.html', 'trans-unit', 'i18n/fr/messages.fr.xlf (, after translation)')(format=".") ++makeExample('cb-i18n/ts/locale/messages.fr.xlf.html', 'trans-unit', 'locale/messages.fr.xlf (, after translation)')(format=".") :marked Note that the `id` is generated by the tool. Don't touch it. - Its value depends on the content of the message, its meaning, and its description. - Change any of these factors and the `id` changes as well. + Its value depends on the content of the message and its assigned meaning. + Change either factor and the `id` changes as well. .alert.is-helpful :marked Repeat the extraction process whenever you add new app messages or edit existing ones. @@ -202,19 +214,19 @@ a#i18n-file-structure cb-i18n/ts/app/app.component.ts, cb-i18n/ts/app/app.module.ts, cb-i18n/ts/app/main.1.ts, - cb-i18n/ts/i18n/fr/messages.fr.xlf.html + cb-i18n/ts/locale/messages.fr.xlf.html `, '', ` app/app.component.html, app/app.component.ts, app/app.module.ts, app/main.ts, - i18n/fr/messages.fr.xlf + locale/messages.fr.xlf `) a#merge .l-main-section :marked - ## Merge the translation file + ## Merge the completed translation file To merge the translated text into component templates, you compile the application with the completed translation file. @@ -224,7 +236,8 @@ a#merge You provide the Angular compiler with three new pieces of information: * the translation file * the translation file format - * the _Locale ID_ (`en-US` for instance) + * the _Locale ID_ + (`fr` or `en-US` for instance) _How_ you provide this information depends upon whether you compile with the JiT (_Just-in-Time_) compiler or the AoT (_Ahead-of-Time_) compiler. @@ -280,12 +293,12 @@ a#text-plugin :marked * It gets the locale from the global `document.locale` variable that was set in `index.html`. - * If there is no locale or the language is English, there is no need to translate. + * If there is no locale or the language is U.S. English (`en-US`), there is no need to translate. The function returns an empty `noProviders` array as a `Promise`. It must return a `Promise` because this function could read a translation file asynchronously from the server. * It creates a transaction filename from the locale according to the name and location convention - [described earlier](#i18n-file-structure). + [described earlier](#localization-folder). * The `getTranslationsWithSystemJs` method reads the translation and returns the contents as a string. Notice that it appends `!text` to the filename, telling SystemJS to use the [text plugin](#text-plugin). @@ -341,10 +354,10 @@ a#aot For this sample, the French language command would be code-example(language="sh" class="code-shell"). - ./node_modules/.bin/ngc --i18nFile=./i18n/fr/messages.fr.xlf --locale=fr --i18nFormat=xlf + ./node_modules/.bin/ngc --i18nFile=./locale/messages.fr.xlf --locale=fr --i18nFormat=xlf .l-sub-section :marked Windows users may have to quote the command: code-example(language="sh" class="code-shell"). - "./node_modules/.bin/ngc" --i18nFile=./i18n/fr/messages.fr.xlf --locale=fr --i18nFormat=xlf + "./node_modules/.bin/ngc" --i18nFile=./locale/messages.fr.xlf --locale=fr --i18nFormat=xlf From 9b083966f3c0d1072b44e928157235e861d023a9 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Fri, 30 Sep 2016 23:05:50 -0700 Subject: [PATCH 10/56] chore(i18n): fix broken plunker link (#2519) --- public/docs/ts/latest/cookbook/i18n.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/ts/latest/cookbook/i18n.jade b/public/docs/ts/latest/cookbook/i18n.jade index 250d07e3a0..75fabaf051 100644 --- a/public/docs/ts/latest/cookbook/i18n.jade +++ b/public/docs/ts/latest/cookbook/i18n.jade @@ -15,7 +15,7 @@ include ../_util-fns * [AoT configuration](#aot) :marked - **Try this** live example of a JiT-compiled app, translated into French. + **Try this** live example of a JiT-compiled app, translated into French. a#angular-i18n From 56ac24b41163c4f6bbd857b1d6acc86b871a4ba7 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Sat, 1 Oct 2016 07:11:21 -0700 Subject: [PATCH 11/56] chore: fix broken links on 9/30, mostly API links (#2520) --- firebase.json | 4 +-- public/docs/dart/latest/guide/testing.jade | 2 +- public/docs/dart/latest/testing/_data.json | 28 ------------------- .../testing/application-under-test.jade | 1 - .../dart/latest/testing/first-app-tests.jade | 1 - public/docs/dart/latest/testing/index.jade | 1 - .../latest/testing/jasmine-testing-101.jade | 1 - .../testing/testing-an-angular-pipe.jade | 1 - public/docs/js/latest/cookbook/ts-to-js.jade | 27 +++++++++--------- public/docs/js/latest/guide/forms.jade | 4 +-- public/docs/js/latest/guide/style-guide.jade | 2 +- public/docs/js/latest/guide/testing.jade | 2 +- public/docs/js/latest/testing/_data.json | 28 ------------------- .../testing/application-under-test.jade | 1 - .../js/latest/testing/first-app-tests.jade | 1 - public/docs/js/latest/testing/index.jade | 1 - .../latest/testing/jasmine-testing-101.jade | 1 - .../testing/testing-an-angular-pipe.jade | 1 - public/docs/ts/latest/glossary.jade | 3 +- .../docs/ts/latest/guide/browser-support.jade | 8 +++--- public/docs/ts/latest/guide/forms.jade | 4 +-- .../docs/ts/latest/guide/lifecycle-hooks.jade | 4 +-- public/docs/ts/latest/guide/pipes.jade | 4 +-- public/docs/ts/latest/guide/style-guide.jade | 9 +++--- .../docs/ts/latest/guide/template-syntax.jade | 6 ++-- public/docs/ts/latest/guide/upgrade.jade | 4 +-- public/docs/ts/latest/quickstart.jade | 7 ++--- 27 files changed, 43 insertions(+), 113 deletions(-) delete mode 100644 public/docs/dart/latest/testing/_data.json delete mode 100644 public/docs/dart/latest/testing/application-under-test.jade delete mode 100644 public/docs/dart/latest/testing/first-app-tests.jade delete mode 100644 public/docs/dart/latest/testing/index.jade delete mode 100644 public/docs/dart/latest/testing/jasmine-testing-101.jade delete mode 100644 public/docs/dart/latest/testing/testing-an-angular-pipe.jade delete mode 100644 public/docs/js/latest/testing/_data.json delete mode 100644 public/docs/js/latest/testing/application-under-test.jade delete mode 100644 public/docs/js/latest/testing/first-app-tests.jade delete mode 100644 public/docs/js/latest/testing/index.jade delete mode 100644 public/docs/js/latest/testing/jasmine-testing-101.jade delete mode 100644 public/docs/js/latest/testing/testing-an-angular-pipe.jade diff --git a/firebase.json b/firebase.json index 069b61f208..90419f857a 100644 --- a/firebase.json +++ b/firebase.json @@ -4,7 +4,7 @@ "rewrites": [ { "source": "/docs/dart/latest/testing", - "destination": "/docs/dart/latest/index.html" + "destination":"/docs/dart/latest/guide/testing.html" }, { "source": "/docs/dart/latest/tutorial", @@ -12,7 +12,7 @@ }, { "source": "/docs/js/latest/testing", - "destination": "/docs/js/latest/index.html" + "destination": "/docs/js/latest/guide/testing.html" }, { "source": "/docs/js/latest/tutorial", diff --git a/public/docs/dart/latest/guide/testing.jade b/public/docs/dart/latest/guide/testing.jade index 4782ba81d3..c743361ac8 100644 --- a/public/docs/dart/latest/guide/testing.jade +++ b/public/docs/dart/latest/guide/testing.jade @@ -1 +1 @@ -include ../../../_includes/_ts-temp \ No newline at end of file +include ../../../_includes/_ts-temp diff --git a/public/docs/dart/latest/testing/_data.json b/public/docs/dart/latest/testing/_data.json deleted file mode 100644 index 2c63d566e7..0000000000 --- a/public/docs/dart/latest/testing/_data.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "_listtype": "ordered", - - "index": { - "title": "Testing Overview", - "intro": "Techniques and practices for testing an Angular 2 app" - }, - - "jasmine-testing-101": { - "title": "Jasmine Testing 101", - "intro": "The basics of testing anything with Jasmine" - }, - - "application-under-test": { - "title": "The Application Under Test", - "intro": "A quick look at the application we will test" - }, - - "first-app-tests": { - "title": "First App Tests", - "intro": "The first test of a simple, non-Angular part of our app" - }, - - "testing-an-angular-pipe": { - "title": "Testing an Angular Pipe", - "intro": "We test an Angular-aware part of our app" - } -} \ No newline at end of file diff --git a/public/docs/dart/latest/testing/application-under-test.jade b/public/docs/dart/latest/testing/application-under-test.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/dart/latest/testing/application-under-test.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/dart/latest/testing/first-app-tests.jade b/public/docs/dart/latest/testing/first-app-tests.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/dart/latest/testing/first-app-tests.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/dart/latest/testing/index.jade b/public/docs/dart/latest/testing/index.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/dart/latest/testing/index.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/dart/latest/testing/jasmine-testing-101.jade b/public/docs/dart/latest/testing/jasmine-testing-101.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/dart/latest/testing/jasmine-testing-101.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/dart/latest/testing/testing-an-angular-pipe.jade b/public/docs/dart/latest/testing/testing-an-angular-pipe.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/dart/latest/testing/testing-an-angular-pipe.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/js/latest/cookbook/ts-to-js.jade b/public/docs/js/latest/cookbook/ts-to-js.jade index 580a628f50..a76d90bce7 100644 --- a/public/docs/js/latest/cookbook/ts-to-js.jade +++ b/public/docs/js/latest/cookbook/ts-to-js.jade @@ -252,8 +252,7 @@ table(width="100%") for components and directives. For [inputs and outputs](../guide/template-syntax.html#inputs-outputs), - we use [`@Input`](../api/core/index/Input-var.html) - and [`@Output`](../api/core/index/Output-var.html) property decorators. + we use `@Input` and `@Output` property decorators. They may optionally specify input and output binding names if we want them to be different from the class property names. @@ -351,10 +350,10 @@ table(width="100%") We can attach additional decorators to constructor parameters to qualify the injection behavior. We can mark - optional dependencies with the [`@Optional`](../api/core/index/Optional-var.html), - inject host element attributes with [`@Attribute`](../api/core/index/Attribute-var.html), - inject content child queries with [`@Query`](../api/core/index/Query-var.html) - and inject view child queries with [`@ViewQuery`](../api/core/index/ViewQuery-var.html)). + optional dependencies with the [`@Optional`](../api/core/index/Optional-decorator.html), + inject host element attributes with [`@Attribute`](../api/core/index/Attribute-interface.html), + inject content child queries with [`@ContentChild`](../api/core/index/ContentChild-decorator.html) + and inject view child queries with [`@ViewChild`](../api/core/index/ViewChild-decorator.html)). +makeExample('cb-ts-to-js/ts/app/hero-di-inject-additional.component.ts')(format="." ) @@ -373,8 +372,8 @@ table(width="100%") :marked We can apply other additional parameter decorators such as - [`@Host`](../api/core/index/Host-var.html) and - [`@SkipSelf`](../api/core/index/SkipSelf-var.html) in the same way - + [`@Host`](../api/core/index/Host-decorator.html) and + [`@SkipSelf`](../api/core/index/SkipSelf-decorator.html) in the same way - by adding `new ng.core.Host()` or `ng.core.SkipSelf()` in the parameters array. @@ -398,9 +397,9 @@ table(width="100%") ### Host Decorators We can use host property decorators to bind a host element to a component or directive. - The [`@HostBinding`](../api/core/index/HostBinding-var.html) decorator + The [`@HostBinding`](../api/core/index/HostBinding-interface.html) decorator binds host element properties to component data properties. - The [`@HostListener`](../api/core/index/HostListener-var.html) decorator bimds + The [`@HostListener`](../api/core/index/HostListener-interface.html) decorator bimds host element events to component event handlers. +makeExample('cb-ts-to-js/ts/app/heroes-bindings.component.ts')(format="." ) @@ -432,16 +431,16 @@ table(width="100%") There are several property decorators for querying the descendants of a component or directive. - The [`@ViewChild`](../api/core/index/ViewChild-var.html) and - [`@ViewChildren`](../api/core/index/ViewChildren-var.html) property decorators + The [`@ViewChild`](../api/core/index/ViewChild-decorator.html) and + [`@ViewChildren`](../api/core/index/ViewChildren-decorator.html) property decorators allow a component to query instances of other components that are used in its view. +makeExample('cb-ts-to-js/ts/app/heroes-queries.component.ts', 'view')(format="." ) :marked - The [`@ContentChild`](../api/core/index/ContentChild-var.html) and - [`@ContentChildren`](../api/core/index/ContentChildren-var.html) property decorators + The [`@ContentChild`](../api/core/index/ContentChild-decorator.html) and + [`@ContentChildren`](../api/core/index/ContentChildren-decorator.html) property decorators allow a component to query instances of other components that have been projected into its view from elsewhere. diff --git a/public/docs/js/latest/guide/forms.jade b/public/docs/js/latest/guide/forms.jade index c9e90f88eb..b0148eae79 100644 --- a/public/docs/js/latest/guide/forms.jade +++ b/public/docs/js/latest/guide/forms.jade @@ -485,7 +485,7 @@ figure.image-display .l-sub-section :marked Why "ngModel"? - A directive's [exportAs](../api/core/index/DirectiveMetadata-class.html#!#exportAs) property + A directive's [exportAs](../api/core/index/Directive-decorator.html) property tells Angular how to link the reference variable to the directive. We set `name` to `ngModel` because the `ngModel` directive's `exportAs` property happens to be "ngModel". @@ -497,7 +497,7 @@ figure.image-display :marked ### The NgForm directive We just set a template local variable with the value of an `NgForm` directive. - Why did that work? We didn't add the **[`NgForm`](../api/common/index/NgForm-directive.html) directive** explicitly. + Why did that work? We didn't add the **[`NgForm`](../api/forms/index/NgForm-directive.html) directive** explicitly. Angular added it surreptitiously, wrapping it around the `
    ` element diff --git a/public/docs/js/latest/guide/style-guide.jade b/public/docs/js/latest/guide/style-guide.jade index 4782ba81d3..c743361ac8 100644 --- a/public/docs/js/latest/guide/style-guide.jade +++ b/public/docs/js/latest/guide/style-guide.jade @@ -1 +1 @@ -include ../../../_includes/_ts-temp \ No newline at end of file +include ../../../_includes/_ts-temp diff --git a/public/docs/js/latest/guide/testing.jade b/public/docs/js/latest/guide/testing.jade index 4782ba81d3..c743361ac8 100644 --- a/public/docs/js/latest/guide/testing.jade +++ b/public/docs/js/latest/guide/testing.jade @@ -1 +1 @@ -include ../../../_includes/_ts-temp \ No newline at end of file +include ../../../_includes/_ts-temp diff --git a/public/docs/js/latest/testing/_data.json b/public/docs/js/latest/testing/_data.json deleted file mode 100644 index 2c63d566e7..0000000000 --- a/public/docs/js/latest/testing/_data.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "_listtype": "ordered", - - "index": { - "title": "Testing Overview", - "intro": "Techniques and practices for testing an Angular 2 app" - }, - - "jasmine-testing-101": { - "title": "Jasmine Testing 101", - "intro": "The basics of testing anything with Jasmine" - }, - - "application-under-test": { - "title": "The Application Under Test", - "intro": "A quick look at the application we will test" - }, - - "first-app-tests": { - "title": "First App Tests", - "intro": "The first test of a simple, non-Angular part of our app" - }, - - "testing-an-angular-pipe": { - "title": "Testing an Angular Pipe", - "intro": "We test an Angular-aware part of our app" - } -} \ No newline at end of file diff --git a/public/docs/js/latest/testing/application-under-test.jade b/public/docs/js/latest/testing/application-under-test.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/js/latest/testing/application-under-test.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/js/latest/testing/first-app-tests.jade b/public/docs/js/latest/testing/first-app-tests.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/js/latest/testing/first-app-tests.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/js/latest/testing/index.jade b/public/docs/js/latest/testing/index.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/js/latest/testing/index.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/js/latest/testing/jasmine-testing-101.jade b/public/docs/js/latest/testing/jasmine-testing-101.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/js/latest/testing/jasmine-testing-101.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/js/latest/testing/testing-an-angular-pipe.jade b/public/docs/js/latest/testing/testing-an-angular-pipe.jade deleted file mode 100644 index 4782ba81d3..0000000000 --- a/public/docs/js/latest/testing/testing-an-angular-pipe.jade +++ /dev/null @@ -1 +0,0 @@ -include ../../../_includes/_ts-temp \ No newline at end of file diff --git a/public/docs/ts/latest/glossary.jade b/public/docs/ts/latest/glossary.jade index 318c682bad..19e44c681d 100644 --- a/public/docs/ts/latest/glossary.jade +++ b/public/docs/ts/latest/glossary.jade @@ -530,12 +530,11 @@ a#N :marked Read more in the page on [pipes](!{docsLatest}/guide/pipes.html). -- var _ProviderUrl = docsLatest+'/api/'+(lang == 'dart' ? 'angular2.core' : 'core/index')+'/Provider-class.html' :marked ## Provider .l-sub-section :marked - A [provider](!{_ProviderUrl}) creates a new instance of a dependency for the + A _provider_ creates a new instance of a dependency for the [dependency injection](#dependency-injection) system. It relates a lookup token to code—sometimes called a "recipe"—that can create a dependency value. diff --git a/public/docs/ts/latest/guide/browser-support.jade b/public/docs/ts/latest/guide/browser-support.jade index 377d43927c..163abb5b8c 100644 --- a/public/docs/ts/latest/guide/browser-support.jade +++ b/public/docs/ts/latest/guide/browser-support.jade @@ -126,13 +126,13 @@ table td All but Chrome and Firefox
    Not supported in IE9 tr(style="vertical-align: top") td - a(href="../api/common/index/DatePipe-class.html" target="_blank") Date + a(href="../api/common/index/DatePipe-pipe.html" target="_blank") Date span , - a(href="../api/common/index/CurrencyPipe-class.html" target="_blank") currency + a(href="../api/common/index/CurrencyPipe-pipe.html" target="_blank") currency span , - a(href="../api/common/index/DecimalPipe-class.html" target="_blank") decimal + a(href="../api/common/index/DecimalPipe-pipe.html" target="_blank") decimal span and - a(href="../api/common/index/PercentPipe-class.html" target="_blank") percent + a(href="../api/common/index/PercentPipe-pipe.html" target="_blank") percent span pipes td :marked diff --git a/public/docs/ts/latest/guide/forms.jade b/public/docs/ts/latest/guide/forms.jade index 5d1377005b..0c3674fb59 100644 --- a/public/docs/ts/latest/guide/forms.jade +++ b/public/docs/ts/latest/guide/forms.jade @@ -502,7 +502,7 @@ figure.image-display .l-sub-section :marked Why "ngModel"? - A directive's [exportAs](../api/core/index/DirectiveMetadata-class.html#!#exportAs-anchor) property + A directive's [exportAs](../api/core/index/Directive-decorator.html) property tells Angular how to link the reference variable to the directive. We set `name` to `ngModel` because the `ngModel` directive's `exportAs` property happens to be "ngModel". @@ -603,7 +603,7 @@ figure.image-display .l-sub-section :marked ### The NgForm directive - What `NgForm` directive? We didn't add an [NgForm](../api/common/index/NgForm-directive.html) directive! + What `NgForm` directive? We didn't add an [NgForm](../api/forms/index/NgForm-directive.html) directive! Angular did. Angular creates and attaches an `NgForm` directive to the `` tag automatically. diff --git a/public/docs/ts/latest/guide/lifecycle-hooks.jade b/public/docs/ts/latest/guide/lifecycle-hooks.jade index c2c5cebe4e..7eceae6628 100644 --- a/public/docs/ts/latest/guide/lifecycle-hooks.jade +++ b/public/docs/ts/latest/guide/lifecycle-hooks.jade @@ -453,7 +453,7 @@ figure.image-display :marked The following hooks take action based on changing values *within the child view* which can only be reached by querying for the child view via the property decorated with - [@ViewChild](../api/core/index/ViewChild-var.html). + [@ViewChild](../api/core/index/ViewChild-decorator.html). +makeExample('lifecycle-hooks/ts/app/after-view.component.ts', 'hooks', 'AfterViewComponent (class excerpts)')(format=".") #wait-a-tick @@ -532,7 +532,7 @@ figure.image-display The following *AfterContent* hooks take action based on changing values in a *content child* which can only be reached by querying for it via the property decorated with - [@ContentChild](../api/core/index/ContentChild-var.html). + [@ContentChild](../api/core/index/ContentChild-decorator.html). +makeExample('lifecycle-hooks/ts/app/after-content.component.ts', 'hooks', 'AfterContentComponent (class excerpts)')(format=".") diff --git a/public/docs/ts/latest/guide/pipes.jade b/public/docs/ts/latest/guide/pipes.jade index 76f675c119..df5ac23c78 100644 --- a/public/docs/ts/latest/guide/pipes.jade +++ b/public/docs/ts/latest/guide/pipes.jade @@ -103,7 +103,7 @@ figure.image-display .l-sub-section :marked - Learn more about the `DatePipes` format options in the [API Docs](../api/common/index/DatePipe-class.html). + Learn more about the `DatePipes` format options in the [API Docs](../api/common/index/DatePipe-pipe.html). :marked ## Chaining pipes @@ -403,7 +403,7 @@ figure.image-display .callout.is-helpful header Debugging with the json pipe :marked - The [JsonPipe](../api/common/index/JsonPipe-class.html) + The [JsonPipe](../api/common/index/JsonPipe-pipe.html) provides an easy way to diagnosis a mysteriously failing data binding or inspect an object for future binding. diff --git a/public/docs/ts/latest/guide/style-guide.jade b/public/docs/ts/latest/guide/style-guide.jade index 1191c4f188..6c9b6f5610 100644 --- a/public/docs/ts/latest/guide/style-guide.jade +++ b/public/docs/ts/latest/guide/style-guide.jade @@ -1678,7 +1678,8 @@ a(href="#toc") Back to top .s-rule.do :marked - **Do** use [`@Input`](https://angular.io/docs/ts/latest/api/core/index/Input-var.html) and [`@Output`](https://angular.io/docs/ts/latest/api/core/index/Output-var.html) instead of the `inputs` and `outputs` properties of the [`@Directive`](https://angular.io/docs/ts/latest/api/core/index/Directive-decorator.html) and [`@Component`](https://angular.io/docs/ts/latest/api/core/index/Component-decorator.html) decorators: + **Do** use `@Input` and `@Output` instead of the `inputs` and `outputs` properties of the + `@Directive and `@Component` decorators: .s-rule.do :marked @@ -1690,10 +1691,8 @@ a(href="#toc") Back to top .s-why :marked - **Why?** If you ever need to rename the property or event name associated to - [`@Input`](https://angular.io/docs/ts/latest/api/core/index/Input-var.html) or - [`@Output`](https://angular.io/docs/ts/latest/api/core/index/Output-var.html) - you can modify it on a single place. + **Why?** If you ever need to rename the property or event name associated with + `@Input` or `@Output`, you can modify it a single place. .s-why :marked diff --git a/public/docs/ts/latest/guide/template-syntax.jade b/public/docs/ts/latest/guide/template-syntax.jade index 6288070a80..494d8ce23e 100644 --- a/public/docs/ts/latest/guide/template-syntax.jade +++ b/public/docs/ts/latest/guide/template-syntax.jade @@ -489,8 +489,8 @@ table If we must read a target element property or call one of its methods, we'll need a different technique. See the API reference for - [viewChild](../api/core/index/ViewChild-var.html) and - [contentChild](../api/core/index/ContentChild-var.html). + [viewChild](../api/core/index/ViewChild-decorator.html) and + [contentChild](../api/core/index/ContentChild-decorator.html). :marked ### Binding target @@ -885,7 +885,7 @@ block style-property-name-dart-diff The `ngModel` input property sets the element's value property and the `ngModelChange` output property listens for changes to the element's value. The details are specific to each kind of element and therefore the `NgModel` directive only works for elements, - such as the input text box, that are supported by a [ControlValueAccessor](../api/common/index/ControlValueAccessor-interface.html). + such as the input text box, that are supported by a [ControlValueAccessor](../api/forms/index/ControlValueAccessor-interface.html). We can't apply `[(ngModel)]` to our custom components until we write a suitable *value accessor*, a technique that is beyond the scope of this chapter. diff --git a/public/docs/ts/latest/guide/upgrade.jade b/public/docs/ts/latest/guide/upgrade.jade index c5ce0ef1be..430404a47a 100644 --- a/public/docs/ts/latest/guide/upgrade.jade +++ b/public/docs/ts/latest/guide/upgrade.jade @@ -1414,7 +1414,7 @@ code-example(format=""). ### Create the _Routing Module_ A router needs configuration whether it's the Angular 1 or Angular 2 or any other router. - The details of Angular 2 router configuration are best left to the [Routing](../router.html) documentation + The details of Angular 2 router configuration are best left to the [Routing documentation](router.html) which recommends that you create a `NgModule` dedicated to router configuration (called a _Routing Module_): @@ -1448,7 +1448,7 @@ code-example(format=""). +makeExample('upgrade-phonecat-3-final/ts/app/phone-list/phone-list.template.html', 'list', 'app/phone-list/phone-list.template.html (list with links)')(format='.') .l-sub-section :marked - See the [Routing](../router.html) page for details. + See the [Routing](router.html) page for details. :marked ### Bootstrap as an Angular 2 app diff --git a/public/docs/ts/latest/quickstart.jade b/public/docs/ts/latest/quickstart.jade index 7b8fa37ba2..4f4e4d1154 100644 --- a/public/docs/ts/latest/quickstart.jade +++ b/public/docs/ts/latest/quickstart.jade @@ -201,8 +201,8 @@ block install-packages browser. The QuickStart application doesn't do anything else, so you don't need any other modules. In a real - application, you'd likely import [`FormsModule`](../latest/api/forms/index/FormsModule-class - .html) as well as [`RouterModule`](../latest/api/router/index/RouterModule-class.html) and + application, you'd likely import [`FormsModule`](../latest/api/forms/index/FormsModule-class.html) + as well as [`RouterModule`](../latest/api/router/index/RouterModule-class.html) and [`HttpModule`](../latest/api/http/index/HttpModule-class.html). These are introduced in the [Tour of Heroes Tutorial](./tutorial/). @@ -227,8 +227,7 @@ p. The QuickStart application has the same essential structure as any other Angular component: * **An import statement**. Importing gives your component access to - Angular's core [`@Component` decorator function](../latest/api/core/index/Component-decorator - .html). + Angular's core [`@Component` decorator function](../latest/api/core/index/Component-decorator.html). * **A @Component #{_decorator}** that associates *metadata* with the `AppComponent` component class: From 6e7780dee0aa6d4e32acba4bf20c3563d6b178e5 Mon Sep 17 00:00:00 2001 From: Kathy Walrath Date: Mon, 3 Oct 2016 10:52:03 -0700 Subject: [PATCH 12/56] docs(dart/router): link to router tutorial instead of TS router docs (#2529) --- public/docs/dart/latest/guide/router.jade | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/docs/dart/latest/guide/router.jade b/public/docs/dart/latest/guide/router.jade index 4782ba81d3..578b315727 100644 --- a/public/docs/dart/latest/guide/router.jade +++ b/public/docs/dart/latest/guide/router.jade @@ -1 +1,6 @@ -include ../../../_includes/_ts-temp \ No newline at end of file +include ../_util-fns + +:marked + This advanced guide hasn't yet been written. + To learn the basics of routing, read the Tour of Heroes tutorial: + [Routing Around the App](../tutorial/toh-pt5.html). From 661c971778fd158ebc03a1e128fa3ea242fe6395 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Mon, 3 Oct 2016 19:33:17 +0100 Subject: [PATCH 13/56] fix(i18n): fix link and formatting error (#2528) --- public/docs/ts/latest/cookbook/i18n.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/docs/ts/latest/cookbook/i18n.jade b/public/docs/ts/latest/cookbook/i18n.jade index 75fabaf051..33175c0801 100644 --- a/public/docs/ts/latest/cookbook/i18n.jade +++ b/public/docs/ts/latest/cookbook/i18n.jade @@ -166,8 +166,8 @@ a#localization-folder (e.g. internationalization files) there. .l-sub-section :marked - Localization and internationalization are - different but closely related terms. + Localization and internationalization are + different but closely related terms. :marked This sample follows that suggestion. It has `locale` folder immediately under the project root. Assets within the folder carry a filename extension that matches a language-culture code from a From db6625eb30095fca93db55401b9ae49156a03287 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Mon, 3 Oct 2016 14:58:50 -0700 Subject: [PATCH 14/56] Fix dartdoc styles and prep layout for ng2 pages (#2530) - Use custom bootstrap grid system styles - Cache a copy of the dartdoc static-assets styles.css w/ footer styles disabled. - Alternate page layout controlled by jade2ng harp global --- gulpfile.js | 40 +- harp.json | 1 + public/_includes/_hero.jade | 10 +- public/_includes/_util-fns.jade | 2 +- public/docs/_layout-dart-api.jade | 75 +- public/docs/_layout.jade | 65 +- .../css/vendor/dartdoc/bootstrap.css | 1017 +++++++++++++++++ .../css/vendor/dartdoc/bootstrap.min.css | 14 + .../resources/css/vendor/dartdoc/styles.css | 757 ++++++++++++ tools/dart-api-builder/dab.js | 4 +- 10 files changed, 1901 insertions(+), 84 deletions(-) create mode 100755 public/resources/css/vendor/dartdoc/bootstrap.css create mode 100755 public/resources/css/vendor/dartdoc/bootstrap.min.css create mode 100644 public/resources/css/vendor/dartdoc/styles.css diff --git a/gulpfile.js b/gulpfile.js index 899c401d54..5db601a5d4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -50,6 +50,8 @@ var regularPlunker = require(path.resolve(TOOLS_PATH, 'plunker-builder/regularPl var embeddedPlunker = require(path.resolve(TOOLS_PATH, 'plunker-builder/embeddedPlunker')); var fsUtils = require(path.resolve(TOOLS_PATH, 'fs-utils/fsUtils')); +const WWW = argv.page ? 'www-pages' : 'www' + const isSilent = !!argv.silent; if (isSilent) gutil.log = gutil.noop; const _dgeniLogLevel = argv.dgeniLog || (isSilent ? 'error' : 'info'); @@ -747,7 +749,7 @@ gulp.task('harp-serve', () => { gulp.task('serve-www', () => { // Serve generated site. - return execPromise('npm run live-server ./www'); + return execPromise(`npm run live-server ${WWW}`); }); gulp.task('build-compile', ['build-docs'], function() { @@ -758,7 +760,7 @@ gulp.task('check-deploy', ['build-docs'], function() { return harpCompile().then(function() { gutil.log('compile ok'); gutil.log('running live server ...'); - execPromise('npm run live-server ./www'); + execPromise(`npm run live-server ${WWW}`); return askDeploy(); }).then(function(shouldDeploy) { if (shouldDeploy) { @@ -902,11 +904,13 @@ function harpCompile() { env({ vars: { NODE_ENV: "production" } }); gutil.log("NODE_ENV: " + process.env.NODE_ENV); - if(skipLangs && fs.existsSync('www') && backupApiHtmlFilesExist('www')) { + if(argv.page) harpJsonSetJade2NgTo(true); + + if(skipLangs && fs.existsSync(WWW) && backupApiHtmlFilesExist(WWW)) { gutil.log(`Harp site recompile: skipping recompilation of API docs for [${skipLangs}]`); - gutil.log(`API docs will be copied from existing www folder.`) - del.sync('www-backup'); // remove existing backup if it exists - renameIfExistsSync('www', 'www-backup'); + gutil.log(`API docs will be copied from existing ${WWW} folder.`) + del.sync(`${WWW}-backup`); // remove existing backup if it exists + renameIfExistsSync(WWW, `${WWW}-backup`); } else { gutil.log(`Harp full site compile, including API docs for all languages.`); if (skipLangs) @@ -918,11 +922,12 @@ function harpCompile() { gutil.log('running harp compile...'); showHideExampleNodeModules('hide'); showHideApiDir('hide'); - var spawnInfo = spawnExt('npm',['run','harp', '--', 'compile', '.', './www' ]); + var spawnInfo = spawnExt('npm',['run','harp', '--', 'compile', '.', WWW ]); spawnInfo.promise.then(function(x) { gutil.log("NODE_ENV: " + process.env.NODE_ENV); showHideExampleNodeModules('show'); showHideApiDir('show'); + harpJsonSetJade2NgTo(false); if (x !== 0) { deferred.reject(x) } else { @@ -933,6 +938,7 @@ function harpCompile() { gutil.log("NODE_ENV: " + process.env.NODE_ENV); showHideExampleNodeModules('show'); showHideApiDir('show'); + harpJsonSetJade2NgTo(false); deferred.reject(e); }); return deferred.promise; @@ -1050,21 +1056,21 @@ function _showHideApiDir(lang, showOrHide) { renameIfExistsSync(...args); } -// For each lang in skipLangs, copy the API dir from www-backup to www. +// For each lang in skipLangs, copy the API dir from ${WWW}-backup to WWW. function restoreApiHtml() { const vers = 'latest'; skipLangs.forEach(lang => { const relApiDir = path.join('docs', lang, vers, 'api'); - const wwwApiSubdir = path.join('www', relApiDir); - const backupApiSubdir = path.join('www-backup', relApiDir); + const apiSubdir = path.join(WWW, relApiDir); + const backupApiSubdir = path.join(`${WWW}-backup`, relApiDir); if (fs.existsSync(backupApiSubdir) || argv.forceSkipApi !== true) { - gutil.log(`cp ${backupApiSubdir} ${wwwApiSubdir}`) - fs.copySync(backupApiSubdir, wwwApiSubdir); + gutil.log(`cp ${backupApiSubdir} ${apiSubdir}`) + fs.copySync(backupApiSubdir, apiSubdir); } }); } -// For each lang in skipLangs, ensure API dir exists in www-backup +// For each lang in skipLangs, ensure API dir exists in folderName function backupApiHtmlFilesExist(folderName) { const vers = 'latest'; var result = 1; @@ -1079,6 +1085,14 @@ function backupApiHtmlFilesExist(folderName) { return result; } +function harpJsonSetJade2NgTo(v) { + const execSync = require('child_process').execSync; + const harpJsonPath = path.join(ANGULAR_IO_PROJECT_PATH, 'harp.json'); + execSync(`perl -pi -e 's/("jade2ng": *)\\w+/$1${v}/' ${harpJsonPath}`); + const harpJson = require(harpJsonPath); + gutil.log(`jade2ng: ${harpJson.globals.jade2ng}`); +} + // Copies fileNames into destPaths, setting the mode of the // files at the destination as optional_destFileMode if given. // returns a promise diff --git a/harp.json b/harp.json index 4a8328d35e..3036d32b97 100644 --- a/harp.json +++ b/harp.json @@ -6,6 +6,7 @@ "siteURL": "http://angular.io", "jsLatest": "2.0.0-beta.02", "dartLatest": "2.0.0-beta.02", + "jade2ng": false, "bios": { "misko": { diff --git a/public/_includes/_hero.jade b/public/_includes/_hero.jade index efeb8b0480..0323e2737c 100644 --- a/public/_includes/_hero.jade +++ b/public/_includes/_hero.jade @@ -1,4 +1,4 @@ -// template: public/_includes/_hero +//- template: public/_includes/_hero //- Refer to jade.template.html and addJadeDataDocsProcessor to figure out where the context of this jade file originates - var textFormat = ''; - var headerTitle = title + (typeof varType !== 'undefined' ? (': ' + varType) : ''); @@ -24,16 +24,14 @@ header.hero.background-sky span(class="badge is-deprecated"). Security Risk - //CLEAR FLOAT ELEMENTS + //- CLEAR FLOAT ELEMENTS .clear if subtitle h2.hero-subtitle #{subtitle} - else if docType h2.hero-subtitle #{renamer(capitalize(docType))} - -if current.path[3] == 'api' && current.path[1] == 'dart' - block breadcrumbs + if current.path[3] == 'api' && current.path[1] == 'dart' + block breadcrumbs diff --git a/public/_includes/_util-fns.jade b/public/_includes/_util-fns.jade index 0d10a5b301..5b583d4720 100644 --- a/public/_includes/_util-fns.jade +++ b/public/_includes/_util-fns.jade @@ -300,7 +300,7 @@ if !jade2ng - } else { - // ``` gets translated to 
    .....
    and we need - // to remove this from the fragment prefix is 11 long and suffix is 13 long -- frag = jade2ng ? frag : frag.substring(11, frag.length-13); +- frag = frag.substring(11, frag.length-13); - // Uncomment next line for debugging. - // frag = "FileName: " + fullFileName + " Current path: " + current.path + " PathToDocs: " + getPathToDocs() + "\n" + frag; - return frag; diff --git a/public/docs/_layout-dart-api.jade b/public/docs/_layout-dart-api.jade index d8e77353b6..a27d63b577 100644 --- a/public/docs/_layout-dart-api.jade +++ b/public/docs/_layout-dart-api.jade @@ -1,40 +1,51 @@ //- WARNING: _layout.jade and _layout-dart-api.jade should match in terms of content //- except that one uses Harp partial/yield and the other uses Jade extends/include. -doctype -html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Framework") - // template: public/docs/_layout-dart-api - head - include ../_includes/_head-include - block head-extra - - block var-def - body(class="l-offset-nav l-offset-side-nav" ng-controller="AppCtrl as appCtrl") - include ../_includes/_main-nav - if current.path[2] - include _includes/_side-nav +if jade2ng + .side-nav--offset + link(rel="stylesheet" href="/assets/css/vendor/dartdoc/bootstrap.min.css") + link(rel="stylesheet" href="/assets/css/vendor/dartdoc/styles.css") include ../_includes/_hero include ../_includes/_banner + .l-content-small.grid-fluid.docs-content + block main-content +else + doctype + html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Framework") + // template: public/docs/_layout-dart-api + head + include ../_includes/_head-include + link(rel="stylesheet" href="/resources/css/vendor/dartdoc/bootstrap.min.css") + link(rel="stylesheet" href="/resources/css/vendor/dartdoc/styles.css") + block head-extra - if current.path[3] == 'api' - if current.path[4] == 'index' + block var-def + body(class="l-offset-nav l-offset-side-nav" ng-controller="AppCtrl as appCtrl") + include ../_includes/_main-nav + if current.path[2] + include _includes/_side-nav + include ../_includes/_hero + include ../_includes/_banner + + if current.path[3] == 'api' + if current.path[4] == 'index' + block main-content + else + article(class="l-content-small grid-fluid docs-content") + block main-content + else if current.path.indexOf('cheatsheet') > 0 block main-content else - article(class="l-content-small grid-fluid docs-content") - block main-content - else if current.path.indexOf('cheatsheet') > 0 - block main-content - else - if current.path[3] == 'index' || current.path[3] == 'styleguide' - article(class="l-content-small grid-fluid docs-content") - block main-content - else - article(class="l-content-small grid-fluid docs-content") - div(class="c10") - .showcase - .showcase-content - block main-content - if (current.path[3] == 'guide' || current.path[3] == 'tutorial') && current.path[4] - include ../_includes/_next-item + if current.path[3] == 'index' || current.path[3] == 'styleguide' + article(class="l-content-small grid-fluid docs-content") + block main-content + else + article(class="l-content-small grid-fluid docs-content") + div(class="c10") + .showcase + .showcase-content + block main-content + if (current.path[3] == 'guide' || current.path[3] == 'tutorial') && current.path[4] + include ../_includes/_next-item - include ../_includes/_footer - include ../_includes/_scripts-include + include ../_includes/_footer + include ../_includes/_scripts-include diff --git a/public/docs/_layout.jade b/public/docs/_layout.jade index 1baf14d66c..0e5c83f7bb 100644 --- a/public/docs/_layout.jade +++ b/public/docs/_layout.jade @@ -1,37 +1,44 @@ //- WARNING: _layout.jade and _layout-dart-api.jade should match in terms of content //- except that one uses Harp partial/yield and the other uses Jade extends/include. -doctype -html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Framework") - // template: public/docs/_layout - head - != partial("../_includes/_head-include") - block head-extra - - //- - body(class="l-offset-nav l-offset-side-nav" ng-controller="AppCtrl as appCtrl") - != partial("../_includes/_main-nav") - if current.path[2] - != partial("_includes/_side-nav") +if jade2ng + .side-nav--offset != partial("../_includes/_hero") != partial("../_includes/_banner") + .l-content-small.grid-fluid.docs-content + != yield +else + doctype + html(lang="en" ng-app="angularIOApp" itemscope itemtype="http://schema.org/Framework") + // template: public/docs/_layout + head + != partial("../_includes/_head-include") + block head-extra - if current.path[3] == 'api' - if current.path[4] == 'index' + //- + body(class="l-offset-nav l-offset-side-nav" ng-controller="AppCtrl as appCtrl") + != partial("../_includes/_main-nav") + if current.path[2] + != partial("_includes/_side-nav") + != partial("../_includes/_hero") + != partial("../_includes/_banner") + + if current.path[3] == 'api' + if current.path[4] == 'index' + != yield + else + article(class="l-content-small grid-fluid docs-content") + != yield + else if current.path.indexOf('cheatsheet') > 0 != yield else - article(class="l-content-small grid-fluid docs-content") - != yield - else if current.path.indexOf('cheatsheet') > 0 - != yield - else - if current.path[3] == 'index' || current.path[3] == 'styleguide' - article(class="l-content-small grid-fluid docs-content") - != yield - else - article(class="l-content-small grid-fluid docs-content") - != yield - if (current.path[3] == 'guide' || current.path[3] == 'tutorial') && current.path[4] - != partial("../_includes/_next-item") + if current.path[3] == 'index' || current.path[3] == 'styleguide' + article(class="l-content-small grid-fluid docs-content") + != yield + else + article(class="l-content-small grid-fluid docs-content") + != yield + if (current.path[3] == 'guide' || current.path[3] == 'tutorial') && current.path[4] + != partial("../_includes/_next-item") - != partial("../_includes/_footer") - != partial("../_includes/_scripts-include") \ No newline at end of file + != partial("../_includes/_footer") + != partial("../_includes/_scripts-include") \ No newline at end of file diff --git a/public/resources/css/vendor/dartdoc/bootstrap.css b/public/resources/css/vendor/dartdoc/bootstrap.css new file mode 100755 index 0000000000..c5c93029f1 --- /dev/null +++ b/public/resources/css/vendor/dartdoc/bootstrap.css @@ -0,0 +1,1017 @@ +/*! + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/*! + * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=2562a07bd43503c5d2ca2125d913d5b4) + * Config saved to config.json and https://gist.github.com/2562a07bd43503c5d2ca2125d913d5b4 + */ +/*! + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} +body { + margin: 0; +} +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; +} +audio:not([controls]) { + display: none; + height: 0; +} +[hidden], +template { + display: none; +} +a { + background-color: transparent; +} +a:active, +a:hover { + outline: 0; +} +abbr[title] { + border-bottom: 1px dotted; +} +b, +strong { + font-weight: bold; +} +dfn { + font-style: italic; +} +h1 { + font-size: 2em; + margin: 0.67em 0; +} +mark { + background: #ff0; + color: #000; +} +small { + font-size: 80%; +} +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + border: 0; +} +svg:not(:root) { + overflow: hidden; +} +figure { + margin: 1em 40px; +} +hr { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} +pre { + overflow: auto; +} +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} +button, +input, +optgroup, +select, +textarea { + color: inherit; + font: inherit; + margin: 0; +} +button { + overflow: visible; +} +button, +select { + text-transform: none; +} +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} +button[disabled], +html input[disabled] { + cursor: default; +} +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} +input { + line-height: normal; +} +input[type="checkbox"], +input[type="radio"] { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0; +} +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} +legend { + border: 0; + padding: 0; +} +textarea { + overflow: auto; +} +optgroup { + font-weight: bold; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +td, +th { + padding: 0; +} +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +html { + font-size: 10px; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 1.42857143; + color: #333333; + background-color: #ffffff; +} +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} +a { + color: #337ab7; + text-decoration: none; +} +a:hover, +a:focus { + color: #23527c; + text-decoration: underline; +} +a:focus { + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +figure { + margin: 0; +} +img { + vertical-align: middle; +} +.img-responsive { + display: block; + max-width: 100%; + height: auto; +} +.img-rounded { + border-radius: 6px; +} +.img-thumbnail { + padding: 4px; + line-height: 1.42857143; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 4px; + -webkit-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; + display: inline-block; + max-width: 100%; + height: auto; +} +.img-circle { + border-radius: 50%; +} +hr { + margin-top: 20px; + margin-bottom: 20px; + border: 0; + border-top: 1px solid #eeeeee; +} +.sr-only { + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} +.sr-only-focusable:active, +.sr-only-focusable:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; +} +[role="button"] { + cursor: pointer; +} +.container { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; +} +@media (min-width: 768px) { + .container { + width: 750px; + } +} +@media (min-width: 992px) { + .container { + width: 970px; + } +} +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} +.container-fluid { + margin-right: auto; + margin-left: auto; + padding-left: 15px; + padding-right: 15px; +} +.row { + margin-left: -15px; + margin-right: -15px; +} +.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { + position: relative; + min-height: 1px; + padding-left: 15px; + padding-right: 15px; +} +.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { + float: left; +} +.col-xs-12 { + width: 100%; +} +.col-xs-11 { + width: 91.66666667%; +} +.col-xs-10 { + width: 83.33333333%; +} +.col-xs-9 { + width: 75%; +} +.col-xs-8 { + width: 66.66666667%; +} +.col-xs-7 { + width: 58.33333333%; +} +.col-xs-6 { + width: 50%; +} +.col-xs-5 { + width: 41.66666667%; +} +.col-xs-4 { + width: 33.33333333%; +} +.col-xs-3 { + width: 25%; +} +.col-xs-2 { + width: 16.66666667%; +} +.col-xs-1 { + width: 8.33333333%; +} +.col-xs-pull-12 { + right: 100%; +} +.col-xs-pull-11 { + right: 91.66666667%; +} +.col-xs-pull-10 { + right: 83.33333333%; +} +.col-xs-pull-9 { + right: 75%; +} +.col-xs-pull-8 { + right: 66.66666667%; +} +.col-xs-pull-7 { + right: 58.33333333%; +} +.col-xs-pull-6 { + right: 50%; +} +.col-xs-pull-5 { + right: 41.66666667%; +} +.col-xs-pull-4 { + right: 33.33333333%; +} +.col-xs-pull-3 { + right: 25%; +} +.col-xs-pull-2 { + right: 16.66666667%; +} +.col-xs-pull-1 { + right: 8.33333333%; +} +.col-xs-pull-0 { + right: auto; +} +.col-xs-push-12 { + left: 100%; +} +.col-xs-push-11 { + left: 91.66666667%; +} +.col-xs-push-10 { + left: 83.33333333%; +} +.col-xs-push-9 { + left: 75%; +} +.col-xs-push-8 { + left: 66.66666667%; +} +.col-xs-push-7 { + left: 58.33333333%; +} +.col-xs-push-6 { + left: 50%; +} +.col-xs-push-5 { + left: 41.66666667%; +} +.col-xs-push-4 { + left: 33.33333333%; +} +.col-xs-push-3 { + left: 25%; +} +.col-xs-push-2 { + left: 16.66666667%; +} +.col-xs-push-1 { + left: 8.33333333%; +} +.col-xs-push-0 { + left: auto; +} +.col-xs-offset-12 { + margin-left: 100%; +} +.col-xs-offset-11 { + margin-left: 91.66666667%; +} +.col-xs-offset-10 { + margin-left: 83.33333333%; +} +.col-xs-offset-9 { + margin-left: 75%; +} +.col-xs-offset-8 { + margin-left: 66.66666667%; +} +.col-xs-offset-7 { + margin-left: 58.33333333%; +} +.col-xs-offset-6 { + margin-left: 50%; +} +.col-xs-offset-5 { + margin-left: 41.66666667%; +} +.col-xs-offset-4 { + margin-left: 33.33333333%; +} +.col-xs-offset-3 { + margin-left: 25%; +} +.col-xs-offset-2 { + margin-left: 16.66666667%; +} +.col-xs-offset-1 { + margin-left: 8.33333333%; +} +.col-xs-offset-0 { + margin-left: 0%; +} +@media (min-width: 768px) { + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + float: left; + } + .col-sm-12 { + width: 100%; + } + .col-sm-11 { + width: 91.66666667%; + } + .col-sm-10 { + width: 83.33333333%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-8 { + width: 66.66666667%; + } + .col-sm-7 { + width: 58.33333333%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-5 { + width: 41.66666667%; + } + .col-sm-4 { + width: 33.33333333%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-2 { + width: 16.66666667%; + } + .col-sm-1 { + width: 8.33333333%; + } + .col-sm-pull-12 { + right: 100%; + } + .col-sm-pull-11 { + right: 91.66666667%; + } + .col-sm-pull-10 { + right: 83.33333333%; + } + .col-sm-pull-9 { + right: 75%; + } + .col-sm-pull-8 { + right: 66.66666667%; + } + .col-sm-pull-7 { + right: 58.33333333%; + } + .col-sm-pull-6 { + right: 50%; + } + .col-sm-pull-5 { + right: 41.66666667%; + } + .col-sm-pull-4 { + right: 33.33333333%; + } + .col-sm-pull-3 { + right: 25%; + } + .col-sm-pull-2 { + right: 16.66666667%; + } + .col-sm-pull-1 { + right: 8.33333333%; + } + .col-sm-pull-0 { + right: auto; + } + .col-sm-push-12 { + left: 100%; + } + .col-sm-push-11 { + left: 91.66666667%; + } + .col-sm-push-10 { + left: 83.33333333%; + } + .col-sm-push-9 { + left: 75%; + } + .col-sm-push-8 { + left: 66.66666667%; + } + .col-sm-push-7 { + left: 58.33333333%; + } + .col-sm-push-6 { + left: 50%; + } + .col-sm-push-5 { + left: 41.66666667%; + } + .col-sm-push-4 { + left: 33.33333333%; + } + .col-sm-push-3 { + left: 25%; + } + .col-sm-push-2 { + left: 16.66666667%; + } + .col-sm-push-1 { + left: 8.33333333%; + } + .col-sm-push-0 { + left: auto; + } + .col-sm-offset-12 { + margin-left: 100%; + } + .col-sm-offset-11 { + margin-left: 91.66666667%; + } + .col-sm-offset-10 { + margin-left: 83.33333333%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-8 { + margin-left: 66.66666667%; + } + .col-sm-offset-7 { + margin-left: 58.33333333%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-5 { + margin-left: 41.66666667%; + } + .col-sm-offset-4 { + margin-left: 33.33333333%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-2 { + margin-left: 16.66666667%; + } + .col-sm-offset-1 { + margin-left: 8.33333333%; + } + .col-sm-offset-0 { + margin-left: 0%; + } +} +@media (min-width: 992px) { + .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { + float: left; + } + .col-md-12 { + width: 100%; + } + .col-md-11 { + width: 91.66666667%; + } + .col-md-10 { + width: 83.33333333%; + } + .col-md-9 { + width: 75%; + } + .col-md-8 { + width: 66.66666667%; + } + .col-md-7 { + width: 58.33333333%; + } + .col-md-6 { + width: 50%; + } + .col-md-5 { + width: 41.66666667%; + } + .col-md-4 { + width: 33.33333333%; + } + .col-md-3 { + width: 25%; + } + .col-md-2 { + width: 16.66666667%; + } + .col-md-1 { + width: 8.33333333%; + } + .col-md-pull-12 { + right: 100%; + } + .col-md-pull-11 { + right: 91.66666667%; + } + .col-md-pull-10 { + right: 83.33333333%; + } + .col-md-pull-9 { + right: 75%; + } + .col-md-pull-8 { + right: 66.66666667%; + } + .col-md-pull-7 { + right: 58.33333333%; + } + .col-md-pull-6 { + right: 50%; + } + .col-md-pull-5 { + right: 41.66666667%; + } + .col-md-pull-4 { + right: 33.33333333%; + } + .col-md-pull-3 { + right: 25%; + } + .col-md-pull-2 { + right: 16.66666667%; + } + .col-md-pull-1 { + right: 8.33333333%; + } + .col-md-pull-0 { + right: auto; + } + .col-md-push-12 { + left: 100%; + } + .col-md-push-11 { + left: 91.66666667%; + } + .col-md-push-10 { + left: 83.33333333%; + } + .col-md-push-9 { + left: 75%; + } + .col-md-push-8 { + left: 66.66666667%; + } + .col-md-push-7 { + left: 58.33333333%; + } + .col-md-push-6 { + left: 50%; + } + .col-md-push-5 { + left: 41.66666667%; + } + .col-md-push-4 { + left: 33.33333333%; + } + .col-md-push-3 { + left: 25%; + } + .col-md-push-2 { + left: 16.66666667%; + } + .col-md-push-1 { + left: 8.33333333%; + } + .col-md-push-0 { + left: auto; + } + .col-md-offset-12 { + margin-left: 100%; + } + .col-md-offset-11 { + margin-left: 91.66666667%; + } + .col-md-offset-10 { + margin-left: 83.33333333%; + } + .col-md-offset-9 { + margin-left: 75%; + } + .col-md-offset-8 { + margin-left: 66.66666667%; + } + .col-md-offset-7 { + margin-left: 58.33333333%; + } + .col-md-offset-6 { + margin-left: 50%; + } + .col-md-offset-5 { + margin-left: 41.66666667%; + } + .col-md-offset-4 { + margin-left: 33.33333333%; + } + .col-md-offset-3 { + margin-left: 25%; + } + .col-md-offset-2 { + margin-left: 16.66666667%; + } + .col-md-offset-1 { + margin-left: 8.33333333%; + } + .col-md-offset-0 { + margin-left: 0%; + } +} +@media (min-width: 1200px) { + .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { + float: left; + } + .col-lg-12 { + width: 100%; + } + .col-lg-11 { + width: 91.66666667%; + } + .col-lg-10 { + width: 83.33333333%; + } + .col-lg-9 { + width: 75%; + } + .col-lg-8 { + width: 66.66666667%; + } + .col-lg-7 { + width: 58.33333333%; + } + .col-lg-6 { + width: 50%; + } + .col-lg-5 { + width: 41.66666667%; + } + .col-lg-4 { + width: 33.33333333%; + } + .col-lg-3 { + width: 25%; + } + .col-lg-2 { + width: 16.66666667%; + } + .col-lg-1 { + width: 8.33333333%; + } + .col-lg-pull-12 { + right: 100%; + } + .col-lg-pull-11 { + right: 91.66666667%; + } + .col-lg-pull-10 { + right: 83.33333333%; + } + .col-lg-pull-9 { + right: 75%; + } + .col-lg-pull-8 { + right: 66.66666667%; + } + .col-lg-pull-7 { + right: 58.33333333%; + } + .col-lg-pull-6 { + right: 50%; + } + .col-lg-pull-5 { + right: 41.66666667%; + } + .col-lg-pull-4 { + right: 33.33333333%; + } + .col-lg-pull-3 { + right: 25%; + } + .col-lg-pull-2 { + right: 16.66666667%; + } + .col-lg-pull-1 { + right: 8.33333333%; + } + .col-lg-pull-0 { + right: auto; + } + .col-lg-push-12 { + left: 100%; + } + .col-lg-push-11 { + left: 91.66666667%; + } + .col-lg-push-10 { + left: 83.33333333%; + } + .col-lg-push-9 { + left: 75%; + } + .col-lg-push-8 { + left: 66.66666667%; + } + .col-lg-push-7 { + left: 58.33333333%; + } + .col-lg-push-6 { + left: 50%; + } + .col-lg-push-5 { + left: 41.66666667%; + } + .col-lg-push-4 { + left: 33.33333333%; + } + .col-lg-push-3 { + left: 25%; + } + .col-lg-push-2 { + left: 16.66666667%; + } + .col-lg-push-1 { + left: 8.33333333%; + } + .col-lg-push-0 { + left: auto; + } + .col-lg-offset-12 { + margin-left: 100%; + } + .col-lg-offset-11 { + margin-left: 91.66666667%; + } + .col-lg-offset-10 { + margin-left: 83.33333333%; + } + .col-lg-offset-9 { + margin-left: 75%; + } + .col-lg-offset-8 { + margin-left: 66.66666667%; + } + .col-lg-offset-7 { + margin-left: 58.33333333%; + } + .col-lg-offset-6 { + margin-left: 50%; + } + .col-lg-offset-5 { + margin-left: 41.66666667%; + } + .col-lg-offset-4 { + margin-left: 33.33333333%; + } + .col-lg-offset-3 { + margin-left: 25%; + } + .col-lg-offset-2 { + margin-left: 16.66666667%; + } + .col-lg-offset-1 { + margin-left: 8.33333333%; + } + .col-lg-offset-0 { + margin-left: 0%; + } +} +.clearfix:before, +.clearfix:after, +.container:before, +.container:after, +.container-fluid:before, +.container-fluid:after, +.row:before, +.row:after { + content: " "; + display: table; +} +.clearfix:after, +.container:after, +.container-fluid:after, +.row:after { + clear: both; +} +.center-block { + display: block; + margin-left: auto; + margin-right: auto; +} +.pull-right { + float: right !important; +} +.pull-left { + float: left !important; +} +.hide { + display: none !important; +} +.show { + display: block !important; +} +.invisible { + visibility: hidden; +} +.text-hide { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} +.hidden { + display: none !important; +} +.affix { + position: fixed; +} diff --git a/public/resources/css/vendor/dartdoc/bootstrap.min.css b/public/resources/css/vendor/dartdoc/bootstrap.min.css new file mode 100755 index 0000000000..cb0b23127d --- /dev/null +++ b/public/resources/css/vendor/dartdoc/bootstrap.min.css @@ -0,0 +1,14 @@ +/*! + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/*! + * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=2562a07bd43503c5d2ca2125d913d5b4) + * Config saved to config.json and https://gist.github.com/2562a07bd43503c5d2ca2125d913d5b4 + *//*! + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role="button"]{cursor:pointer}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important}.affix{position:fixed} \ No newline at end of file diff --git a/public/resources/css/vendor/dartdoc/styles.css b/public/resources/css/vendor/dartdoc/styles.css new file mode 100644 index 0000000000..903e50da49 --- /dev/null +++ b/public/resources/css/vendor/dartdoc/styles.css @@ -0,0 +1,757 @@ +/* This is a copy of the dartdoc static-assets/styles.css as of 2016/10/03 but with footer styles disabled. */ + +/* Palette generated by Material Palette - materialpalette.com/blue/cyan */ + +.dark-primary-color { background: #1976D2; } +.default-primary-color { background: #2196F3; } +.light-primary-color { background: #BBDEFB; } +.text-primary-color { color: #FFFFFF; } +.accent-color { background: #00BCD4; } +.primary-text-color { color: #212121; } +.secondary-text-color { color: #727272; } +.divider-color { border-color: #B6B6B6; } + +html { + position: relative; + min-height: 100%; +} + +body { + font-family: 'Roboto', sans-serif; + font-size: 15px; + margin-bottom: 60px; + -webkit-font-smoothing: antialiased; + -webkit-text-size-adjust: 100%; + overflow-x: hidden; + color: #212121; +} + +nav { + font-size: 17px; +} + +/* some of this is to reset bootstrap */ +nav.navbar { + background-color: inherit; + min-height: 48px; + border: 0; +} + +nav.navbar .row { + padding-top: 8px; +} + +nav .container { + white-space: nowrap; +} + +@media screen and (min-width: 500px) and (max-width: 768px) { + .navbar-right { + float: right!important; + } +} + +header { + background-color: rgb(0, 102, 152); + color: white; + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37); +} + +header.header-fixed nav.navbar-fixed-top { + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37); +} + +header.container-fluid { + padding: 0; +} + +header .masthead { + padding-top: 64px; +} + +header .contents { + padding: 0; +} + +@media screen and (max-width:768px) { + header .contents { + padding-left: 15px; + padding-right: 15px; + } +} + +.body { + margin-top: 24px; +} + +section { + margin-bottom: 36px; +} + +dl { + margin: 0; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: normal; + margin: 0; +} + +h1.title { + overflow: hidden; + text-overflow: ellipsis; +} + +h2 { + font-size: 24px; +} + +h5 { + font-size: 16px; +} + +strong { + font-weight: 500; +} + +.subtitle { + font-size: 17px; + min-height: 1.4em; +} + +.title-description .subtitle { + white-space: nowrap; + overflow-x: hidden; + text-overflow: ellipsis; +} + +p { + margin-bottom: 1em; +} + +a, a:hover { + color: rgb(0, 102, 152); +} + +pre.prettyprint { + font-family: 'Source Code Pro', monospace; + color: black; + border-radius: 4px; + font-size: 14px; + word-wrap: normal; + line-height: 1.4; + background: #f7f7f7; + border: 1px solid #ddd; + margin: 16px 0 16px 0; + padding: 8px; +} + +pre code { + white-space: pre; + word-wrap: initial; +} + +.fixed { + white-space: pre; +} + +pre { + border: 1px solid #ddd; + background-color: #f7f7f7; + font-size: 14px; +} + +code { + font-family: 'Source Code Pro', monospace; + /* overriding bootstrap */ + color: inherit; + background-color: #f7f7f7; +} + +h2 .crossdart { + float: right; + font-size: 0.5em; + margin-top: 1em; +} + +.crossdart-link { + border-bottom: 1px solid #dfdfdf; + text-decoration: none; +} + +.crossdart-link:hover { + border-bottom: 1px solid #aaa; + text-decoration: none; +} + +@media(max-width: 768px) { + nav .container { + width: 100% + } + + h1 { + font-size: 24px; + } + + pre { + margin: 16px 0; + } +} + +@media (min-width: 768px) { + .dl-horizontal dd { + margin-left: 128px; + } + + .dl-horizontal dt { + width: 128px; + } + + ul.subnav li { + font-size: 17px; + } +} + +header h1 { + font-weight: 400; + margin-bottom: 16px; +} + +header a, +header a:hover, +header p, +header li { + color: white; +} + +header h1 .kind { + color: #ddd; + text-transform: uppercase; + font-size: 15px; + display: block; +} + +@media screen and (max-width: 768px) { + header h1 .kind { + font-size: 14px; + } +} + +dt { + font-weight: normal; +} + +dd { + color: #212121; + margin-bottom: 1em; +} + +dd.callable, dd.constant, dd.property { + margin-bottom: 24px; +} + +dd p { + overflow-x: hidden; + text-overflow: ellipsis; + margin-bottom: 0; +} + +section.summary h2 { + color: #727272; + margin-bottom: 16px; + padding-bottom: 4px; + border-bottom: 1px solid #ddd; +} + +/* indents wrapped lines */ +section.summary dt { + margin-left: 24px; + text-indent: -24px; +} + +dl.dl-horizontal dt { + font-style: normal; + text-align: left; + color: #727272; +} + +dl.dl-horizontal dt::after { + content: ':'; +} + +dt .name { + font-weight: 500; +} + +dl dt.callable .name { + float: none; + width: auto; +} + +.parameter { + white-space: nowrap; +} + +.signature { + color: #727272; +} + +.signature a { + /* 50% mix of default-primary-color and primary-text-color. */ + color: #4674a2; +} + +.optional { + font-style: italic; +} + +.undocumented { + font-style: italic; +} + +.is-const { + font-style: italic; +} + +.deprecated { + text-decoration: line-through; +} + +p.firstline { + font-weight: bold; +} + +footer-disabled-for-ng2io { + padding: 20px; + position: absolute; + bottom: 0; + width: 100%; + height: 60px; +} + +footer-disabled-for-ng2io p { + margin: 0; + color: #555; +} + +footer-disabled-for-ng2io .no-break { + white-space: nowrap; +} + +footer-disabled-for-ng2io .container, +footer-disabled-for-ng2io .container-fluid { + padding-left: 0; + padding-right: 0; +} + +.copyright a { + color: #555; +} + +.markdown h1 { + font-size: 24px; + margin-bottom: 8px; +} + +.markdown h2 { + font-size: 20px; + margin-top: 24px; + margin-bottom: 8px; +} + +.markdown h3 { + font-size: 18px; + margin-bottom: 8px; +} + +.markdown h4 { + font-size: 16px; + margin-bottom: 0; +} + +.markdown li p { + margin: 0; +} + +.gt-separated { + list-style: none; + padding: 0; + margin: 0; +} + +.gt-separated li { + display: inline-block; +} + +.gt-separated li:before { + background-image: url("data:image/svg+xml;utf8,"); + background-position: center; + content: "\00a0"; + margin: 0 6px 0 4px; +} + +.gt-separated.dark li:before { + background-image: url("data:image/svg+xml;utf8,"); +} + +.gt-separated li:first-child:before { + background-image: none; + content: ""; + margin: 0; +} + +/* The slug line under a declaration for things like "const", "read-only", etc. */ +.features { + font-style: italic; + color: #727272; +} + +.multi-line-signature { + font-size: 17px; + color: #727272; +} + +.multi-line-signature .parameter { + margin-left: 24px; + display: block; +} + +.breadcrumbs { + padding: 0; + margin: 8px 0 8px 0; + font-size: 17px; + white-space: nowrap; + line-height: 1; +} + +@media screen and (min-width: 768px) { + nav ol.breadcrumbs { + float: left; + } +} + +@media screen and (max-width: 768px) { + .breadcrumbs { + margin: 0 0 24px 0; + overflow-x: hidden; + } +} + +.self-crumb { + color: #ddd; +} + +nav .self-name { + color: #ddd; + display: none; +} + +.annotation-list { + list-style: none; + padding: 0; + display: inline; +} + +.annotation-list li:before { + content: "@"; +} + +.comma-separated { + list-style: none; + padding: 0; + display: inline; +} + +.comma-separated li { + display: inline; +} + +.comma-separated li:after { + content: ", "; +} + +.comma-separated li:last-child:after { + content: ""; +} + +.end-with-period li:last-child:after { + content: "."; +} + +.container > section:first-child { + border: 0; +} + +.constructor-modifier { + font-style: italic; +} + +section.multi-line-signature div.parameters { + margin-left: 24px; +} + +/* subnav styles */ + +ul.subnav { + overflow: auto; + white-space: nowrap; + padding-left: 0; + min-height: 25px; +} + +ul.subnav::-webkit-scrollbar { + display: none; +} + +ul.subnav li { + display: inline-block; + text-transform: uppercase; +} + +ul.subnav li a { + color: #FFFFFF; +} + +ul.subnav li { + margin-right: 24px; +} + +ul.subnav li:last-of-type { + margin-right: 0; +} + +@media(max-width: 768px) { + ul.subnav li { + margin-right: 16px; + } +} + +/* sidebar styles */ + +.sidebar-offcanvas-left { + background-color: #f7f7f7; + padding: 0; +} + +.sidebar ol { + list-style: none; + font-size: 14px; + line-height: 24px; + margin-bottom: 0; + padding: 0; +} + +.sidebar-offcanvas-left ol { + padding: 16px; +} + +.sidebar h5, +.sidebar ol li { + text-overflow: ellipsis; + overflow: hidden; +} + +.sidebar ol li.section-title a { + color: inherit; +} + +.sidebar ol li.section-title { + font-size: 13px; + color: #B6B6B6; + text-transform: uppercase; + line-height: 20px; + margin-top: 24px; +} + +.sidebar ol li:first-child { + padding-top: 0; + margin-top: 0; +} + +button { + padding: 0; +} + +#sidenav-left-toggle { + display: none; + vertical-align: text-bottom; + padding: 0; +} + +/* left-nav disappears, and can transition in from the left */ +@media screen and (max-width:768px) { + #sidenav-left-toggle { + display: inline; + background: no-repeat url("data:image/svg+xml;utf8,"); + background-position: center; + width: 24px; + height: 24px; + border: none; + margin-right: 24px; + } + + #overlay-under-drawer.active { + opacity: 0.4; + height: 100%; + z-index: 1999; + position: fixed; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + background-color: black; + display: block; + } + + .sidebar-offcanvas-left { + left:-100%; + position:fixed; + -webkit-transition:all .25s ease-out; + -o-transition:all .25s ease-out; + transition:all .25s ease-out; + z-index: 2000; + top:0; + width: 280px; /* works all the way down to an iphone 4 */ + height: 100%; + background-color: white; + overflow-y: auto; /* TODO: how to hide scroll bars? */ + } + + .sidebar-offcanvas-left.active { + left:0; /* this animates our drawer into the page */ + } +} + +.sidebar h5 { + color: #727272; + padding-bottom: 16px; +} + +.sidebar-offcanvas-left h5 { + border-bottom: 1px solid #ddd; + padding: 16px; +} + +.sidebar-offcanvas-left h5:last-of-type { + border: 0; + padding: 16px 16px 0 16px; +} + +/* the right nav disappears out of view when the window shrinks */ +@media screen and (max-width: 992px) { + .sidebar-offcanvas-right{ + display: none; + } +} + +#overlay-under-drawer { + display: none; +} + +/* find-as-you-type search box */ + +/* override bootstrap defaults */ +.form-control { + border-radius: 0; + border: 0; +} + +form.search { + display: inline; +} + +@media screen and (max-width: 500px) { + form.search { + display: none; + } +} + +.typeahead, +.tt-query, +.tt-hint { + width: 200px; + height: 30px; + padding: 8px 12px; + line-height: 30px; + outline: none; +} + +.typeahead { + background-color: #fff; + border-radius: 2px; +} + +.tt-query { + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); +} + +.tt-hint { + color: #999 +} + +.tt-menu { + right:0; + left: inherit !important; + width: 422px; + max-height: 250px; + overflow-y: auto; + font-size: 14px; + margin: 0; + padding: 8px 0; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2); + -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2); + box-shadow: 0 5px 10px rgba(0,0,0,.2); +} + +.tt-suggestion { + padding: 3px 20px; + color: #212121; +} + +.tt-suggestion:hover { + cursor: pointer; + color: #fff; + background-color: #0097cf; +} + +.tt-suggestion:hover .search-from-lib { + color: #ddd; +} + +.tt-suggestion.tt-cursor { + color: #fff; + background-color: #0097cf; +} + +.tt-suggestion.tt-cursor .search-from-lib { + color: #ddd; +} + +.tt-suggestion p { + margin: 0; +} + +.search-from-lib { + font-style: italic; + color: gray; +} + +section#setter { + border-top: 1px solid #ddd; + padding-top: 36px; +} + +li.inherited a { + opacity: 0.65; + font-style: italic; +} diff --git a/tools/dart-api-builder/dab.js b/tools/dart-api-builder/dab.js index ff11500cb6..31383cc315 100644 --- a/tools/dart-api-builder/dab.js +++ b/tools/dart-api-builder/dab.js @@ -219,12 +219,10 @@ block head-extra // generated Dart API page template: head-extra //- is required because all the links in dartdoc generated pages are "pseudo-absolute" base(href="${baseHref}") - link(rel="stylesheet" href="static-assets/styles.css") block breadcrumbs // generated Dart API page template: breadcrumbs - .banner - ol.breadcrumbs.gt-separated.hidden-xs + ol.breadcrumbs.gt-separated.hidden-xs ${breadcrumbs} block main-content From a2744e7ece425405213c3b1cbb779dca581964c4 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Mon, 3 Oct 2016 17:30:45 -0700 Subject: [PATCH 15/56] chore: update /quickstart/js/package.1.json (#2534) also remove /cb-set-document-title/ts/sample.css --- .../cb-set-document-title/ts/sample.css | 4 --- .../_examples/quickstart/js/package.1.json | 33 +++++++++---------- 2 files changed, 16 insertions(+), 21 deletions(-) delete mode 100644 public/docs/_examples/cb-set-document-title/ts/sample.css diff --git a/public/docs/_examples/cb-set-document-title/ts/sample.css b/public/docs/_examples/cb-set-document-title/ts/sample.css deleted file mode 100644 index 13acd31061..0000000000 --- a/public/docs/_examples/cb-set-document-title/ts/sample.css +++ /dev/null @@ -1,4 +0,0 @@ -a { - color: #607D8B ; - text-decoration: underline ; -} diff --git a/public/docs/_examples/quickstart/js/package.1.json b/public/docs/_examples/quickstart/js/package.1.json index cca103a52f..f07246fadd 100644 --- a/public/docs/_examples/quickstart/js/package.1.json +++ b/public/docs/_examples/quickstart/js/package.1.json @@ -1,5 +1,5 @@ { - "name": "angular2-quickstart", + "name": "angular-quickstart", "version": "1.0.0", "scripts": { "start": "npm run lite", @@ -7,26 +7,25 @@ }, "license": "ISC", "dependencies": { - "@angular/common": "2.0.0", - "@angular/compiler": "2.0.0", - "@angular/core": "2.0.0", - "@angular/forms": "2.0.0", - "@angular/http": "2.0.0", - "@angular/platform-browser": "2.0.0", - "@angular/platform-browser-dynamic": "2.0.0", - "@angular/router": "3.0.0", - "@angular/upgrade": "2.0.0", + "@angular/common": "~2.0.1", + "@angular/compiler": "~2.0.1", + "@angular/core": "~2.0.1", + "@angular/forms": "~2.0.1", + "@angular/http": "~2.0.1", + "@angular/platform-browser": "~2.0.1", + "@angular/platform-browser-dynamic": "~2.0.1", + "@angular/router": "~3.0.1", + "@angular/upgrade": "~2.0.1", + "angular-in-memory-web-api": "~0.1.1", + "bootstrap": "^3.3.7", "core-js": "^2.4.1", - "reflect-metadata": "^0.1.3", + "reflect-metadata": "^0.1.8", "rxjs": "5.0.0-beta.12", - "zone.js": "^0.6.23", - - "angular2-in-memory-web-api": "0.0.20", - "bootstrap": "^3.3.6" + "zone.js": "^0.6.25" }, "devDependencies": { - "concurrently": "^2.0.0", - "lite-server": "^2.2.0" + "concurrently": "^3.0.0", + "lite-server": "^2.2.2" } } From bf97a9a2e1af41e8107667d9bd3959a8779b2cbb Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Mon, 3 Oct 2016 18:16:15 -0700 Subject: [PATCH 16/56] docs(style-guide): fix folder structure in 04 to match what we do. (#2535) closes issue #2533 --- public/docs/ts/latest/guide/style-guide.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/docs/ts/latest/guide/style-guide.jade b/public/docs/ts/latest/guide/style-guide.jade index 6c9b6f5610..2b3910da6f 100644 --- a/public/docs/ts/latest/guide/style-guide.jade +++ b/public/docs/ts/latest/guide/style-guide.jade @@ -1111,10 +1111,10 @@ a(href="#toc") Back to top a(id='file-tree') :marked - Folder and File Structure + Here is a compliant folder and file structure .filetree - .file src + .file <project root> .children .file app .children @@ -1160,8 +1160,8 @@ a(id='file-tree') .file villains.module.ts .file villains-routing.module.ts .file app.component.ts|html|css|spec.ts - .file app.module.ts - .file app-routing.module.ts + .file app.module.ts + .file app-routing.module.ts .file main.ts .file index.html .file ... @@ -1226,11 +1226,11 @@ a(href="#toc") Back to top .s-rule.do :marked - **Do** create an Angular module at the root of the application. + **Do** create an Angular module in the app's root folder (e.g., in `/app`). .s-why :marked - **Why?** Every app requires at least one Angular module. + **Why?** Every app requires at least one root Angular module. .s-rule.consider :marked From ea4588792789048be76d66cd1b954e30e2d800d1 Mon Sep 17 00:00:00 2001 From: Maxime Date: Tue, 4 Oct 2016 14:59:10 +0200 Subject: [PATCH 17/56] docs(testing): fix typo (#2524) --- .../testing/ts/app/dashboard/dashboard-hero.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts b/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts index 0ae563a831..347cc654c4 100644 --- a/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts +++ b/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts @@ -86,7 +86,7 @@ describe('DashboardHeroComponent when inside a test host', () => { })); beforeEach(() => { - // create TestHosComponent instead of DashboardHeroComponent + // create TestHostComponent instead of DashboardHeroComponent fixture = TestBed.createComponent(TestHostComponent); testHost = fixture.componentInstance; heroEl = fixture.debugElement.query(By.css('.hero')); // find hero From 7c262ccab53e733253b851a1a2671088f6995a0c Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Oct 2016 07:02:07 -0600 Subject: [PATCH 18/56] docs(testing): fix minor typo in DashboardHeroComponent (#2518) Fixed minor typo in DashboardHeroComponent --- .../testing/ts/app/dashboard/dashboard-hero.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts b/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts index 347cc654c4..40c01571e6 100644 --- a/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts +++ b/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts @@ -19,7 +19,7 @@ describe('DashboardHeroComponent when tested directly', () => { let heroEl: DebugElement; // #docregion setup, compile-components - // asynch beforeEach + // async beforeEach beforeEach( async(() => { TestBed.configureTestingModule({ declarations: [ DashboardHeroComponent ], From 3a78f6d8c69e99c5f694e9740759e18333170a50 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Wed, 5 Oct 2016 22:58:57 +0100 Subject: [PATCH 19/56] chore(docs): list minimum node as 4 (#2547) --- public/docs/ts/latest/quickstart.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/ts/latest/quickstart.jade b/public/docs/ts/latest/quickstart.jade index 4f4e4d1154..fdb581fb3f 100644 --- a/public/docs/ts/latest/quickstart.jade +++ b/public/docs/ts/latest/quickstart.jade @@ -59,7 +59,7 @@ h1 Prerequisite: Install #{_prereq} block setup-tooling :marked If Node.js and npm aren't already on your machine, install them. Our examples require node **v5.x.x** or higher and + target="_blank">install them. Our examples require node **v4.x.x** or higher and npm **3.x.x** or higher. To check which version you are using, run `node -v` and `npm -v` in a terminal window. From ff118810ff49d7e89e7a510c774dd59594ef846e Mon Sep 17 00:00:00 2001 From: Brandon Date: Wed, 5 Oct 2016 16:59:09 -0500 Subject: [PATCH 20/56] docs(router): Updated routing examples to use routing modules (#2478) Simplified routing in tutorial example Updated ngmodule guide and ngmodule faq with routing module prose --- .../{app.routing.ts => app-routing.module.ts} | 8 +- .../ts/app/app.module.ts | 4 +- .../ts/app/app-routing.module.ts | 11 + .../ts/app/app.module.ts | 4 +- .../ts/app/app.routing.ts | 10 - ...p.routing.3.ts => app-routing.module.3.ts} | 8 +- .../{app.routing.ts => app-routing.module.ts} | 8 +- .../_examples/ngmodule/ts/app/app.module.3.ts | 6 +- .../_examples/ngmodule/ts/app/app.module.ts | 10 +- .../app/contact/contact-routing.module.3.ts | 12 + .../ts/app/contact/contact-routing.module.ts | 14 + .../ts/app/contact/contact.module.3.ts | 4 +- .../ngmodule/ts/app/contact/contact.module.ts | 8 +- .../ts/app/contact/contact.routing.3.ts | 8 - .../ts/app/contact/contact.routing.ts | 10 - ...is.routing.ts => crisis-routing.module.ts} | 8 +- .../ngmodule/ts/app/crisis/crisis.module.ts | 6 +- ....routing.3.ts => hero-routing.module.3.ts} | 8 +- ...hero.routing.ts => hero-routing.module.ts} | 8 +- .../ngmodule/ts/app/hero/hero.module.3.ts | 4 +- .../ngmodule/ts/app/hero/hero.module.ts | 4 +- public/docs/_examples/ngmodule/ts/plnkr.json | 6 +- .../ngmodule/ts/pre-shared.3.plnkr.json | 6 +- .../ts/app/admin/admin-routing.module.1.ts | 37 ++ .../ts/app/admin/admin-routing.module.2.ts | 43 ++ .../ts/app/admin/admin-routing.module.3.ts | 41 ++ .../ts/app/admin/admin-routing.module.ts | 40 ++ .../router/ts/app/admin/admin.module.ts | 4 +- .../router/ts/app/admin/admin.routing.1.ts | 31 -- .../router/ts/app/admin/admin.routing.2.ts | 37 -- .../router/ts/app/admin/admin.routing.3.ts | 35 -- .../router/ts/app/admin/admin.routing.ts | 34 -- .../router/ts/app/app-routing.module.1.ts | 20 + .../router/ts/app/app-routing.module.2.ts | 18 + .../router/ts/app/app-routing.module.3.ts | 16 + .../router/ts/app/app-routing.module.4.ts | 21 + .../router/ts/app/app-routing.module.ts | 33 ++ .../_examples/router/ts/app/app.module.0.ts | 51 +++ .../_examples/router/ts/app/app.module.1.ts | 18 +- .../_examples/router/ts/app/app.module.2.ts | 15 +- .../_examples/router/ts/app/app.module.3.ts | 35 +- .../_examples/router/ts/app/app.module.4.ts | 31 +- .../_examples/router/ts/app/app.module.5.ts | 23 +- .../_examples/router/ts/app/app.module.6.ts | 28 ++ .../_examples/router/ts/app/app.module.7.ts | 32 ++ .../_examples/router/ts/app/app.module.ts | 10 +- .../_examples/router/ts/app/app.routing.5.ts | 32 +- .../_examples/router/ts/app/app.routing.6.ts | 42 +- .../_examples/router/ts/app/app.routing.ts | 40 -- .../crisis-center-routing.module.1.ts | 42 ++ .../crisis-center-routing.module.2.ts | 71 ++++ .../crisis-center-routing.module.3.ts | 50 +++ .../crisis-center-routing.module.ts | 60 +++ .../crisis-center/crisis-center.module.1.ts | 12 +- .../app/crisis-center/crisis-center.module.ts | 12 +- .../crisis-center/crisis-center.routing.1.ts | 37 -- .../crisis-center/crisis-center.routing.2.ts | 65 --- .../crisis-center/crisis-center.routing.3.ts | 44 --- .../crisis-center/crisis-center.routing.ts | 51 --- .../ts/app/heroes/heroes-routing.module.ts | 22 ++ .../router/ts/app/heroes/heroes.module.ts | 4 +- .../router/ts/app/heroes/heroes.routing.ts | 16 - .../router/ts/app/login-routing.module.ts | 22 ++ .../_examples/router/ts/app/login.routing.ts | 14 - ...hero.routing.ts => hero-routing.module.ts} | 8 +- .../testing/ts/app/hero/hero.module.ts | 4 +- .../_examples/toh-5/ts/app/app.module.2.ts | 48 +++ .../_examples/toh-5/ts/app/app.module.3.ts | 59 +++ .../docs/_examples/toh-5/ts/app/app.module.ts | 24 +- .../_examples/toh-5/ts/app/app.routing.1.ts | 17 - .../_examples/toh-5/ts/app/app.routing.ts | 43 -- .../docs/_examples/toh-6/ts/app/app.module.ts | 22 +- .../_examples/toh-6/ts/app/app.routing.ts | 29 -- public/docs/ts/_cache/tutorial/toh-pt5.jade | 20 +- public/docs/ts/_cache/tutorial/toh-pt6.jade | 2 +- .../docs/ts/latest/cookbook/ngmodule-faq.jade | 372 ++++++++++-------- public/docs/ts/latest/guide/ngmodule.jade | 352 +++++++++-------- public/docs/ts/latest/guide/router.jade | 302 +++++++------- public/docs/ts/latest/tutorial/_data.json | 2 +- public/docs/ts/latest/tutorial/toh-pt5.jade | 42 +- public/docs/ts/latest/tutorial/toh-pt6.jade | 8 +- 81 files changed, 1601 insertions(+), 1217 deletions(-) rename public/docs/_examples/cb-a1-a2-quick-reference/ts/app/{app.routing.ts => app-routing.module.ts} (63%) create mode 100644 public/docs/_examples/cb-dependency-injection/ts/app/app-routing.module.ts delete mode 100644 public/docs/_examples/cb-dependency-injection/ts/app/app.routing.ts rename public/docs/_examples/ngmodule/ts/app/{app.routing.3.ts => app-routing.module.3.ts} (65%) rename public/docs/_examples/ngmodule/ts/app/{app.routing.ts => app-routing.module.ts} (70%) create mode 100644 public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.3.ts create mode 100644 public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.ts delete mode 100644 public/docs/_examples/ngmodule/ts/app/contact/contact.routing.3.ts delete mode 100644 public/docs/_examples/ngmodule/ts/app/contact/contact.routing.ts rename public/docs/_examples/ngmodule/ts/app/crisis/{crisis.routing.ts => crisis-routing.module.ts} (69%) rename public/docs/_examples/ngmodule/ts/app/hero/{hero.routing.3.ts => hero-routing.module.3.ts} (73%) rename public/docs/_examples/ngmodule/ts/app/hero/{hero.routing.ts => hero-routing.module.ts} (73%) create mode 100644 public/docs/_examples/router/ts/app/admin/admin-routing.module.1.ts create mode 100644 public/docs/_examples/router/ts/app/admin/admin-routing.module.2.ts create mode 100644 public/docs/_examples/router/ts/app/admin/admin-routing.module.3.ts create mode 100644 public/docs/_examples/router/ts/app/admin/admin-routing.module.ts delete mode 100644 public/docs/_examples/router/ts/app/admin/admin.routing.1.ts delete mode 100644 public/docs/_examples/router/ts/app/admin/admin.routing.2.ts delete mode 100644 public/docs/_examples/router/ts/app/admin/admin.routing.3.ts delete mode 100644 public/docs/_examples/router/ts/app/admin/admin.routing.ts create mode 100644 public/docs/_examples/router/ts/app/app-routing.module.1.ts create mode 100644 public/docs/_examples/router/ts/app/app-routing.module.2.ts create mode 100644 public/docs/_examples/router/ts/app/app-routing.module.3.ts create mode 100644 public/docs/_examples/router/ts/app/app-routing.module.4.ts create mode 100644 public/docs/_examples/router/ts/app/app-routing.module.ts create mode 100644 public/docs/_examples/router/ts/app/app.module.0.ts create mode 100644 public/docs/_examples/router/ts/app/app.module.6.ts create mode 100644 public/docs/_examples/router/ts/app/app.module.7.ts delete mode 100644 public/docs/_examples/router/ts/app/app.routing.ts create mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.1.ts create mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.2.ts create mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.3.ts create mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.ts delete mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.1.ts delete mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.2.ts delete mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.3.ts delete mode 100644 public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.ts create mode 100644 public/docs/_examples/router/ts/app/heroes/heroes-routing.module.ts delete mode 100644 public/docs/_examples/router/ts/app/heroes/heroes.routing.ts create mode 100644 public/docs/_examples/router/ts/app/login-routing.module.ts delete mode 100644 public/docs/_examples/router/ts/app/login.routing.ts rename public/docs/_examples/testing/ts/app/hero/{hero.routing.ts => hero-routing.module.ts} (68%) create mode 100644 public/docs/_examples/toh-5/ts/app/app.module.2.ts create mode 100644 public/docs/_examples/toh-5/ts/app/app.module.3.ts delete mode 100644 public/docs/_examples/toh-5/ts/app/app.routing.1.ts delete mode 100644 public/docs/_examples/toh-5/ts/app/app.routing.ts delete mode 100644 public/docs/_examples/toh-6/ts/app/app.routing.ts diff --git a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.routing.ts b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app-routing.module.ts similarity index 63% rename from public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.routing.ts rename to public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app-routing.module.ts index fb042725eb..a7cbe8a74d 100644 --- a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.routing.ts +++ b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app-routing.module.ts @@ -1,5 +1,5 @@ // #docregion -import { ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { MovieListComponent } from './movie-list.component'; @@ -9,4 +9,8 @@ const routes: Routes = [ { path: 'movies', component: MovieListComponent } ]; -export const routing: ModuleWithProviders = RouterModule.forRoot(routes); +@NgModule({ + imports: [RouterModule.forRoot(routes)], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.module.ts b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.module.ts index dec4a4e223..1dc46ad17c 100644 --- a/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.module.ts +++ b/public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.module.ts @@ -5,13 +5,13 @@ import { FormsModule } from '@angular/forms'; import { AppComponent } from './app.component'; import { MovieListComponent } from './movie-list.component'; -import { routing } from './app.routing'; +import { AppRoutingModule } from './app-routing.module'; @NgModule({ imports: [ BrowserModule, FormsModule, - routing + AppRoutingModule ], declarations: [ AppComponent, diff --git a/public/docs/_examples/cb-dependency-injection/ts/app/app-routing.module.ts b/public/docs/_examples/cb-dependency-injection/ts/app/app-routing.module.ts new file mode 100644 index 0000000000..09a0592d00 --- /dev/null +++ b/public/docs/_examples/cb-dependency-injection/ts/app/app-routing.module.ts @@ -0,0 +1,11 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +const routes: Routes = []; + +@NgModule({ + imports: [RouterModule.forRoot(routes)], + providers: [], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/cb-dependency-injection/ts/app/app.module.ts b/public/docs/_examples/cb-dependency-injection/ts/app/app.module.ts index 5d7ca6ab97..a240e21f7c 100644 --- a/public/docs/_examples/cb-dependency-injection/ts/app/app.module.ts +++ b/public/docs/_examples/cb-dependency-injection/ts/app/app.module.ts @@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; import { HttpModule } from '@angular/http'; -/* import { routing } from './app.routing';*/ +// import { AppRoutingModule } from './app-routing.module'; import { LocationStrategy, HashLocationStrategy } from '@angular/common'; import { NgModule } from '@angular/core'; @@ -56,7 +56,7 @@ const c_components = [ FormsModule, HttpModule, InMemoryWebApiModule.forRoot(HeroData) - // routing TODO: add routes + // AppRoutingModule TODO: add routes ], declarations: [ declarations, diff --git a/public/docs/_examples/cb-dependency-injection/ts/app/app.routing.ts b/public/docs/_examples/cb-dependency-injection/ts/app/app.routing.ts deleted file mode 100644 index 2d3556371d..0000000000 --- a/public/docs/_examples/cb-dependency-injection/ts/app/app.routing.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -const routes: Routes = []; - -export const routing: ModuleWithProviders = RouterModule.forRoot(routes); - -export const appRoutingProviders: any[] = [ - -]; diff --git a/public/docs/_examples/ngmodule/ts/app/app.routing.3.ts b/public/docs/_examples/ngmodule/ts/app/app-routing.module.3.ts similarity index 65% rename from public/docs/_examples/ngmodule/ts/app/app.routing.3.ts rename to public/docs/_examples/ngmodule/ts/app/app-routing.module.3.ts index 9c9129023c..1d53b708f8 100644 --- a/public/docs/_examples/ngmodule/ts/app/app.routing.3.ts +++ b/public/docs/_examples/ngmodule/ts/app/app-routing.module.3.ts @@ -1,4 +1,4 @@ -import { ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; export const routes: Routes = [ @@ -7,4 +7,8 @@ export const routes: Routes = [ { path: 'heroes', loadChildren: 'app/hero/hero.module.3#HeroModule' } ]; -export const routing: ModuleWithProviders = RouterModule.forRoot(routes); +@NgModule({ + imports: [RouterModule.forRoot(routes)], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/ngmodule/ts/app/app.routing.ts b/public/docs/_examples/ngmodule/ts/app/app-routing.module.ts similarity index 70% rename from public/docs/_examples/ngmodule/ts/app/app.routing.ts rename to public/docs/_examples/ngmodule/ts/app/app-routing.module.ts index f34498c4e1..c753dcd488 100644 --- a/public/docs/_examples/ngmodule/ts/app/app.routing.ts +++ b/public/docs/_examples/ngmodule/ts/app/app-routing.module.ts @@ -1,5 +1,5 @@ // #docregion -import { ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; export const routes: Routes = [ @@ -11,5 +11,9 @@ export const routes: Routes = [ ]; // #docregion forRoot -export const routing: ModuleWithProviders = RouterModule.forRoot(routes); +@NgModule({ + imports: [RouterModule.forRoot(routes)], + exports: [RouterModule] +}) +export class AppRoutingModule {} // #enddocregion forRoot diff --git a/public/docs/_examples/ngmodule/ts/app/app.module.3.ts b/public/docs/_examples/ngmodule/ts/app/app.module.3.ts index 8920c00b61..8ca0a46d9a 100644 --- a/public/docs/_examples/ngmodule/ts/app/app.module.3.ts +++ b/public/docs/_examples/ngmodule/ts/app/app.module.3.ts @@ -11,14 +11,16 @@ import { UserService } from './user.service'; /* Feature Modules */ import { ContactModule } from './contact/contact.module.3'; -import { routing } from './app.routing.3'; + +/* Routing Module */ +import { AppRoutingModule } from './app-routing.module.3'; @NgModule({ // #docregion imports imports: [ BrowserModule, ContactModule, - routing + AppRoutingModule ], // #enddocregion imports providers: [ UserService ], diff --git a/public/docs/_examples/ngmodule/ts/app/app.module.ts b/public/docs/_examples/ngmodule/ts/app/app.module.ts index cccb49c981..549525df82 100644 --- a/public/docs/_examples/ngmodule/ts/app/app.module.ts +++ b/public/docs/_examples/ngmodule/ts/app/app.module.ts @@ -8,9 +8,11 @@ import { BrowserModule } from '@angular/platform-browser'; import { AppComponent } from './app.component'; /* Feature Modules */ -import { ContactModule } from './contact/contact.module'; -import { CoreModule } from './core/core.module'; -import { routing } from './app.routing'; +import { ContactModule } from './contact/contact.module'; +import { CoreModule } from './core/core.module'; + +/* Routing Module */ +import { AppRoutingModule } from './app-routing.module'; @NgModule({ // #docregion import-for-root @@ -29,7 +31,7 @@ import { routing } from './app.routing'; // #docregion CoreModule.forRoot({userName: 'Miss Marple'}), // #docregion v4 - routing + AppRoutingModule ], // #enddocregion import-for-root declarations: [ AppComponent ], diff --git a/public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.3.ts b/public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.3.ts new file mode 100644 index 0000000000..27dfc232b7 --- /dev/null +++ b/public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.3.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { ContactComponent } from './contact.component.3'; + +@NgModule({ + imports: [RouterModule.forChild([ + { path: 'contact', component: ContactComponent} + ])], + exports: [RouterModule] +}) +export class ContactRoutingModule {} diff --git a/public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.ts b/public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.ts new file mode 100644 index 0000000000..2fa81af5a9 --- /dev/null +++ b/public/docs/_examples/ngmodule/ts/app/contact/contact-routing.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { ContactComponent } from './contact.component'; + +// #docregion routing +@NgModule({ + imports: [RouterModule.forChild([ + { path: 'contact', component: ContactComponent } + ])], + exports: [RouterModule] +}) +export class ContactRoutingModule {} +// #enddocregion diff --git a/public/docs/_examples/ngmodule/ts/app/contact/contact.module.3.ts b/public/docs/_examples/ngmodule/ts/app/contact/contact.module.3.ts index 6f835635d0..ff70721b2f 100644 --- a/public/docs/_examples/ngmodule/ts/app/contact/contact.module.3.ts +++ b/public/docs/_examples/ngmodule/ts/app/contact/contact.module.3.ts @@ -9,11 +9,11 @@ import { ContactComponent } from './contact.component.3'; import { ContactService } from './contact.service'; import { HighlightDirective } from './highlight.directive'; -import { routing } from './contact.routing.3'; +import { ContactRoutingModule } from './contact-routing.module.3'; // #docregion class @NgModule({ - imports: [ CommonModule, FormsModule, routing ], + imports: [ CommonModule, FormsModule, ContactRoutingModule ], declarations: [ ContactComponent, HighlightDirective, AwesomePipe ], providers: [ ContactService ] }) diff --git a/public/docs/_examples/ngmodule/ts/app/contact/contact.module.ts b/public/docs/_examples/ngmodule/ts/app/contact/contact.module.ts index fe4f0981f9..9456de7654 100644 --- a/public/docs/_examples/ngmodule/ts/app/contact/contact.module.ts +++ b/public/docs/_examples/ngmodule/ts/app/contact/contact.module.ts @@ -2,13 +2,13 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../shared/shared.module'; -import { ContactComponent } from './contact.component'; -import { ContactService } from './contact.service'; -import { routing } from './contact.routing'; +import { ContactComponent } from './contact.component'; +import { ContactService } from './contact.service'; +import { ContactRoutingModule } from './contact-routing.module'; // #docregion class @NgModule({ - imports: [ SharedModule, routing ], + imports: [ SharedModule, ContactRoutingModule ], declarations: [ ContactComponent ], providers: [ ContactService ] }) diff --git a/public/docs/_examples/ngmodule/ts/app/contact/contact.routing.3.ts b/public/docs/_examples/ngmodule/ts/app/contact/contact.routing.3.ts deleted file mode 100644 index 63d740d82e..0000000000 --- a/public/docs/_examples/ngmodule/ts/app/contact/contact.routing.3.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { ContactComponent } from './contact.component.3'; - -export const routing: ModuleWithProviders = RouterModule.forChild([ - { path: 'contact', component: ContactComponent} -]); diff --git a/public/docs/_examples/ngmodule/ts/app/contact/contact.routing.ts b/public/docs/_examples/ngmodule/ts/app/contact/contact.routing.ts deleted file mode 100644 index 6b6534dfbc..0000000000 --- a/public/docs/_examples/ngmodule/ts/app/contact/contact.routing.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { ModuleWithProviders } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { ContactComponent } from './contact.component'; - -// #docregion routing -export const routing: ModuleWithProviders = RouterModule.forChild([ - { path: 'contact', component: ContactComponent} -]); -// #enddocregion diff --git a/public/docs/_examples/ngmodule/ts/app/crisis/crisis.routing.ts b/public/docs/_examples/ngmodule/ts/app/crisis/crisis-routing.module.ts similarity index 69% rename from public/docs/_examples/ngmodule/ts/app/crisis/crisis.routing.ts rename to public/docs/_examples/ngmodule/ts/app/crisis/crisis-routing.module.ts index 4d8d711d65..c60efa8cb4 100644 --- a/public/docs/_examples/ngmodule/ts/app/crisis/crisis.routing.ts +++ b/public/docs/_examples/ngmodule/ts/app/crisis/crisis-routing.module.ts @@ -1,4 +1,4 @@ -import { ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -11,4 +11,8 @@ const routes: Routes = [ { path: ':id', component: CrisisDetailComponent } ]; -export const routing: ModuleWithProviders = RouterModule.forChild(routes); +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class CrisisRoutingModule {} diff --git a/public/docs/_examples/ngmodule/ts/app/crisis/crisis.module.ts b/public/docs/_examples/ngmodule/ts/app/crisis/crisis.module.ts index 40491985dc..f557bd6423 100644 --- a/public/docs/_examples/ngmodule/ts/app/crisis/crisis.module.ts +++ b/public/docs/_examples/ngmodule/ts/app/crisis/crisis.module.ts @@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common'; import { CrisisListComponent } from './crisis-list.component'; import { CrisisDetailComponent } from './crisis-detail.component'; -import { CrisisService } from './crisis.service'; -import { routing } from './crisis.routing'; +import { CrisisService } from './crisis.service'; +import { CrisisRoutingModule } from './crisis-routing.module'; @NgModule({ - imports: [ CommonModule, routing ], + imports: [ CommonModule, CrisisRoutingModule ], declarations: [ CrisisDetailComponent, CrisisListComponent ], providers: [ CrisisService ] }) diff --git a/public/docs/_examples/ngmodule/ts/app/hero/hero.routing.3.ts b/public/docs/_examples/ngmodule/ts/app/hero/hero-routing.module.3.ts similarity index 73% rename from public/docs/_examples/ngmodule/ts/app/hero/hero.routing.3.ts rename to public/docs/_examples/ngmodule/ts/app/hero/hero-routing.module.3.ts index 132d21b29e..588ffd94be 100644 --- a/public/docs/_examples/ngmodule/ts/app/hero/hero.routing.3.ts +++ b/public/docs/_examples/ngmodule/ts/app/hero/hero-routing.module.3.ts @@ -1,4 +1,4 @@ -import { ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -16,4 +16,8 @@ const routes: Routes = [ } ]; -export const routing: ModuleWithProviders = RouterModule.forChild(routes); +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class HeroRoutingModule {} diff --git a/public/docs/_examples/ngmodule/ts/app/hero/hero.routing.ts b/public/docs/_examples/ngmodule/ts/app/hero/hero-routing.module.ts similarity index 73% rename from public/docs/_examples/ngmodule/ts/app/hero/hero.routing.ts rename to public/docs/_examples/ngmodule/ts/app/hero/hero-routing.module.ts index f1b4285ecd..d97aab3beb 100644 --- a/public/docs/_examples/ngmodule/ts/app/hero/hero.routing.ts +++ b/public/docs/_examples/ngmodule/ts/app/hero/hero-routing.module.ts @@ -1,4 +1,4 @@ -import { ModuleWithProviders } from '@angular/core'; +import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -16,4 +16,8 @@ const routes: Routes = [ } ]; -export const routing: ModuleWithProviders = RouterModule.forChild(routes); +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class HeroRoutingModule {} diff --git a/public/docs/_examples/ngmodule/ts/app/hero/hero.module.3.ts b/public/docs/_examples/ngmodule/ts/app/hero/hero.module.3.ts index 319af623bb..c00f4eedd5 100644 --- a/public/docs/_examples/ngmodule/ts/app/hero/hero.module.3.ts +++ b/public/docs/_examples/ngmodule/ts/app/hero/hero.module.3.ts @@ -6,11 +6,11 @@ import { HeroComponent } from './hero.component.3'; import { HeroDetailComponent } from './hero-detail.component'; import { HeroListComponent } from './hero-list.component'; import { HighlightDirective } from './highlight.directive'; -import { routing } from './hero.routing.3'; +import { HeroRoutingModule } from './hero-routing.module.3'; // #docregion class @NgModule({ - imports: [ CommonModule, FormsModule, routing ], + imports: [ CommonModule, FormsModule, HeroRoutingModule ], declarations: [ HeroComponent, HeroDetailComponent, HeroListComponent, HighlightDirective diff --git a/public/docs/_examples/ngmodule/ts/app/hero/hero.module.ts b/public/docs/_examples/ngmodule/ts/app/hero/hero.module.ts index 57159ed533..98d7b76b00 100644 --- a/public/docs/_examples/ngmodule/ts/app/hero/hero.module.ts +++ b/public/docs/_examples/ngmodule/ts/app/hero/hero.module.ts @@ -5,10 +5,10 @@ import { SharedModule } from '../shared/shared.module'; import { HeroComponent } from './hero.component'; import { HeroDetailComponent } from './hero-detail.component'; import { HeroListComponent } from './hero-list.component'; -import { routing } from './hero.routing'; +import { HeroRoutingModule } from './hero-routing.module'; @NgModule({ - imports: [ SharedModule, routing ], + imports: [ SharedModule, HeroRoutingModule ], declarations: [ HeroComponent, HeroDetailComponent, HeroListComponent, ] diff --git a/public/docs/_examples/ngmodule/ts/plnkr.json b/public/docs/_examples/ngmodule/ts/plnkr.json index fbc92ce13b..3f10b446f9 100644 --- a/public/docs/_examples/ngmodule/ts/plnkr.json +++ b/public/docs/_examples/ngmodule/ts/plnkr.json @@ -3,7 +3,7 @@ "files": [ "app/app.component.ts", "app/app.module.ts", - "app/app.routing.ts", + "app/app-routing.module.ts", "app/main.ts", "app/contact/contact.component.css", @@ -12,7 +12,7 @@ "app/contact/contact.component.ts", "app/contact/contact.module.ts", - "app/contact/contact.routing.ts", + "app/contact/contact-routing.module.ts", "app/crisis/*.ts", @@ -22,7 +22,7 @@ "app/hero/hero.component.ts", "app/hero/hero.module.ts", - "app/hero/hero.routing.ts", + "app/hero/hero-routing.module.ts", "app/core/*.css", "app/core/*.html", diff --git a/public/docs/_examples/ngmodule/ts/pre-shared.3.plnkr.json b/public/docs/_examples/ngmodule/ts/pre-shared.3.plnkr.json index 6a7b39e2a2..de789b4a58 100644 --- a/public/docs/_examples/ngmodule/ts/pre-shared.3.plnkr.json +++ b/public/docs/_examples/ngmodule/ts/pre-shared.3.plnkr.json @@ -3,7 +3,7 @@ "files": [ "app/app.component.3.ts", "app/app.module.3.ts", - "app/app.routing.3.ts", + "app/app-routing.module.3.ts", "app/main.3.ts", "app/highlight.directive.ts", @@ -18,7 +18,7 @@ "app/contact/awesome.pipe.ts", "app/contact/contact.component.3.ts", "app/contact/contact.module.3.ts", - "app/contact/contact.routing.3.ts", + "app/contact/contact-routing.module.3.ts", "app/contact/highlight.directive.ts", "app/crisis/*.ts", @@ -29,7 +29,7 @@ "app/hero/hero.component.3.ts", "app/hero/hero.module.3.ts", - "app/hero/hero.routing.3.ts", + "app/hero/hero-routing.module.3.ts", "app/hero/highlight.directive.ts", "styles.css", diff --git a/public/docs/_examples/router/ts/app/admin/admin-routing.module.1.ts b/public/docs/_examples/router/ts/app/admin/admin-routing.module.1.ts new file mode 100644 index 0000000000..0cb1d8f5c7 --- /dev/null +++ b/public/docs/_examples/router/ts/app/admin/admin-routing.module.1.ts @@ -0,0 +1,37 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { AdminComponent } from './admin.component'; +import { AdminDashboardComponent } from './admin-dashboard.component'; +import { ManageCrisesComponent } from './manage-crises.component'; +import { ManageHeroesComponent } from './manage-heroes.component'; + +// #docregion admin-routes +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: 'admin', + component: AdminComponent, + children: [ + { + path: '', + children: [ + { path: 'crises', component: ManageCrisesComponent }, + { path: 'heroes', component: ManageHeroesComponent }, + { path: '', component: AdminDashboardComponent } + ] + } + ] + } + ]) + ], + exports: [ + RouterModule + ] +}) +export class AdminRoutingModule {} +// #enddocregion admin-routes +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/admin/admin-routing.module.2.ts b/public/docs/_examples/router/ts/app/admin/admin-routing.module.2.ts new file mode 100644 index 0000000000..2087d7c913 --- /dev/null +++ b/public/docs/_examples/router/ts/app/admin/admin-routing.module.2.ts @@ -0,0 +1,43 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { AdminComponent } from './admin.component'; +import { AdminDashboardComponent } from './admin-dashboard.component'; +import { ManageCrisesComponent } from './manage-crises.component'; +import { ManageHeroesComponent } from './manage-heroes.component'; + +// #docregion admin-route, can-activate-child +import { AuthGuard } from '../auth-guard.service'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: 'admin', + component: AdminComponent, + canActivate: [AuthGuard], + children: [ + { + path: '', + children: [ + { path: 'crises', component: ManageCrisesComponent }, + { path: 'heroes', component: ManageHeroesComponent }, + { path: '', component: AdminDashboardComponent } + ], + // #enddocregion admin-route + // #docregion can-activate-child + canActivateChild: [AuthGuard] + // #docregion admin-route + } + ] + } + ]) + ], + exports: [ + RouterModule + ] +}) +export class AdminRoutingModule {} +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/admin/admin-routing.module.3.ts b/public/docs/_examples/router/ts/app/admin/admin-routing.module.3.ts new file mode 100644 index 0000000000..92878febb2 --- /dev/null +++ b/public/docs/_examples/router/ts/app/admin/admin-routing.module.3.ts @@ -0,0 +1,41 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { AdminComponent } from './admin.component'; +import { AdminDashboardComponent } from './admin-dashboard.component'; +import { ManageCrisesComponent } from './manage-crises.component'; +import { ManageHeroesComponent } from './manage-heroes.component'; + +// #docregion admin-route +import { AuthGuard } from '../auth-guard.service'; + +// #docregion can-activate-child +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: 'admin', + component: AdminComponent, + canActivate: [AuthGuard], + children: [ + { + path: '', + canActivateChild: [AuthGuard], + children: [ + { path: 'crises', component: ManageCrisesComponent }, + { path: 'heroes', component: ManageHeroesComponent }, + { path: '', component: AdminDashboardComponent } + ] + } + ] + } + ]) + ], + exports: [ + RouterModule + ] +}) +export class AdminRoutingModule {} +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/admin/admin-routing.module.ts b/public/docs/_examples/router/ts/app/admin/admin-routing.module.ts new file mode 100644 index 0000000000..b83a75945b --- /dev/null +++ b/public/docs/_examples/router/ts/app/admin/admin-routing.module.ts @@ -0,0 +1,40 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { AdminComponent } from './admin.component'; +import { AdminDashboardComponent } from './admin-dashboard.component'; +import { ManageCrisesComponent } from './manage-crises.component'; +import { ManageHeroesComponent } from './manage-heroes.component'; + +// #docregion admin-route +import { AuthGuard } from '../auth-guard.service'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + component: AdminComponent, + canActivate: [AuthGuard], + children: [ + { + path: '', + canActivateChild: [AuthGuard], + children: [ + { path: 'crises', component: ManageCrisesComponent }, + { path: 'heroes', component: ManageHeroesComponent }, + { path: '', component: AdminDashboardComponent } + ] + } + ] + } + ]) + ], + exports: [ + RouterModule + ] +}) +export class AdminRoutingModule {} +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/admin/admin.module.ts b/public/docs/_examples/router/ts/app/admin/admin.module.ts index dce2ce30e2..eb4cfdb0da 100644 --- a/public/docs/_examples/router/ts/app/admin/admin.module.ts +++ b/public/docs/_examples/router/ts/app/admin/admin.module.ts @@ -8,12 +8,12 @@ import { AdminDashboardComponent } from './admin-dashboard.component'; import { ManageCrisesComponent } from './manage-crises.component'; import { ManageHeroesComponent } from './manage-heroes.component'; -import { adminRouting } from './admin.routing'; +import { AdminRoutingModule } from './admin-routing.module'; @NgModule({ imports: [ CommonModule, - adminRouting + AdminRoutingModule ], declarations: [ AdminComponent, diff --git a/public/docs/_examples/router/ts/app/admin/admin.routing.1.ts b/public/docs/_examples/router/ts/app/admin/admin.routing.1.ts deleted file mode 100644 index a620f3ba51..0000000000 --- a/public/docs/_examples/router/ts/app/admin/admin.routing.1.ts +++ /dev/null @@ -1,31 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AdminComponent } from './admin.component'; -import { AdminDashboardComponent } from './admin-dashboard.component'; -import { ManageCrisesComponent } from './manage-crises.component'; -import { ManageHeroesComponent } from './manage-heroes.component'; - -// #docregion admin-routes -const adminRoutes: Routes = [ - { - path: 'admin', - component: AdminComponent, - children: [ - { - path: '', - children: [ - { path: 'crises', component: ManageCrisesComponent }, - { path: 'heroes', component: ManageHeroesComponent }, - { path: '', component: AdminDashboardComponent } - ] - } - ] - } -]; - -export const adminRouting: ModuleWithProviders = RouterModule.forChild(adminRoutes); -// #enddocregion admin-routes -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/admin/admin.routing.2.ts b/public/docs/_examples/router/ts/app/admin/admin.routing.2.ts deleted file mode 100644 index 9fa3f10e4a..0000000000 --- a/public/docs/_examples/router/ts/app/admin/admin.routing.2.ts +++ /dev/null @@ -1,37 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AdminComponent } from './admin.component'; -import { AdminDashboardComponent } from './admin-dashboard.component'; -import { ManageCrisesComponent } from './manage-crises.component'; -import { ManageHeroesComponent } from './manage-heroes.component'; - -// #docregion admin-route, can-activate-child -import { AuthGuard } from '../auth-guard.service'; - -const adminRoutes: Routes = [ - { - path: 'admin', - component: AdminComponent, - canActivate: [AuthGuard], - children: [ - { - path: '', - children: [ - { path: 'crises', component: ManageCrisesComponent }, - { path: 'heroes', component: ManageHeroesComponent }, - { path: '', component: AdminDashboardComponent } - ], - // #enddocregion admin-route - // #docregion can-activate-child - canActivateChild: [AuthGuard] - // #docregion admin-route - } - ] - } -]; - -export const adminRouting: ModuleWithProviders = RouterModule.forChild(adminRoutes); -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/admin/admin.routing.3.ts b/public/docs/_examples/router/ts/app/admin/admin.routing.3.ts deleted file mode 100644 index 3b4051a819..0000000000 --- a/public/docs/_examples/router/ts/app/admin/admin.routing.3.ts +++ /dev/null @@ -1,35 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AdminComponent } from './admin.component'; -import { AdminDashboardComponent } from './admin-dashboard.component'; -import { ManageCrisesComponent } from './manage-crises.component'; -import { ManageHeroesComponent } from './manage-heroes.component'; - -// #docregion admin-route -import { AuthGuard } from '../auth-guard.service'; - -// #docregion can-activate-child -const adminRoutes: Routes = [ - { - path: 'admin', - component: AdminComponent, - canActivate: [AuthGuard], - children: [ - { - path: '', - canActivateChild: [AuthGuard], - children: [ - { path: 'crises', component: ManageCrisesComponent }, - { path: 'heroes', component: ManageHeroesComponent }, - { path: '', component: AdminDashboardComponent } - ] - } - ] - } -]; - -export const adminRouting: ModuleWithProviders = RouterModule.forChild(adminRoutes); -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/admin/admin.routing.ts b/public/docs/_examples/router/ts/app/admin/admin.routing.ts deleted file mode 100644 index bc5d13554c..0000000000 --- a/public/docs/_examples/router/ts/app/admin/admin.routing.ts +++ /dev/null @@ -1,34 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AdminComponent } from './admin.component'; -import { AdminDashboardComponent } from './admin-dashboard.component'; -import { ManageCrisesComponent } from './manage-crises.component'; -import { ManageHeroesComponent } from './manage-heroes.component'; - -// #docregion admin-route -import { AuthGuard } from '../auth-guard.service'; - -const adminRoutes: Routes = [ - { - path: '', - component: AdminComponent, - canActivate: [AuthGuard], - children: [ - { - path: '', - canActivateChild: [AuthGuard], - children: [ - { path: 'crises', component: ManageCrisesComponent }, - { path: 'heroes', component: ManageHeroesComponent }, - { path: '', component: AdminDashboardComponent } - ] - } - ] - } -]; - -export const adminRouting: ModuleWithProviders = RouterModule.forChild(adminRoutes); -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/app-routing.module.1.ts b/public/docs/_examples/router/ts/app/app-routing.module.1.ts new file mode 100644 index 0000000000..8be1df9926 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app-routing.module.1.ts @@ -0,0 +1,20 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { CrisisListComponent } from './crisis-list.component'; +import { HeroListComponent } from './hero-list.component'; + +@NgModule({ + imports: [ + RouterModule.forRoot([ + { path: 'crisis-center', component: CrisisListComponent }, + { path: 'heroes', component: HeroListComponent } + ]) + ], + exports: [ + RouterModule + ] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/router/ts/app/app-routing.module.2.ts b/public/docs/_examples/router/ts/app/app-routing.module.2.ts new file mode 100644 index 0000000000..eed5688574 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app-routing.module.2.ts @@ -0,0 +1,18 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { CrisisListComponent } from './crisis-list.component'; + +@NgModule({ + imports: [ + RouterModule.forRoot([ + { path: 'crisis-center', component: CrisisListComponent }, + ]) + ], + exports: [ + RouterModule + ] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/router/ts/app/app-routing.module.3.ts b/public/docs/_examples/router/ts/app/app-routing.module.3.ts new file mode 100644 index 0000000000..a30d061dc3 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app-routing.module.3.ts @@ -0,0 +1,16 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +@NgModule({ + imports: [ + RouterModule.forRoot([ + + ]) + ], + exports: [ + RouterModule + ] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/router/ts/app/app-routing.module.4.ts b/public/docs/_examples/router/ts/app/app-routing.module.4.ts new file mode 100644 index 0000000000..2ce11b8105 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app-routing.module.4.ts @@ -0,0 +1,21 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { CanDeactivateGuard } from './can-deactivate-guard.service'; + +@NgModule({ + imports: [ + RouterModule.forRoot([ + + ]) + ], + exports: [ + RouterModule + ], + providers: [ + CanDeactivateGuard + ] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/router/ts/app/app-routing.module.ts b/public/docs/_examples/router/ts/app/app-routing.module.ts new file mode 100644 index 0000000000..6e35f64f73 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app-routing.module.ts @@ -0,0 +1,33 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +// #docregion import-router +import { RouterModule } from '@angular/router'; +// #enddocregion import-router + +import { CanDeactivateGuard } from './can-deactivate-guard.service'; +// #docregion can-load-guard +import { AuthGuard } from './auth-guard.service'; +// #enddocregion can-load-guard + +// #docregion lazy-load-admin, can-load-guard +@NgModule({ + imports: [ + RouterModule.forRoot([ + { + path: 'admin', + loadChildren: 'app/admin/admin.module#AdminModule', + // #enddocregion lazy-load-admin + canLoad: [AuthGuard] + // #docregion lazy-load-admin + } + ]) + ], + exports: [ + RouterModule + ], + providers: [ + CanDeactivateGuard + ] +}) +export class AppRoutingModule {} diff --git a/public/docs/_examples/router/ts/app/app.module.0.ts b/public/docs/_examples/router/ts/app/app.module.0.ts new file mode 100644 index 0000000000..df91982cd1 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app.module.0.ts @@ -0,0 +1,51 @@ +// #docplaster +// #docregion +// #docregion router-basics +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; + +import { AppComponent } from './app.component'; +import { HeroListComponent } from './hero-list.component'; +import { CrisisListComponent } from './crisis-list.component'; +import { PageNotFoundComponent } from './not-found.component'; +import { PageNotFoundComponent as HeroDetailComponent } from './not-found.component'; +import { PageNotFoundComponent as HomeComponent } from './not-found.component'; + +// #docregion route-config +@NgModule({ + imports: [ + BrowserModule, + FormsModule, + RouterModule.forRoot([ + // #docregion route-defs + // #docregion hero-detail-route + { path: 'hero/:id', component: HeroDetailComponent }, + // #enddocregion hero-detail-route + { path: 'crisis-center', component: CrisisListComponent }, + { + path: 'heroes', + component: HeroListComponent, + data: { + title: 'Heroes List' + } + }, + { path: '', component: HomeComponent }, + // #enddocregion route-defs + { path: '**', component: PageNotFoundComponent } + ]) + ], + declarations: [ + AppComponent, + HeroListComponent, + HeroDetailComponent, + CrisisListComponent, + PageNotFoundComponent + ], + bootstrap: [ AppComponent ] +}) +// #enddocregion router-basics +export class AppModule { +} +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/app.module.1.ts b/public/docs/_examples/router/ts/app/app.module.1.ts index ea1edc36af..6338c9bca3 100644 --- a/public/docs/_examples/router/ts/app/app.module.1.ts +++ b/public/docs/_examples/router/ts/app/app.module.1.ts @@ -3,29 +3,31 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; +// #docregion import-router, route-config +import { RouterModule } from '@angular/router'; +// #enddocregion import-router, route-config // #docregion router-basics import { AppComponent } from './app.component'; -import { routing, - appRoutingProviders } from './app.routing'; - -import { HeroListComponent } from './hero-list.component'; import { CrisisListComponent } from './crisis-list.component'; +import { HeroListComponent } from './hero-list.component'; @NgModule({ imports: [ BrowserModule, FormsModule, - routing + // #docregion route-config + RouterModule.forRoot([ + { path: 'crisis-center', component: CrisisListComponent }, + { path: 'heroes', component: HeroListComponent } + ]) + // #enddocregion route-config ], declarations: [ AppComponent, HeroListComponent, CrisisListComponent ], - providers: [ - appRoutingProviders - ], bootstrap: [ AppComponent ] }) // #enddocregion router-basics diff --git a/public/docs/_examples/router/ts/app/app.module.2.ts b/public/docs/_examples/router/ts/app/app.module.2.ts index 3e1d42896c..2d82802253 100644 --- a/public/docs/_examples/router/ts/app/app.module.2.ts +++ b/public/docs/_examples/router/ts/app/app.module.2.ts @@ -5,28 +5,23 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; -import { AppComponent } from './app.component'; -import { routing, - appRoutingProviders } from './app.routing'; - -import { HeroesModule } from './heroes/heroes.module'; +import { AppComponent } from './app.component'; +import { AppRoutingModule } from './app-routing.module'; import { CrisisListComponent } from './crisis-list.component'; +import { HeroListComponent } from './hero-list.component'; @NgModule({ imports: [ BrowserModule, FormsModule, - routing, - HeroesModule + AppRoutingModule ], declarations: [ AppComponent, + HeroListComponent, CrisisListComponent ], - providers: [ - appRoutingProviders - ], bootstrap: [ AppComponent ] }) // #enddocregion hero-import diff --git a/public/docs/_examples/router/ts/app/app.module.3.ts b/public/docs/_examples/router/ts/app/app.module.3.ts index 6ddd73ac3e..f7aeccae34 100644 --- a/public/docs/_examples/router/ts/app/app.module.3.ts +++ b/public/docs/_examples/router/ts/app/app.module.3.ts @@ -1,44 +1,31 @@ // #docplaster // #docregion -// #docregion crisis-center-module, admin-module +// #docregion hero-import import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; -import { AppComponent } from './app.component'; -import { routing, - appRoutingProviders } from './app.routing'; +import { AppComponent } from './app.component'; +import { AppRoutingModule } from './app-routing.module'; -import { HeroesModule } from './heroes/heroes.module'; -// #docregion crisis-center-module -import { CrisisCenterModule } from './crisis-center/crisis-center.module'; -// #enddocregion crisis-center-module -// #docregion admin-module -import { AdminModule } from './admin/admin.module'; -// #docregion crisis-center-module +import { HeroesModule } from './heroes/heroes.module'; -import { DialogService } from './dialog.service'; +import { CrisisListComponent } from './crisis-list.component'; @NgModule({ imports: [ - CommonModule, + BrowserModule, FormsModule, - routing, HeroesModule, - CrisisCenterModule, -// #enddocregion crisis-center-module - AdminModule -// #docregion crisis-center-module + AppRoutingModule ], declarations: [ - AppComponent - ], - providers: [ - appRoutingProviders, - DialogService + AppComponent, + CrisisListComponent ], bootstrap: [ AppComponent ] }) +// #enddocregion hero-import export class AppModule { } // #enddocregion diff --git a/public/docs/_examples/router/ts/app/app.module.4.ts b/public/docs/_examples/router/ts/app/app.module.4.ts index 840ea422db..f30dfccd00 100644 --- a/public/docs/_examples/router/ts/app/app.module.4.ts +++ b/public/docs/_examples/router/ts/app/app.module.4.ts @@ -1,33 +1,42 @@ +// #docplaster // #docregion +// #docregion crisis-center-module, admin-module import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; +import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { AppComponent } from './app.component'; -import { routing, - appRoutingProviders } from './app.routing'; +import { AppComponent } from './app.component'; +import { AppRoutingModule } from './app-routing.module'; -import { HeroesModule } from './heroes/heroes.module'; -import { CrisisCenterModule } from './crisis-center/crisis-center.module'; +import { HeroesModule } from './heroes/heroes.module'; +// #docregion crisis-center-module +import { CrisisCenterModule } from './crisis-center/crisis-center.module'; +// #enddocregion crisis-center-module +// #docregion admin-module +import { AdminModule } from './admin/admin.module'; +// #docregion crisis-center-module -import { DialogService } from './dialog.service'; +import { DialogService } from './dialog.service'; @NgModule({ imports: [ - BrowserModule, + CommonModule, FormsModule, - routing, HeroesModule, - CrisisCenterModule + CrisisCenterModule, +// #enddocregion crisis-center-module + AdminModule, +// #docregion crisis-center-module + AppRoutingModule ], declarations: [ AppComponent ], providers: [ - appRoutingProviders, DialogService ], bootstrap: [ AppComponent ] }) export class AppModule { } +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/app.module.5.ts b/public/docs/_examples/router/ts/app/app.module.5.ts index b1ba4bd231..119d583578 100644 --- a/public/docs/_examples/router/ts/app/app.module.5.ts +++ b/public/docs/_examples/router/ts/app/app.module.5.ts @@ -1,26 +1,31 @@ // #docregion -import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { FormsModule } from '@angular/forms'; -import { Routes, RouterModule } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; -import { AppComponent } from './app.component'; +import { AppComponent } from './app.component'; +import { AppRoutingModule } from './app-routing.module'; -const routes: Routes = [ +import { HeroesModule } from './heroes/heroes.module'; +import { CrisisCenterModule } from './crisis-center/crisis-center.module'; +import { AdminModule } from './admin/admin.module'; -]; +import { DialogService } from './dialog.service'; @NgModule({ imports: [ BrowserModule, FormsModule, - RouterModule.forRoot(routes, { useHash: true }) // .../#/crisis-center/ + HeroesModule, + CrisisCenterModule, + AdminModule, + AppRoutingModule ], declarations: [ AppComponent ], providers: [ - + DialogService ], bootstrap: [ AppComponent ] }) diff --git a/public/docs/_examples/router/ts/app/app.module.6.ts b/public/docs/_examples/router/ts/app/app.module.6.ts new file mode 100644 index 0000000000..b1ba4bd231 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app.module.6.ts @@ -0,0 +1,28 @@ +// #docregion +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; +import { Routes, RouterModule } from '@angular/router'; + +import { AppComponent } from './app.component'; + +const routes: Routes = [ + +]; + +@NgModule({ + imports: [ + BrowserModule, + FormsModule, + RouterModule.forRoot(routes, { useHash: true }) // .../#/crisis-center/ + ], + declarations: [ + AppComponent + ], + providers: [ + + ], + bootstrap: [ AppComponent ] +}) +export class AppModule { +} diff --git a/public/docs/_examples/router/ts/app/app.module.7.ts b/public/docs/_examples/router/ts/app/app.module.7.ts new file mode 100644 index 0000000000..03f13cc432 --- /dev/null +++ b/public/docs/_examples/router/ts/app/app.module.7.ts @@ -0,0 +1,32 @@ +// #docregion +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; + +import { AppComponent } from './app.component'; +import { AppRoutingModule } from './app-routing.module'; + +import { HeroesModule } from './heroes/heroes.module'; +import { CrisisCenterModule } from './crisis-center/crisis-center.module'; +import { LoginRoutingModule } from './login-routing.module'; +import { DialogService } from './dialog.service'; + +@NgModule({ + imports: [ + BrowserModule, + FormsModule, + HeroesModule, + CrisisCenterModule, + LoginRoutingModule, + AppRoutingModule + ], + declarations: [ + AppComponent + ], + providers: [ + DialogService + ], + bootstrap: [ AppComponent ] +}) +export class AppModule { +} diff --git a/public/docs/_examples/router/ts/app/app.module.ts b/public/docs/_examples/router/ts/app/app.module.ts index 87c031e2bb..e9b4726c74 100644 --- a/public/docs/_examples/router/ts/app/app.module.ts +++ b/public/docs/_examples/router/ts/app/app.module.ts @@ -4,8 +4,8 @@ import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; import { AppComponent } from './app.component'; -import { routing, - appRoutingProviders } from './app.routing'; +import { AppRoutingModule } from './app-routing.module'; +import { LoginRoutingModule } from './login-routing.module'; import { HeroesModule } from './heroes/heroes.module'; import { CrisisCenterModule } from './crisis-center/crisis-center.module'; @@ -18,16 +18,16 @@ import { DialogService } from './dialog.service'; imports: [ BrowserModule, FormsModule, - routing, HeroesModule, - CrisisCenterModule + CrisisCenterModule, + LoginRoutingModule, + AppRoutingModule ], declarations: [ AppComponent, LoginComponent ], providers: [ - appRoutingProviders, DialogService ], bootstrap: [ AppComponent ] diff --git a/public/docs/_examples/router/ts/app/app.routing.5.ts b/public/docs/_examples/router/ts/app/app.routing.5.ts index ce153c7b1f..8ce3e0a10f 100644 --- a/public/docs/_examples/router/ts/app/app.routing.5.ts +++ b/public/docs/_examples/router/ts/app/app.routing.5.ts @@ -1,16 +1,16 @@ -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { loginRoutes, - authProviders } from './login.routing'; - -const appRoutes: Routes = [ - ...loginRoutes -]; - -export const appRoutingProviders: any[] = [ - authProviders -]; - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); +// // #docregion +// import { ModuleWithProviders } from '@angular/core'; +// import { Routes, RouterModule } from '@angular/router'; +// +// import { loginRoutes, +// authProviders } from './login.routing'; +// +// const appRoutes: Routes = [ +// ...loginRoutes +// ]; +// +// export const appRoutingProviders: any[] = [ +// authProviders +// ]; +// +// export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/public/docs/_examples/router/ts/app/app.routing.6.ts b/public/docs/_examples/router/ts/app/app.routing.6.ts index 8dc92f9dc4..23e2897cf1 100644 --- a/public/docs/_examples/router/ts/app/app.routing.6.ts +++ b/public/docs/_examples/router/ts/app/app.routing.6.ts @@ -1,21 +1,21 @@ -// #docregion -import { ModuleWithProviders } from '@angular/core'; -// #docregion import-router -import { Routes, RouterModule } from '@angular/router'; -// #enddocregion import-router - -import { loginRoutes, - authProviders } from './login.routing'; - -import { CanDeactivateGuard } from './can-deactivate-guard.service'; - -const appRoutes: Routes = [ - ...loginRoutes -]; - -export const appRoutingProviders: any[] = [ - authProviders, - CanDeactivateGuard -]; - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); +// // #docregion +// import { ModuleWithProviders } from '@angular/core'; +// // #docregion import-router +// import { Routes, RouterModule } from '@angular/router'; +// // #enddocregion import-router +// +// import { loginRoutes, +// authProviders } from './login.routing'; +// +// import { CanDeactivateGuard } from './can-deactivate-guard.service'; +// +// const appRoutes: Routes = [ +// ...loginRoutes +// ]; +// +// export const appRoutingProviders: any[] = [ +// authProviders, +// CanDeactivateGuard +// ]; +// +// export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/public/docs/_examples/router/ts/app/app.routing.ts b/public/docs/_examples/router/ts/app/app.routing.ts deleted file mode 100644 index cd00b9bf0c..0000000000 --- a/public/docs/_examples/router/ts/app/app.routing.ts +++ /dev/null @@ -1,40 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -// #docregion import-router -import { Routes, RouterModule } from '@angular/router'; -// #enddocregion import-router - -import { loginRoutes, - authProviders } from './login.routing'; - -import { CanDeactivateGuard } from './can-deactivate-guard.service'; -// #docregion can-load-guard -import { AuthGuard } from './auth-guard.service'; -// #enddocregion can-load-guard - -// #docregion lazy-load-admin, can-load-guard - -const adminRoutes: Routes = [ - { - path: 'admin', - loadChildren: 'app/admin/admin.module#AdminModule', -// #enddocregion lazy-load-admin - canLoad: [AuthGuard] -// #docregion lazy-load-admin - } -]; -// #enddocregion can-load-guard - -const appRoutes: Routes = [ - ...loginRoutes, - ...adminRoutes -]; -// #enddocregion lazy-load-admin - -export const appRoutingProviders: any[] = [ - authProviders, - CanDeactivateGuard -]; - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.1.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.1.ts new file mode 100644 index 0000000000..829175cea6 --- /dev/null +++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.1.ts @@ -0,0 +1,42 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { CrisisCenterHomeComponent } from './crisis-center-home.component'; +import { CrisisListComponent } from './crisis-list.component'; +import { CrisisCenterComponent } from './crisis-center.component'; +import { CrisisDetailComponent } from './crisis-detail.component'; + +// #docregion routes +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: 'crisis-center', + component: CrisisCenterComponent, + children: [ + { + path: '', + component: CrisisListComponent, + children: [ + { + path: ':id', + component: CrisisDetailComponent + }, + { + path: '', + component: CrisisCenterHomeComponent + } + ] + } + ] + } + ]) + ], + exports: [ + RouterModule + ] +}) +export class CrisisCenterRoutingModule { } +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.2.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.2.ts new file mode 100644 index 0000000000..9c782edc0e --- /dev/null +++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.2.ts @@ -0,0 +1,71 @@ +// #docplaster +// #docregion routes +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { CrisisCenterHomeComponent } from './crisis-center-home.component'; +import { CrisisListComponent } from './crisis-list.component'; +import { CrisisCenterComponent } from './crisis-center.component'; +import { CrisisDetailComponent } from './crisis-detail.component'; +// #enddocregion routes + +// #docregion can-deactivate-guard +import { CanDeactivateGuard } from '../can-deactivate-guard.service'; +// #enddocregion can-deactivate-guard +// #docregion crisis-detail-resolve +import { CrisisDetailResolve } from './crisis-detail-resolve.service'; + +// #enddocregion crisis-detail-resolve +// #docregion routes + +@NgModule({ + imports: [ + RouterModule.forChild([ + // #enddocregion routes + // #docregion redirect, routes + { + path: '', + redirectTo: '/crisis-center', + pathMatch: 'full' + }, + // #enddocregion redirect, routes + // #docregion routes + { + path: 'crisis-center', + component: CrisisCenterComponent, + children: [ + { + path: '', + component: CrisisListComponent, + children: [ + { + path: ':id', + component: CrisisDetailComponent, + // #enddocregion routes + // #docregion can-deactivate-guard + canDeactivate: [CanDeactivateGuard], + // #enddocregion can-deactivate-guard + // #docregion crisis-detail-resolve + resolve: { + crisis: CrisisDetailResolve + } + // #enddocregion crisis-detail-resolve + // #docregion routes + }, + { + path: '', + component: CrisisCenterHomeComponent + } + ] + } + ] + } + // #docregion routes + ]) + ], + exports: [ + RouterModule + ] +}) +export class CrisisCenterRoutingModule { } +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.3.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.3.ts new file mode 100644 index 0000000000..693a72f8c2 --- /dev/null +++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.3.ts @@ -0,0 +1,50 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { CrisisCenterHomeComponent } from './crisis-center-home.component'; +import { CrisisListComponent } from './crisis-list.component'; +import { CrisisCenterComponent } from './crisis-center.component'; +import { CrisisDetailComponent } from './crisis-detail.component'; + +// #docregion can-deactivate-guard +import { CanDeactivateGuard } from '../can-deactivate-guard.service'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + redirectTo: '/crisis-center', + pathMatch: 'full' + }, + { + path: 'crisis-center', + component: CrisisCenterComponent, + children: [ + { + path: '', + component: CrisisListComponent, + children: [ + { + path: ':id', + component: CrisisDetailComponent, + canDeactivate: [CanDeactivateGuard] + }, + { + path: '', + component: CrisisCenterHomeComponent + } + ] + } + ] + } + ]) + ], + exports: [ + RouterModule + ] +}) +export class CrisisCenterRoutingModule { } +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.ts new file mode 100644 index 0000000000..17843ace3e --- /dev/null +++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-center-routing.module.ts @@ -0,0 +1,60 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { CrisisCenterHomeComponent } from './crisis-center-home.component'; +import { CrisisListComponent } from './crisis-list.component'; +import { CrisisCenterComponent } from './crisis-center.component'; +import { CrisisDetailComponent } from './crisis-detail.component'; + +import { CanDeactivateGuard } from '../can-deactivate-guard.service'; + +// #docregion crisis-detail-resolve +import { CrisisDetailResolve } from './crisis-detail-resolve.service'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + // #docregion redirect + { + path: '', + redirectTo: '/crisis-center', + pathMatch: 'full' + }, + // #enddocregion redirect + { + path: 'crisis-center', + component: CrisisCenterComponent, + children: [ + { + path: '', + component: CrisisListComponent, + children: [ + { + path: ':id', + component: CrisisDetailComponent, + canDeactivate: [CanDeactivateGuard], + resolve: { + crisis: CrisisDetailResolve + } + }, + { + path: '', + component: CrisisCenterHomeComponent + } + ] + } + ] + } + ]) + ], + exports: [ + RouterModule + ], + providers: [ + CrisisDetailResolve + ] +}) +export class CrisisCenterRoutingModule { } +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.1.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.1.ts index ab29a0ba22..5a3e45f58f 100644 --- a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.1.ts +++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.1.ts @@ -6,18 +6,18 @@ import { CommonModule } from '@angular/common'; import { CrisisService } from './crisis.service'; -import { CrisisCenterComponent } from './crisis-center.component'; -import { CrisisListComponent } from './crisis-list.component'; -import { CrisisCenterHomeComponent } from './crisis-center-home.component'; -import { CrisisDetailComponent } from './crisis-detail.component'; +import { CrisisCenterComponent } from './crisis-center.component'; +import { CrisisListComponent } from './crisis-list.component'; +import { CrisisCenterHomeComponent } from './crisis-center-home.component'; +import { CrisisDetailComponent } from './crisis-detail.component'; -import { crisisCenterRouting } from './crisis-center.routing'; +import { CrisisCenterRoutingModule } from './crisis-center-routing.module'; @NgModule({ imports: [ CommonModule, FormsModule, - crisisCenterRouting + CrisisCenterRoutingModule ], declarations: [ CrisisCenterComponent, diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.ts index 3a66164607..fddf7ca421 100644 --- a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.ts +++ b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.module.ts @@ -5,22 +5,19 @@ import { FormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; import { CrisisService } from './crisis.service'; -// #docregion crisis-detail-resolve -import { CrisisDetailResolve } from './crisis-detail-resolve.service'; -// #enddocregion crisis-detail-resolve import { CrisisCenterComponent } from './crisis-center.component'; import { CrisisListComponent } from './crisis-list.component'; import { CrisisCenterHomeComponent } from './crisis-center-home.component'; import { CrisisDetailComponent } from './crisis-detail.component'; -import { crisisCenterRouting } from './crisis-center.routing'; +import { CrisisCenterRoutingModule } from './crisis-center-routing.module'; @NgModule({ imports: [ CommonModule, FormsModule, - crisisCenterRouting + CrisisCenterRoutingModule ], declarations: [ CrisisCenterComponent, @@ -28,11 +25,8 @@ import { crisisCenterRouting } from './crisis-center.routing'; CrisisCenterHomeComponent, CrisisDetailComponent ], - // #docregion crisis-detail-resolve - providers: [ - CrisisService, - CrisisDetailResolve + CrisisService ] // #enddocregion crisis-detail-resolve }) diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.1.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.1.ts deleted file mode 100644 index 8ef262c189..0000000000 --- a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.1.ts +++ /dev/null @@ -1,37 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { CrisisCenterHomeComponent } from './crisis-center-home.component'; -import { CrisisListComponent } from './crisis-list.component'; -import { CrisisCenterComponent } from './crisis-center.component'; -import { CrisisDetailComponent } from './crisis-detail.component'; - -// #docregion routes -const crisisCenterRoutes: Routes = [ - { - path: 'crisis-center', - component: CrisisCenterComponent, - children: [ - { - path: '', - component: CrisisListComponent, - children: [ - { - path: ':id', - component: CrisisDetailComponent - }, - { - path: '', - component: CrisisCenterHomeComponent - } - ] - } - ] - } -]; - -export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes); -// #docregion routes -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.2.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.2.ts deleted file mode 100644 index aab186c878..0000000000 --- a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.2.ts +++ /dev/null @@ -1,65 +0,0 @@ -// #docplaster -// #docregion routes -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { CrisisCenterHomeComponent } from './crisis-center-home.component'; -import { CrisisListComponent } from './crisis-list.component'; -import { CrisisCenterComponent } from './crisis-center.component'; -import { CrisisDetailComponent } from './crisis-detail.component'; -// #enddocregion routes - -// #docregion can-deactivate-guard -import { CanDeactivateGuard } from '../can-deactivate-guard.service'; -// #enddocregion can-deactivate-guard -// #docregion crisis-detail-resolve -import { CrisisDetailResolve } from './crisis-detail-resolve.service'; - -// #enddocregion crisis-detail-resolve -// #docregion routes - -const crisisCenterRoutes: Routes = [ -// #enddocregion routes - // #docregion redirect, routes - { - path: '', - redirectTo: '/crisis-center', - pathMatch: 'full' - }, - // #enddocregion redirect, routes - // #docregion routes - { - path: 'crisis-center', - component: CrisisCenterComponent, - children: [ - { - path: '', - component: CrisisListComponent, - children: [ - { - path: ':id', - component: CrisisDetailComponent, - // #enddocregion routes - // #docregion can-deactivate-guard - canDeactivate: [CanDeactivateGuard], - // #enddocregion can-deactivate-guard - // #docregion crisis-detail-resolve - resolve: { - crisis: CrisisDetailResolve - } - // #enddocregion crisis-detail-resolve - // #docregion routes - }, - { - path: '', - component: CrisisCenterHomeComponent - } - ] - } - ] - } - // #docregion routes -]; - -export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes); -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.3.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.3.ts deleted file mode 100644 index e43119d517..0000000000 --- a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.3.ts +++ /dev/null @@ -1,44 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { CrisisCenterHomeComponent } from './crisis-center-home.component'; -import { CrisisListComponent } from './crisis-list.component'; -import { CrisisCenterComponent } from './crisis-center.component'; -import { CrisisDetailComponent } from './crisis-detail.component'; - -// #docregion can-deactivate-guard -import { CanDeactivateGuard } from '../can-deactivate-guard.service'; - -const crisisCenterRoutes: Routes = [ - { - path: '', - redirectTo: '/crisis-center', - pathMatch: 'full' - }, - { - path: 'crisis-center', - component: CrisisCenterComponent, - children: [ - { - path: '', - component: CrisisListComponent, - children: [ - { - path: ':id', - component: CrisisDetailComponent, - canDeactivate: [CanDeactivateGuard] - }, - { - path: '', - component: CrisisCenterHomeComponent - } - ] - } - ] - } -]; - -export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes); -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.ts b/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.ts deleted file mode 100644 index 6b4fccde4d..0000000000 --- a/public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.ts +++ /dev/null @@ -1,51 +0,0 @@ -// #docplaster -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { CrisisCenterHomeComponent } from './crisis-center-home.component'; -import { CrisisListComponent } from './crisis-list.component'; -import { CrisisCenterComponent } from './crisis-center.component'; -import { CrisisDetailComponent } from './crisis-detail.component'; - -import { CanDeactivateGuard } from '../can-deactivate-guard.service'; - -// #docregion crisis-detail-resolve -import { CrisisDetailResolve } from './crisis-detail-resolve.service'; - -const crisisCenterRoutes: Routes = [ - // #docregion redirect - { - path: '', - redirectTo: '/crisis-center', - pathMatch: 'full' - }, - // #enddocregion redirect - { - path: 'crisis-center', - component: CrisisCenterComponent, - children: [ - { - path: '', - component: CrisisListComponent, - children: [ - { - path: ':id', - component: CrisisDetailComponent, - canDeactivate: [CanDeactivateGuard], - resolve: { - crisis: CrisisDetailResolve - } - }, - { - path: '', - component: CrisisCenterHomeComponent - } - ] - } - ] - } -]; - -export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes); -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/heroes/heroes-routing.module.ts b/public/docs/_examples/router/ts/app/heroes/heroes-routing.module.ts new file mode 100644 index 0000000000..96bf339394 --- /dev/null +++ b/public/docs/_examples/router/ts/app/heroes/heroes-routing.module.ts @@ -0,0 +1,22 @@ +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { HeroListComponent } from './hero-list.component'; +import { HeroDetailComponent } from './hero-detail.component'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: 'heroes', component: HeroListComponent }, + // #docregion hero-detail-route + { path: 'hero/:id', component: HeroDetailComponent } + // #enddocregion hero-detail-route + ]) + ], + exports: [ + RouterModule + ] +}) +export class HeroRoutingModule { } +// #enddocregion diff --git a/public/docs/_examples/router/ts/app/heroes/heroes.module.ts b/public/docs/_examples/router/ts/app/heroes/heroes.module.ts index 1816ef1e56..72212dbd24 100644 --- a/public/docs/_examples/router/ts/app/heroes/heroes.module.ts +++ b/public/docs/_examples/router/ts/app/heroes/heroes.module.ts @@ -9,13 +9,13 @@ import { HeroDetailComponent } from './hero-detail.component'; import { HeroService } from './hero.service'; // #docregion heroes-routes -import { heroesRouting } from './heroes.routing'; +import { HeroRoutingModule } from './heroes-routing.module'; @NgModule({ imports: [ CommonModule, FormsModule, - heroesRouting + HeroRoutingModule ], declarations: [ HeroListComponent, diff --git a/public/docs/_examples/router/ts/app/heroes/heroes.routing.ts b/public/docs/_examples/router/ts/app/heroes/heroes.routing.ts deleted file mode 100644 index 4831fdd97b..0000000000 --- a/public/docs/_examples/router/ts/app/heroes/heroes.routing.ts +++ /dev/null @@ -1,16 +0,0 @@ -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { HeroListComponent } from './hero-list.component'; -import { HeroDetailComponent } from './hero-detail.component'; - -const heroesRoutes: Routes = [ - { path: 'heroes', component: HeroListComponent }, -// #docregion hero-detail-route - { path: 'hero/:id', component: HeroDetailComponent } -// #enddocregion hero-detail-route -]; - -export const heroesRouting: ModuleWithProviders = RouterModule.forChild(heroesRoutes); -// #enddocregion diff --git a/public/docs/_examples/router/ts/app/login-routing.module.ts b/public/docs/_examples/router/ts/app/login-routing.module.ts new file mode 100644 index 0000000000..43c0e28a97 --- /dev/null +++ b/public/docs/_examples/router/ts/app/login-routing.module.ts @@ -0,0 +1,22 @@ +// #docregion +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { AuthGuard } from './auth-guard.service'; +import { AuthService } from './auth.service'; +import { LoginComponent } from './login.component'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: 'login', component: LoginComponent } + ]) + ], + exports: [ + RouterModule + ], + providers: [ + AuthGuard, + AuthService + ] +}) +export class LoginRoutingModule {} diff --git a/public/docs/_examples/router/ts/app/login.routing.ts b/public/docs/_examples/router/ts/app/login.routing.ts deleted file mode 100644 index 9e3eaf2350..0000000000 --- a/public/docs/_examples/router/ts/app/login.routing.ts +++ /dev/null @@ -1,14 +0,0 @@ -// #docregion -import { Routes } from '@angular/router'; -import { AuthGuard } from './auth-guard.service'; -import { AuthService } from './auth.service'; -import { LoginComponent } from './login.component'; - -export const loginRoutes: Routes = [ - { path: 'login', component: LoginComponent } -]; - -export const authProviders = [ - AuthGuard, - AuthService -]; diff --git a/public/docs/_examples/testing/ts/app/hero/hero.routing.ts b/public/docs/_examples/testing/ts/app/hero/hero-routing.module.ts similarity index 68% rename from public/docs/_examples/testing/ts/app/hero/hero.routing.ts rename to public/docs/_examples/testing/ts/app/hero/hero-routing.module.ts index 9530bc3953..59ec14474c 100644 --- a/public/docs/_examples/testing/ts/app/hero/hero.routing.ts +++ b/public/docs/_examples/testing/ts/app/hero/hero-routing.module.ts @@ -1,3 +1,4 @@ +import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { HeroListComponent } from './hero-list.component'; @@ -9,4 +10,9 @@ const routes: Routes = [ ]; export const routedComponents = [HeroDetailComponent, HeroListComponent]; -export const routing = RouterModule.forChild(routes); + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class HeroRoutingModule {} diff --git a/public/docs/_examples/testing/ts/app/hero/hero.module.ts b/public/docs/_examples/testing/ts/app/hero/hero.module.ts index 541d49103f..dfe33cc199 100644 --- a/public/docs/_examples/testing/ts/app/hero/hero.module.ts +++ b/public/docs/_examples/testing/ts/app/hero/hero.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../shared/shared.module'; -import { routedComponents, routing } from './hero.routing'; +import { routedComponents, HeroRoutingModule } from './hero-routing.module'; @NgModule({ - imports: [ SharedModule, routing ], + imports: [ SharedModule, HeroRoutingModule ], declarations: [ routedComponents ] }) export class HeroModule { } diff --git a/public/docs/_examples/toh-5/ts/app/app.module.2.ts b/public/docs/_examples/toh-5/ts/app/app.module.2.ts new file mode 100644 index 0000000000..00876570f3 --- /dev/null +++ b/public/docs/_examples/toh-5/ts/app/app.module.2.ts @@ -0,0 +1,48 @@ +// #docplaster +// #docregion +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; + +import { AppComponent } from './app.component'; +import { HeroDetailComponent } from './hero-detail.component'; +import { HeroesComponent } from './heroes.component'; +import { HeroService } from './hero.service'; + +@NgModule({ + imports: [ + BrowserModule, + FormsModule, + RouterModule.forRoot([ + { + path: 'heroes', + component: HeroesComponent + } + ]) + ], + declarations: [ + AppComponent, + HeroDetailComponent, + HeroesComponent + ], + providers: [ + HeroService + ], + bootstrap: [ AppComponent ] +}) +export class AppModule { +} +// #enddocregion +/* +// #docregion heroes, routing +import { RouterModule } from '@angular/router'; + +RouterModule.forRoot([ + { + path: 'heroes', + component: HeroesComponent + } +]) +// #enddocregion heroes, routing +*/ diff --git a/public/docs/_examples/toh-5/ts/app/app.module.3.ts b/public/docs/_examples/toh-5/ts/app/app.module.3.ts new file mode 100644 index 0000000000..152401f132 --- /dev/null +++ b/public/docs/_examples/toh-5/ts/app/app.module.3.ts @@ -0,0 +1,59 @@ +// #docregion +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; + +import { AppComponent } from './app.component'; +import { HeroDetailComponent } from './hero-detail.component'; +import { DashboardComponent } from './dashboard.component'; +import { HeroesComponent } from './heroes.component'; +import { HeroService } from './hero.service'; + +@NgModule({ + imports: [ + BrowserModule, + FormsModule, + RouterModule.forRoot([ + // #docregion redirect + { + path: '', + redirectTo: '/dashboard', + pathMatch: 'full' + }, + // #enddocregion redirect + // #docregion dashboard + { + path: 'dashboard', + component: DashboardComponent + }, + // #enddocregion dashboard + // #docregion hero-detail + { + path: 'detail/:id', + component: HeroDetailComponent + }, + // #enddocregion hero-detail + // #docregion heroes + // #docregion heroes, routing + { + path: 'heroes', + component: HeroesComponent + } + // #enddocregion heroes, routing + ]) + ], + declarations: [ + AppComponent, + DashboardComponent, + HeroDetailComponent, + HeroesComponent + ], + providers: [ + HeroService + ], + bootstrap: [ AppComponent ] +}) +export class AppModule { +} +// #enddocregion diff --git a/public/docs/_examples/toh-5/ts/app/app.module.ts b/public/docs/_examples/toh-5/ts/app/app.module.ts index 67bafebd38..1503ac53c7 100644 --- a/public/docs/_examples/toh-5/ts/app/app.module.ts +++ b/public/docs/_examples/toh-5/ts/app/app.module.ts @@ -3,21 +3,37 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; import { DashboardComponent } from './dashboard.component'; import { HeroDetailComponent } from './hero-detail.component'; import { HeroesComponent } from './heroes.component'; import { HeroService } from './hero.service'; -// #docregion routing -import { routing } from './app.routing'; -// #docregion routing @NgModule({ imports: [ BrowserModule, FormsModule, - routing + RouterModule.forRoot([ + { + path: '', + redirectTo: '/dashboard', + pathMatch: 'full' + }, + { + path: 'dashboard', + component: DashboardComponent + }, + { + path: 'detail/:id', + component: HeroDetailComponent + }, + { + path: 'heroes', + component: HeroesComponent + } + ]) ], // #enddocregion routing // #docregion dashboard, hero-detail diff --git a/public/docs/_examples/toh-5/ts/app/app.routing.1.ts b/public/docs/_examples/toh-5/ts/app/app.routing.1.ts deleted file mode 100644 index a69db4104b..0000000000 --- a/public/docs/_examples/toh-5/ts/app/app.routing.1.ts +++ /dev/null @@ -1,17 +0,0 @@ -// #docregion , heroes, routing -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { HeroesComponent } from './heroes.component'; - -const appRoutes: Routes = [ - { - path: 'heroes', - component: HeroesComponent - } -]; -// #enddocregion heroes, routing - -// #docregion routing-export -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); -// #enddocregion routing-export diff --git a/public/docs/_examples/toh-5/ts/app/app.routing.ts b/public/docs/_examples/toh-5/ts/app/app.routing.ts deleted file mode 100644 index 81f6d05ed2..0000000000 --- a/public/docs/_examples/toh-5/ts/app/app.routing.ts +++ /dev/null @@ -1,43 +0,0 @@ -// #docplaster -// #docregion , heroes -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -// #enddocregion heroes -import { DashboardComponent } from './dashboard.component'; -// #docregion heroes -import { HeroesComponent } from './heroes.component'; -// #enddocregion heroes -import { HeroDetailComponent } from './hero-detail.component'; -// #docregion heroes - -const appRoutes: Routes = [ - // #enddocregion heroes - // #docregion redirect - { - path: '', - redirectTo: '/dashboard', - pathMatch: 'full' - }, - // #enddocregion redirect - // #docregion dashboard - { - path: 'dashboard', - component: DashboardComponent - }, - // #enddocregion dashboard - // #docregion hero-detail - { - path: 'detail/:id', - component: HeroDetailComponent - }, - // #enddocregion hero-detail - // #docregion heroes - { - path: 'heroes', - component: HeroesComponent - } -]; -// #enddocregion heroes - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/public/docs/_examples/toh-6/ts/app/app.module.ts b/public/docs/_examples/toh-6/ts/app/app.module.ts index 2ab938b8eb..a4efc4b34d 100644 --- a/public/docs/_examples/toh-6/ts/app/app.module.ts +++ b/public/docs/_examples/toh-6/ts/app/app.module.ts @@ -9,6 +9,7 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; import { HttpModule } from '@angular/http'; +import { RouterModule } from '@angular/router'; // #enddocregion v1 // Imports for loading & configuring the in-memory web api @@ -24,7 +25,6 @@ import { HeroService } from './hero.service'; // #enddocregion v1, v2 import { HeroSearchComponent } from './hero-search.component'; // #docregion v1, v2 -import { routing } from './app.routing'; @NgModule({ imports: [ @@ -36,7 +36,25 @@ import { routing } from './app.routing'; InMemoryWebApiModule.forRoot(InMemoryDataService), // #enddocregion in-mem-web-api // #docregion v1 - routing + RouterModule.forRoot([ + { + path: '', + redirectTo: '/dashboard', + pathMatch: 'full' + }, + { + path: 'dashboard', + component: DashboardComponent + }, + { + path: 'detail/:id', + component: HeroDetailComponent + }, + { + path: 'heroes', + component: HeroesComponent + } + ]) ], // #docregion search declarations: [ diff --git a/public/docs/_examples/toh-6/ts/app/app.routing.ts b/public/docs/_examples/toh-6/ts/app/app.routing.ts deleted file mode 100644 index 7acd3b9863..0000000000 --- a/public/docs/_examples/toh-6/ts/app/app.routing.ts +++ /dev/null @@ -1,29 +0,0 @@ -// #docregion -import { ModuleWithProviders } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { DashboardComponent } from './dashboard.component'; -import { HeroesComponent } from './heroes.component'; -import { HeroDetailComponent } from './hero-detail.component'; - -const appRoutes: Routes = [ - { - path: '', - redirectTo: '/dashboard', - pathMatch: 'full' - }, - { - path: 'dashboard', - component: DashboardComponent - }, - { - path: 'detail/:id', - component: HeroDetailComponent - }, - { - path: 'heroes', - component: HeroesComponent - } -]; - -export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes); diff --git a/public/docs/ts/_cache/tutorial/toh-pt5.jade b/public/docs/ts/_cache/tutorial/toh-pt5.jade index c845938fff..f0adefb421 100644 --- a/public/docs/ts/_cache/tutorial/toh-pt5.jade +++ b/public/docs/ts/_cache/tutorial/toh-pt5.jade @@ -2,7 +2,7 @@ block includes include ../_util-fns - - var _appRoutingTsVsAppComp = 'app.routing.ts' + - var _appRoutingTsVsAppComp = 'app-routing.module.ts' - var _declsVsDirectives = 'declarations' - var _RoutesVsAtRouteConfig = 'Routes' - var _RouterModuleVsRouterDirectives = 'RouterModule' @@ -202,7 +202,7 @@ block router-config-intro Let's define our first route as a route to the heroes component: -- var _file = _docsFor == 'dart' ? 'app.component.ts' : 'app.routing.ts' +- var _file = _docsFor == 'dart' ? 'app.component.ts' : 'app-routing.module.ts' +makeExcerpt('app/' + _file + ' (heroes route)', 'heroes') - var _are = _docsFor == 'dart' ? 'takes' : 'are' @@ -227,7 +227,7 @@ block router-config-intro We'll export a `routing` constant initialized using the `RouterModule.forRoot` method applied to our !{_array} of routes. This method returns a **configured router module** that we'll add to our root NgModule, `AppModule`. - +makeExcerpt('app/app.routing.1.ts (excerpt)', 'routing-export') + +makeExcerpt('app/app-routing.module.1.ts (excerpt)', 'routing-export') .l-sub-section :marked @@ -237,9 +237,9 @@ block router-config-intro :marked ### Make the router available - We've setup initial routes in the `app.routing.ts` file. Now we'll add it to our root NgModule. + We've setup initial routes in the `app-routing.module.ts` file. Now we'll add it to our root NgModule. - Import the `routing` constant from `app.routing.ts` and add it the `imports` !{_array} of `AppModule`. + Import the `routing` constant from `app-routing.module.ts` and add it the `imports` !{_array} of `AppModule`. +makeExcerpt('app/app.module.ts', 'routing') @@ -319,7 +319,7 @@ block routerLink Import the dashboard component and add the following route definition to the `!{_RoutesVsAtRouteConfig}` !{_array} of definitions. -- var _file = _docsFor == 'dart' ? 'lib/app_component.dart' : 'app/app.routing.ts' +- var _file = _docsFor == 'dart' ? 'lib/app_component.dart' : 'app/app-routing.module.ts' +makeExcerpt(_file + ' (Dashboard route)', 'dashboard') +ifDocsFor('ts|js') @@ -340,7 +340,7 @@ block redirect-vs-use-as-default We can use a redirect route to make this happen. Add the following to our array of route definitions: - +makeExcerpt('app/app.routing.ts','redirect') + +makeExcerpt('app/app-routing.module.ts','redirect') .l-sub-section :marked @@ -472,7 +472,7 @@ code-example(format=''). Here's the *route definition* we'll use. -- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app.routing.ts' +- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app-routing.module.ts' +makeExcerpt(_file + ' (hero detail)','hero-detail') :marked @@ -639,7 +639,7 @@ block extract-id token in the parameterized hero detail route definition we added to `!{_appRoutingTsVsAppComp}` earlier in the chapter: -- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app.routing.ts' +- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app-routing.module.ts' +makeExcerpt(_file + ' (hero detail)', 'hero-detail') :marked @@ -868,7 +868,7 @@ block file-tree-end .file app.component.css .file app.component.ts .file app.module.ts - .file app.routing.ts + .file app-routing.module.ts .file dashboard.component.css .file dashboard.component.html .file dashboard.component.ts diff --git a/public/docs/ts/_cache/tutorial/toh-pt6.jade b/public/docs/ts/_cache/tutorial/toh-pt6.jade index 8f17d79380..54c2b2e22c 100644 --- a/public/docs/ts/_cache/tutorial/toh-pt6.jade +++ b/public/docs/ts/_cache/tutorial/toh-pt6.jade @@ -539,7 +539,7 @@ block filetree .file app.component.ts .file app.component.css .file app.module.ts - .file app.routing.ts + .file app-routing.module.ts .file dashboard.component.css .file dashboard.component.html .file dashboard.component.ts diff --git a/public/docs/ts/latest/cookbook/ngmodule-faq.jade b/public/docs/ts/latest/cookbook/ngmodule-faq.jade index ce7a675018..259ac92f98 100644 --- a/public/docs/ts/latest/cookbook/ngmodule-faq.jade +++ b/public/docs/ts/latest/cookbook/ngmodule-faq.jade @@ -27,7 +27,7 @@ block includes * [Should I import _BrowserModule_ or _CommonModule_?](#q-browser-vs-common-module) * [What if I import the same module twice?](#q-reimport) - Exports + Exports * [What should I export?](#q-what-to-export) * [What should I *not* export?](#q-what-not-to-export) * [Can I re-export imported classes and modules?](#q-re-export) @@ -41,7 +41,7 @@ block includes * [Should I add app-wide providers to the root _AppModule_ or the root _AppComponent_?](#q-root-component-or-module) * [Should I add other providers to a module or a component?](#q-component-or-module) * [Why is it bad if _SharedModule_ provides a service to a lazy loaded module?](#q-why-bad) - * [Why does lazy loading create a child injector?](#q-why-child-injector) + * [Why does lazy loading create a child injector?](#q-why-child-injector) * [How can I tell if a module or service was previously loaded?](#q-is-it-loaded) Entry Components @@ -54,7 +54,7 @@ block includes * [What kinds of modules should I have and how should I use them?](#q-module-recommendations) * [What's the difference between Angular and JavaScript Modules?](#q-ng-vs-js-modules) * [What is a "template reference"?](#q-template-reference) - * [How does Angular find components, directives, and pipes in a template?](#q-template-reference) + * [How does Angular find components, directives, and pipes in a template?](#q-template-reference) * [What is the Angular Compiler?](#q-angular-compiler) * [Can you summarize the _NgModule_ API?](#q-ngmodule-api) @@ -76,9 +76,9 @@ a#q-declarable .l-main-section :marked ### What is a _declarable_? - + _Declarables_ are the class types — components, directives, and pipes — - that you can add to a module's `declarations` list. + that you can add to a module's `declarations` list. They're the _only_ classes that you can add to `declarations`. .l-hr @@ -90,17 +90,17 @@ a#q-what-not-to-declare Only [declarable](#q-declarable) classes can be added to a module's `declarations` list. - Do *not* declare + Do *not* declare * a class that is already declared in another module, whether an app module, @angular module, or 3rd party module - * an array of directives imported from another module. + * an array of directives imported from another module. For example, do not declare FORMS_DIRECTIVES from `@angular/forms`. * module classes - + * service classes - * non-Angular classes and objects such as + * non-Angular classes and objects such as strings, numbers, functions, entity models, configurations, business logic, and helper classes. .l-hr @@ -112,8 +112,8 @@ a#q-why-multiple-mentions We often see `AppComponent` listed in both `declarations` and `bootstrap`. We might see `HeroComponent` listed in `declarations`, `exports`, and `entryComponents`. - - That _feels_ redundant but these properties have different functions + + That _feels_ redundant but these properties have different functions and we can't infer that membership in one list implies membership in another list. * `AppComponent` could be declared in this module but not bootstrapped. @@ -128,12 +128,12 @@ a#q-why-cant-bind-to :marked ### What does "_Can't bind to 'x' since it isn't a known property of 'y'_" mean? - This error usually means either that you neglected to declare the directive "x" + This error usually means either that you neglected to declare the directive "x" or you haven't imported the module to which "x" belongs. For example, if "x" is `ngModel`, you probably haven't imported the `FormsModule` from `@angular/forms`. - Perhaps you declared "x" in an application sub-module but forgot to export it? + Perhaps you declared "x" in an application sub-module but forgot to export it? The "x" class won't be visible to other modules until you add it to the `exports` list. .l-hr @@ -143,14 +143,14 @@ a#q-what-to-import :marked ### What should I import? - Import modules whose public (exported) [declarable classes](#q-declarable) + Import modules whose public (exported) [declarable classes](#q-declarable) you need to reference in this module's component templates. This invariably means importing `CommonModule` from `@angular/common` for access to - the Angular directives such as `NgIf` and `NgFor`. + the Angular directives such as `NgIf` and `NgFor`. You can import it directly or from another module that [re-exports](#q-reexport) it. - Import `FormsModule` from `@angular/forms` + Import `FormsModule` from `@angular/forms` if your components have `[(ngModel)]` two-way binding expressions. Import _shared_ and _feature_ modules when this module's components incorporate their @@ -167,16 +167,16 @@ a#q-browser-vs-common-module The **root application module** (`AppModule`) of almost every browser application should import `BrowserModule` from `@angular/platform-browser`. - + `BrowserModule` provides services that are essential to launch and run a browser app. `BrowserModule` also re-exports `CommonModule` from `@angular/common` which means that component in the `AppModule` module also have access to the Angular directives every app needs such as `NgIf` and `NgFor`. - + _Do not import_ `BrowserModule` in any other module. *Feature modules* and *lazy loaded modules* should import `CommonModule` instead. - They need the common directives. They don't need to re-install the app-wide providers. + They need the common directives. They don't need to re-install the app-wide providers. .l-sub-section :marked `BrowserModule` throws an error if you try to lazy load a module that imports it. @@ -184,14 +184,14 @@ a#q-browser-vs-common-module Importing `CommonModule` also frees feature modules for use on _any_ target platform, not just browsers, a fact of some interest to authors of cross-platform libraries. -.l-hr +.l-hr a#q-reimport .l-main-section :marked ### What if I import the same module twice? - - That's not a problem. When three modules all import Module 'A', - Angular evaluates Module 'A' once, the first time it encounters it, and does not do so again. + + That's not a problem. When three modules all import Module 'A', + Angular evaluates Module 'A' once, the first time it encounters it, and does not do so again. That's true at whatever level `A` appears in a hierarchy of imported modules. When Module 'B' imports Module 'A', Module 'C' imports 'B', and Module 'D' imports `[C, B, A]`, @@ -200,7 +200,7 @@ a#q-reimport Angular does not like modules with circular references so don't let Module 'A' import Module 'B' which imports Module 'A'. -.l-hr +.l-hr a#q-what-to-export .l-main-section :marked @@ -211,11 +211,11 @@ a#q-what-to-export If you don't export a class, it stays _private_, visible only to other component declared in this module. - You _can_ export any declarable class — components, directives, and pipes — + You _can_ export any declarable class — components, directives, and pipes — whether it is declared in this module or in an imported module. You _can_ re-export entire imported modules which effectively re-exports all of their exported classes. - A module can even export a module that it doesn't import. + A module can even export a module that it doesn't import. .l-hr @@ -230,12 +230,12 @@ a#q-what-not-to-export If you don't want another module to see it, don't export it. * Non-declarable objects such as services, functions, configurations, entity models, etc. - + * Components that are only loaded dynamically by the router or by bootstrapping. Such [entry components](#q-entry-component-defined) can never be selected in another component's template. - There's no harm in exporting them but no benefit either. + There's no harm in exporting them but no benefit either. - * Pure service modules that don't have public (exported) declarations. + * Pure service modules that don't have public (exported) declarations. For example, there is no point in re-exporting `HttpModule` because it doesn't export anything. It's only purpose is to add http service providers to the application as a whole. @@ -274,10 +274,10 @@ a#q-for-root ### What is the _forRoot_ method? The `forRoot` static method is a convention that makes it easy for developers to configure the module's provider(s). - - The `RouterModule.forRoot` method is a good example. - Apps pass a `Routes` object to `RouterModule.forRoot` in order to configure the app-wide `Router` service with routes. - `RouterModule.forRoot` returns a [ModuleWithProviders](../api/core/index/ModuleWithProviders-interface.html). + + The `RouterModule.forRoot` method is a good example. + Apps pass a `Routes` object to `RouterModule.forRoot` in order to configure the app-wide `Router` service with routes. + `RouterModule.forRoot` returns a [ModuleWithProviders](../api/core/index/ModuleWithProviders-interface.html). We add that result to the `imports` list of the root `AppModule`. .alert.is-important @@ -290,7 +290,7 @@ a#q-for-root **_forRoot_** and **_forChild_** are conventional names for methods that configure services in root and feature modules respectively. - + Angular doesn't recognize these names but Angular developers do. Follow this convention when you write similar modules with configurable service providers. @@ -310,16 +310,16 @@ a#q-module-provider-visibility This makes the provider visible to every class in the application that knows the provider's lookup token. - This is by design. + This is by design. Extensibility through module imports is a primary goal of the Angular module system. Merging module providers into the application injector makes it easy for a module library to enrich the entire application with new services. - By adding the `HttpModule` once, every application component can make http requests. - - However, this can feel like an unwelcome surprise if you are expecting the module's services + By adding the `HttpModule` once, every application component can make http requests. + + However, this can feel like an unwelcome surprise if you are expecting the module's services to be visible only to the components declared by that feature module. - If the `HeroModule` provides the `HeroService` and the root `AppModule` imports `HeroModule`, - any class that knows the `HeroService` _type_ can inject that service, + If the `HeroModule` provides the `HeroService` and the root `AppModule` imports `HeroModule`, + any class that knows the `HeroService` _type_ can inject that service, not just the classes declared in the `HeroModule`. .l-hr @@ -328,8 +328,8 @@ a#q-lazy-loaded-module-provider-visibility .l-main-section :marked ### Why is a service provided in a lazy loaded module visible only to that module? - - Unlike providers of the modules loaded at launch, + + Unlike providers of the modules loaded at launch, providers of lazy loaded modules are *module-scoped*. When the Angular router lazy-loads a module, it creates a new execution context. @@ -346,11 +346,11 @@ a#q-module-provider-duplicates .l-main-section :marked ### What if two modules provide the _same_ service? - - When two imported modules, loaded at the same time, list a provider with the same token, + + When two imported modules, loaded at the same time, list a provider with the same token, the second module's provider "wins". That's because both providers are added to the same injector. - When Angular looks to inject a service for that token, + When Angular looks to inject a service for that token, it creates and delivers the instance created by the second provider. _Every_ class that injects this service gets the instance created by the second provider. @@ -373,7 +373,7 @@ a#q-component-scoped-providers When a module is loaded at application launch, its `@NgModule.providers` have ***application-wide scope***. They are available for injection throughout the application. - + Imported providers are easily replaced by providers from another imported module. Such replacement may be by design. It could be unintentional and have adverse consequences. @@ -385,7 +385,7 @@ a#q-component-scoped-providers :marked Suppose a module requires a customized `HttpBackend` that adds a special header for all Http requests. If another module elsewhere in the application also customizes `HttpBackend` - or merely imports the `HttpModule`, it could override this module's `HttpBackend` provider, + or merely imports the `HttpModule`, it could override this module's `HttpBackend` provider, losing the special header. The server will reject http requests from this module. .alert.is-important @@ -395,25 +395,25 @@ a#q-component-scoped-providers :marked If you must guard against this kind of "provider corruption", *don't rely on a launch-time module's `providers`.* - Load the module lazily if you can. + Load the module lazily if you can. Angular gives a [lazy-loaded module](#q-lazy-loaded-module-provider-visibility) its own child injector. The module's providers are visible only within the component tree created with this injector. If you must load the module eagerly, when the application starts, ***provide the service in a component instead.*** - + Continuing with the same example, suppose the components of a module truly require a private, custom `HttpBackend`. - Create a "top component" that acts as the root for all of the module's components. + Create a "top component" that acts as the root for all of the module's components. Add the custom `HttpBackend` provider to the top component's `providers` list rather than the module's `providers`. Recall that Angular creates a child injector for each component instance and populates the injector with the component's own providers. - + When a child of this component _asks_ for the `HttpBackend` service, - Angular provides the local `HttpBackend` service, + Angular provides the local `HttpBackend` service, not the version provided in the application root injector. Child components will make proper http requests no matter what other modules do to `HttpBackend`. - + Be sure to create module components as children of this module's top component. You can embed the child components in the top component's template. @@ -441,22 +441,22 @@ a#q-root-component-or-module #### **_Discussion_:** Angular registers all startup module providers with the application root injector. - The services created from root injector providers are available to the entire application. + The services created from root injector providers are available to the entire application. They are _application-scoped_. - + Certain services (e.g., the `Router`) only work when registered in the application root injector. By contrast, Angular registers `AppComponent` providers with the `AppComponent`'s own injector. - `AppComponent`services are available only to that component and its component tree. + `AppComponent`services are available only to that component and its component tree. They are _component-scoped_. The `AppComponent`'s injector is a _child_ of the root injector, one down in the injector hierarchy. That is _almost_ the entire application for apps that don't use the router. But "almost" isn't good enough for routed applications. - `AppComponent` services don't exist at the root level where routing operates. + `AppComponent` services don't exist at the root level where routing operates. Lazy loaded modules can't reach them. - In the Angular Module Chapter sample applications, if we had registered `UserService` in the `AppComponent`, + In the Angular Module Chapter sample applications, if we had registered `UserService` in the `AppComponent`, the `HeroComponent` couldn't inject it. The application would fail the moment a user navigated to "Heroes". @@ -469,17 +469,17 @@ a#q-component-or-module In general, prefer registering feature-specific providers in modules (`@NgModule.providers`) to registering in components (`@Component.providers`). - + Register a provider with a component when you _must_ limit the scope of a service instance - to that component and its component tree. + to that component and its component tree. Apply the same reasoning to registering a provider with a directive. For example, a hero editing component that needs a private copy of a caching hero service should register - the `HeroService` with the `HeroEditorComponent`. - Then each new instance of the `HeroEditorComponent` gets its own cached service instance. + the `HeroService` with the `HeroEditorComponent`. + Then each new instance of the `HeroEditorComponent` gets its own cached service instance. The changes that editor makes to heroes in its service do not touch the hero instances elsewhere in the application. - [Always register _application-wide_ services with the root `AppModule`](q-root-component-or-module), + [Always register _application-wide_ services with the root `AppModule`](q-root-component-or-module), not the root `AppComponent`. .l-hr @@ -488,7 +488,7 @@ a#q-why-bad :marked ### Why is it bad if _SharedModule_ provides a service to a lazy loaded module? - This question arose in the [Angular Module](../guide/ngmodule.html#no-shared-module-providers) chapter + This question arose in the [Angular Module](../guide/ngmodule.html#no-shared-module-providers) chapter when we discussed the importance of keeping providers out of the `SharedModule`. Suppose we had listed the `UserService` in the module's `providers` (which we did not). @@ -496,16 +496,16 @@ a#q-why-bad When the app starts, Angular eagerly loads the `AppModule` and the `ContactModule`. - Both instances of the imported `SharedModule` would provide the `UserService`. + Both instances of the imported `SharedModule` would provide the `UserService`. Angular registers one of them in the root app injector (see [above](#q-reimport)). Then some component injects `UserService`, Angular finds it in the app root injector, - and delivers the app-wide singleton `UserService`. No problem. + and delivers the app-wide singleton `UserService`. No problem. Now consider the `HeroModule` _which is lazy loaded!_ When the router lazy loads the `HeroModule`, it creates a child injector and registers the `UserService` provider with that child injector. The child injector is _not_ the root injector. - + When Angular creates a lazy `HeroComponent`, it must inject a `UserService`. This time it finds a `UserService` provider in the lazy module's _child injector_ and creates a _new_ instance of the `UserService`. @@ -527,27 +527,27 @@ a#q-why-child-injector .l-main-section :marked ### Why does lazy loading create a child injector? - + Angular adds `@NgModule.providers` to the application root injector ... unless the module is lazy loaded. Then it creates a _child injector_ and adds the module's providers to the child injector. This means that a module behaves differently depending on whether it is loaded during application start or lazy loaded later. Neglecting that difference can lead to [adverse consequences](#q-why-bad). - Why doesn't Angular add lazy loaded providers to the app root injector as it does for eagerly loaded modules? + Why doesn't Angular add lazy loaded providers to the app root injector as it does for eagerly loaded modules? Why the inconsistency? - + The answer is grounded in a fundamental characteristic of the Angular dependency injection system. - An injector can add providers _until it is first used_. + An injector can add providers _until it is first used_. Once an injector starts creating and delivering services, its provider list is frozen. No new providers allowed. When an applications starts, Angular first configures the root injector with the providers of all eagerly loaded modules - _before_ creating its first component and injecting any of the provided services. + _before_ creating its first component and injecting any of the provided services. Once the application begins, the app root injector is closed to new providers. Time passes. Application logic triggers lazy loading of a module. - Angular must add the lazy loaded module's providers to an injector _somewhere_. - It can't added them to the app root injector because that injector is closed to new providers. + Angular must add the lazy loaded module's providers to an injector _somewhere_. + It can't added them to the app root injector because that injector is closed to new providers. So Angular creates a new child injector for the lazy loaded module context. .l-hr @@ -558,14 +558,14 @@ a#q-is-it-loaded ### How can I tell if a module or service was previously loaded? Some modules and its services should only be loaded once by the root `AppModule`. - Importing the module a second time by lazy loading a module could [produce errant behavior](#q-why-bad) + Importing the module a second time by lazy loading a module could [produce errant behavior](#q-why-bad) that may be difficult to detect and diagnose. We can guard against that danger by writing a constructor that attempts to inject the module or service from the root app injector. If the injection succeeds, the class has been loaded a second time. We can throw an error or take other remedial action. - Certain Angular modules (such as `BrowserModule`) implements such a guard + Certain Angular modules (such as `BrowserModule`) implements such a guard as does this Angular Module chapter sample's `CoreModule` constructor. +makeExample('ngmodule/ts/app/core/core.module.ts', 'ctor', 'app/core/core.module.ts (Constructor)')(format='.') :marked @@ -578,32 +578,32 @@ a#q-entry-component-defined ### What is an _entry component_? Any component that Angular loads _imperatively_ by type is an _entry component_, - + A component loaded _declaratively_ via its selector is _not_ an entry component. - Most application components are loaded declaratively. - Angular uses the component's selector to locate the element in the template. + Most application components are loaded declaratively. + Angular uses the component's selector to locate the element in the template. It then creates the HTML representation of the component and inserts it into the DOM at the selected element. These are not entry components. - A few components are only loaded dynamically and are _never_ referenced in a component template. + A few components are only loaded dynamically and are _never_ referenced in a component template. The bootstrapped root `AppComponent` is an _entry component_. True, its selector matches an element tag in `index.html`. - But `index.html` is not a component template and the `AppComponent` + But `index.html` is not a component template and the `AppComponent` selector doesn't match an element in any component template. - - Angular loads `AppComponent` dynamically either because we listed it _by type_ in `@NgModule.bootstrap` + + Angular loads `AppComponent` dynamically either because we listed it _by type_ in `@NgModule.bootstrap` or because we boostrapped it imperatively with the module's `ngDoBootstrap` method. Components in route definitions are also _entry components_. - A route definition refers to a component by its _type_. - The router ignores a routed component's selector (if it even has one) and - loads the component dynamically into a `RouterOutlet`. + A route definition refers to a component by its _type_. + The router ignores a routed component's selector (if it even has one) and + loads the component dynamically into a `RouterOutlet`. - The compiler can't discover these _entry components_ by looking for them in other component templates. + The compiler can't discover these _entry components_ by looking for them in other component templates. We must tell it about them ... by adding them to the `entryComponents` list. - + Angular automatically adds two kinds of components to the module's `entryComponents`: 1. the component in the `@NgModule.bootstrap` list 1. components referenced in router configuration @@ -624,7 +624,7 @@ a#q-bootstrap_vs_entry_component The `@NgModule.bootstrap` property tells the compiler _both_ that this is an entry component _and_ that it should generate code to bootstrap the application with this component. - There is no need to list a component in both the `bootstrap` and `entryComponent` lists + There is no need to list a component in both the `bootstrap` and `entryComponent` lists although it is harmless to do so. .l-hr @@ -633,20 +633,20 @@ a#q-when-entry-components .l-main-section :marked ### When do I add components to _entryComponents_? - + Most application developers won't need to add components to the `entryComponents`. Angular adds certain components to _entry components_ automatically. Components listed in `@NgModule.bootstrap` are added automatically. Components referenced in router configuration are added automatically. These two mechanisms account for almost all entry components. - - If your app happens to bootstrap or dynamically load a component _by type_ in some other manner, + + If your app happens to bootstrap or dynamically load a component _by type_ in some other manner, you'll have to add it to `entryComponents` explicitly. Although it's harmless to add components to this list, it's best to add only the components that are truly _entry components_. - Don't include components that [are referenced](#q-template-reference) + Don't include components that [are referenced](#q-template-reference) in the templates of other components. .l-hr @@ -658,28 +658,28 @@ a#q-why-entry-components _Entry components_ are also declared. Why doesn't the Angular compiler generate code for every component in `@NgModule.declarations`? Then we wouldn't need entry components. - + The reason is _tree shaking_. For production apps we want to load the smallest, fastest code possible. The code should contain only the classes that we actually need. It should exclude a component that's never used, whether or not that component is declared. In fact, many libraries declare and export components we'll never use. The _tree shaker_ will drop these components from the final code package - if we don't reference them. + if we don't reference them. - If the [Angular compiler](#q-angular-compiler) generated code for every declared component, + If the [Angular compiler](#q-angular-compiler) generated code for every declared component, it would defeat the purpose of the tree shaker. - + Instead, the compiler adopts a recursive strategy that generates code only for the components we use. - - It starts with the entry components, + + It starts with the entry components, then it generates code for the declared components it [finds](#q-template-reference) in an entry component's template, then for the declared components it discovers in the templates of previously compiled components, and so on. At the end of the process, it has generated code for every entry component and every component reachable from an entry component. - If a component isn't an _entry component_ or wasn't found in a template, - the compiler omits it. + If a component isn't an _entry component_ or wasn't found in a template, + the compiler omits it. .l-hr @@ -701,21 +701,21 @@ a#q-module-recommendations #### _SharedModule_ Create a `SharedModule` with the components, directives, and pipes that you use everywhere in your app. This module should consist entirely of `declarations` - most of them exported. - + most of them exported. + It may re-export other [widget modules](#widget-feature-module) such as `CommonModule`, `FormsModule` and modules with the UI controls that you use most widely. - + It should ***not*** have `providers` for reasons [explained earlier](#q-why-bad). Nor should any of its imported or re-exported modules have `providers`. Know what you're doing and why if you deviate from this guideline. - Import the `SharedModule` in your _feature_ modules, + Import the `SharedModule` in your _feature_ modules, both those loaded when the app starts and those you lazy load later. #### _CoreModule_ Create a `CoreModule` with `providers` for the singleton services you load when the application starts. - + Import `CoreModule` in the root `AppModule` only. Never import `CoreModule` in any module other than the root `AppModule`. @@ -724,16 +724,17 @@ a#q-module-recommendations .l-sub-section :marked This chapter sample departs from that advice by declaring and exporting two components that are - only used within the root `AppComponent` declared by `AppModule`. + only used within the root `AppComponent` declared by `AppModule`. Someone following this guideline strictly would have declared these components in the `AppModule` instead. :marked #### Feature Modules Create _Feature Modules_ around specific application business domains, user workflows, and utility collections. - + Feature modules tend to fall into one of these four groups: * [Domain Feature Modules](#domain-feature-module) * [Routed Feature Modules](#routed-feature-module) + * [Routing Modules](#routing-module) * [Service Feature Modules](#service-feature-module) * [Widget Feature Modules](#widget-feature-module) @@ -753,7 +754,7 @@ table :marked Domain Feature Modules deliver a user experience **dedicated to a particular application domain** like editing a customer or placing an order. - + They typically have a top component that acts as the feature root. Private, supporting sub-components descend from it. @@ -763,45 +764,81 @@ table Domain feature modules rarely have _providers_. When they do, the lifetime of the provided services should be the same as the lifetime of the module. - + Do not provide application-wide singleton services in a domain feature module. Domain feature modules are typically imported _exactly once_ by a larger feature module. - + They might be imported by the root `AppModule` of a small application that lacks routing. .l-sub-section :marked - For an example, see [_ContactModule_](../guide/ngmodule.html#contact-module-v1) + For an example, see [_ContactModule_](../guide/ngmodule.html#contact-module-v1) in the Angular Module chapter, before we introduced routing. tr td(style="vertical-align: top")Routed td :marked - _Routed Feature Modules_ are _Domain Feature modules_ + _Routed Feature Modules_ are _Domain Feature modules_ whose top components are the **targets of router navigation routes**. All lazy loaded modules are routed feature modules by definition. This chapter's `ContactModule`, `HeroModule` and `CrisisModule` are routed feature modules. - Routed Feature Modules _should not export anything_. + Routed Feature Modules _should not export anything_. They don't have to because none of their components ever appear in the template of an external component. - A lazy loaded Routed Feature Module should _not be imported_ by any module. + A lazy loaded Routed Feature Module should _not be imported_ by any module. Doing so would trigger an eager load, defeating the purpose of lazy loading. `HeroModule` and `CrisisModule` are lazy loaded. They aren't mentioned among the `AppModule` imports. But an eager loaded Routed Feature Module must be imported by another module - so that the compiler learns about its components. + so that the compiler learns about its components. `ContactModule` is eager loaded and, therefore, is listed among the `AppModule` imports. Routed Feature Modules rarely have _providers_ for reasons [explained earlier](#q-why-bad). When they do, the lifetime of the provided services should be the same as the lifetime of the module. - + Do not provide application-wide singleton services in a routed feature module or in a module that the routed module imports. + tr + td(style="vertical-align: top")Routing + td + :marked + A [_Routing Module_](../guide/router.html#routing-module) **provides routing configuration** for another module. + + A Routing Module separates routing concerns from its companion module. + + It typically: + * defines routes + * adds router configuration to the module's `imports` + * re-exports `RouterModule` + * adds guard and resolver service providers to the module's `providers`. + + The name of the Routing Module should parallel the name of its companion module, using the suffix "Routing". + For example, `FooModule` in `foo.module.ts` has a routing module named `FooRoutingModule` + in `foo-routing.module.ts` + + If the companion module is the _root_ `AppModule`, + the `AppRoutingModule` adds router configuration to its `imports` with `RouterModule.forRoot(routes)`. + All other Routing Modules are children that import `RouterModule.forChild(routes)`. + + A Routing Module re-exports the `RouterModule` as a convenience + so that components of the companion module have access to + router directives such as `RouterLink` and `RouterOutlet`. + + A Routing Module **should not have its own `declarations`!** +   Components, directives, and pipes are the **responsibility of the feature module** + not the _routing_ module. + + A Routing Module should _only_ be imported by its companion module. + + The `AppRoutingModule`, `ContactRoutingModule` and `HeroRoutingModule` are good examples. + .l-sub-section + :marked + See also "[Do you need a _Routing Module_?](../guide/router.html#why-routing-module)". tr td(style="vertical-align: top")Service @@ -813,7 +850,7 @@ table The `CoreModule` and Angular's `HttpModule` are good examples. Service Modules should _only_ be imported by the root `AppModule`. - + Do **not** import them in other feature modules. Know what you're doing and why if you deviate from this guideline. tr @@ -821,13 +858,13 @@ table td :marked A _Widget Module_ makes **components, directives, and pipes** available to external modules. - + `CommonModule` and `SharedModule` are widget modules. Many third party UI component libraries are widget modules. - A Widget Module should consist entirely of _declarations_, most of them exported. + A Widget Module should consist entirely of _declarations_, most of them exported. - A Widget Module should rarely have _providers_. + A Widget Module should rarely have _providers_. Know what you're doing and why if you deviate from this guideline. Import Widget Modules in any module whose component templates need the widgets. @@ -840,8 +877,8 @@ table table tr th Feature Module - th Declarations - th Providers + th Declarations + th Providers th Exports th Imported By th Examples @@ -859,6 +896,13 @@ table td No td Nobody td ContactModule, HeroModule, CrisisModule + tr + td Routing + td No + td Yes (Guards) + td RouterModule + td Feature (for routing) + td AppRoutingModule, ContactRoutingModule, HeroRoutingModule tr td Service td No @@ -900,20 +944,20 @@ code-example(format='.'). An _Angular Module_ is a feature of _Angular_ itself. - Angular's `NgModule` also has `imports` and `exports` and they serve a similar purpose. + Angular's `NgModule` also has `imports` and `exports` and they serve a similar purpose. We _import_ other Angular modules so we can use their exported classes in component templates. We _export_ this Angular module's classes so they can be imported and used by components of _other_ modules. - + The Angular module classes differ from JavaScript module class in three key respects: - 1. An Angular module bounds [_declarable classes_](#q-declarables) only. + 1. An Angular module bounds [_declarable classes_](#q-declarables) only. Declarables are the only classes that matter to the [Angular compiler](#q-angular-compiler). 1. Instead of defining all member classes in one giant file (as in a JavaScript module), we list the module's classes in the `@NgModule.declarations` list. - 1. An Angular module can only export the [_declarable classes_](#q-declarables) + 1. An Angular module can only export the [_declarable classes_](#q-declarables) it owns or imports from other modules. It doesn't declare or export any other kind of class. @@ -940,11 +984,11 @@ a#q-template-reference h4. How does Angular find components, directives, and pipes in a template?
    What is a template reference? :marked - The [Angular compiler](#q-angular-compiler) looks inside component templates + The [Angular compiler](#q-angular-compiler) looks inside component templates for other components, directives, and pipes. When it finds one, that's a "template reference". - The Angular compiler finds a component or directive in a template when it can match the **selector** of that - component or directive to some HTML in that template. + The Angular compiler finds a component or directive in a template when it can match the **selector** of that + component or directive to some HTML in that template. The compiler finds a pipe if the pipe's **name** appears within the pipe syntax of the template HTML. @@ -953,7 +997,7 @@ h4. .l-hr -a#q-angular-compiler +a#q-angular-compiler .l-main-section :marked ### What is the Angular Compiler? @@ -963,25 +1007,25 @@ a#q-angular-compiler The code we write is not immediately executable. Consider **components**. - Components have templates that contain custom elements, attribute directives, Angular binding declarations, + Components have templates that contain custom elements, attribute directives, Angular binding declarations, and some peculiar syntax that clearly isn't native HTML. - - The _Angular Compiler_ reads the template markup, + + The _Angular Compiler_ reads the template markup, combines it with the corresponding component class code, and emits _component factories_. - + A component factory creates a pure, 100% JavaScript representation - of the component that incorporates everything described in its `@Component` metadata: + of the component that incorporates everything described in its `@Component` metadata: the HTML, the binding instructions, the attached styles ... everything. - Because **directives** and **pipes** appear in component templates, + Because **directives** and **pipes** appear in component templates, the _Angular Compiler_ incorporates them into compiled component code too. - `@NgModule` metadata tells the _Angular Compiler_ what components to compile for this module and + `@NgModule` metadata tells the _Angular Compiler_ what components to compile for this module and how to link this module with other modules. .l-hr -a#q-ngmodule-api +a#q-ngmodule-api .l-main-section :marked ## *NgModule* API @@ -1006,11 +1050,11 @@ table td(style="vertical-align: top") declarations td :marked - A list of [declarable](#q-declarables) classes, + A list of [declarable](#q-declarables) classes, the **component**, **directive** and **pipe** classes that _belong to this module_. These declared classes are visible within the module but invisible to - components in a different module unless (a) they are _exported_ from this module and + components in a different module unless (a) they are _exported_ from this module and (b) that other module _imports_ this one. Components, directives and pipes must belong to _exactly_ one module. @@ -1023,40 +1067,40 @@ table td :marked A list of dependency injection providers. - + Angular registers these providers with the root injector of the module's execution context. That's the application's root injector for all modules loaded when the application starts. Angular can inject one of these provider services into any component in the application. If this module provides the `HeroService`, or any module loaded at launch provides the `HeroService`, Angular can inject the same `HeroService` intance into any app component. - - A lazy loaded module has its own sub-root injector which typically + + A lazy loaded module has its own sub-root injector which typically is a direct child of the application root injector. Lazy loaded services are scoped to the lazy module's injector. - If a lazy loaded module also provides the `HeroService`, + If a lazy loaded module also provides the `HeroService`, any component created within that module's context (e.g., by router navigation) gets the local instance of the service, not the instance in the root application injector. - Components in external modules continue to receive the instance created for the application root. + Components in external modules continue to receive the instance created for the application root. tr td(style="vertical-align: top") imports td :marked A list of supporting modules. - - Specifically, the list of modules whose exported components, directives or pipes + + Specifically, the list of modules whose exported components, directives or pipes are referenced by the component templates declared in this module. - + A component template can [reference](#q-template-reference) another component, directive or pipe on two conditions: either the referenced class is declared in this module - or the class was imported from another module. + or the class was imported from another module. - A component can use the `NgIf` and `NgFor` directives only because its parent module + A component can use the `NgIf` and `NgFor` directives only because its parent module imported the Angular `CommonModule` (perhaps indirectly by importing `BrowserModule`). - + We can import many standard directives with the `CommonModule`. But some familiar directives belong to other modules. A component template can bind with `[(ngModel)]` only after importing the Angular `FormsModule`. @@ -1064,13 +1108,13 @@ table td(style="vertical-align: top") exports td :marked - A list of declarations — **component**, **directive**, and **pipe** classes — that + A list of declarations — **component**, **directive**, and **pipe** classes — that an importing module can use. - Exported declarations are the module's _public API_. - A component in another module can [reference](#q-template-reference) _this_ module's `HeroComponent` + Exported declarations are the module's _public API_. + A component in another module can [reference](#q-template-reference) _this_ module's `HeroComponent` if (a) it imports this module and (b) this module exports `HeroComponent`. - + Declarations are private by default. If this module does _not_ export `HeroComponent`, no other module can see it. @@ -1092,11 +1136,11 @@ table A list of components that can be bootstrapped. Usually there is only one component in this list, the _root component_ of the application. - - Angular can launch with multiple bootstrap components, + + Angular can launch with multiple bootstrap components, each with its own location in the host web page. - A bootstrap component is automatically an `entryComponent` + A bootstrap component is automatically an `entryComponent` tr td(style="vertical-align: top") entryComponents @@ -1107,7 +1151,7 @@ table Most developers will never set this property. Here's why. The [_Angular Compiler_](#q-angular-compiler) must know about every component actually used in the application. - The compiler can discover most components by walking the tree of references + The compiler can discover most components by walking the tree of references from one component template to another. But there's always at least one component that is not referenced in any template: @@ -1117,7 +1161,7 @@ table Routed components are also _entry components_ because they aren't referenced in a template either. The router creates them and drops them into the DOM near a ``. - While the bootstrapped and routed components are _entry components_, + While the bootstrapped and routed components are _entry components_, we usally don't have to add them to a module's `entryComponents` list. Angular automatically adds components in the module's `bootstrap` list to the `entryComponents` list. @@ -1126,7 +1170,7 @@ table That leaves only two sources of undiscoverable components. 1. Components bootstrapped using one of the imperative techniques. 1. Components dynamically loaded into the DOM by some means other than the router. - - Both are advanced techniques that few developers will ever employ. - If you are one of those few, you'll have to add these components to the + + Both are advanced techniques that few developers will ever employ. + If you are one of those few, you'll have to add these components to the `entryComponents` list yourself, either programmatically or by hand. diff --git a/public/docs/ts/latest/guide/ngmodule.jade b/public/docs/ts/latest/guide/ngmodule.jade index bb0cc6ca7a..d2a5ee2151 100644 --- a/public/docs/ts/latest/guide/ngmodule.jade +++ b/public/docs/ts/latest/guide/ngmodule.jade @@ -8,14 +8,14 @@ block includes **Angular Modules** help organize an application into cohesive blocks of functionality. An Angular Module is a _class_ adorned with the **@NgModule** decorator function. - `@NgModule` takes a metadata object that tells Angular how to compile and run module code. - It identifies the module's _own_ components, directives and pipes, - making some of them public so external components can use them. - It may add service providers to the application dependency injectors. - And there are more options covered here. + `@NgModule` takes a metadata object that tells Angular how to compile and run module code. + It identifies the module's _own_ components, directives and pipes, + making some of them public so external components can use them. + It may add service providers to the application dependency injectors. + And there are more options covered here. - This page explains how to **create** `NgModule` classes and how to load them, - either immediately when the application launches or later, as needed, via the [Router](router.html). + This page explains how to **create** `NgModule` classes and how to load them, + either immediately when the application launches or later, as needed, via the [Router](router.html). ## Table of Contents * [Angular modularity](#angular-modularity "Add structure to the app with NgModule") @@ -27,8 +27,8 @@ block includes * [Resolve conflicts](#resolve-conflicts "When two directives have the same selector ...") * [Feature modules](#feature-modules "Partition the app into feature modules") * [Lazy loaded modules](#lazy-load "Load modules asynchronously") with the Router - * [Shared modules](#shared-module "Create modules for commonly used components, directives, and pipes") - * [The Core module](#core-module "Create a core module with app-wide singleton services and single-use components") + * [Shared modules](#shared-module "Create modules for commonly used components, directives, and pipes") + * [The Core module](#core-module "Create a core module with app-wide singleton services and single-use components") * [Configure core services with _forRoot_](#core-for-root "Configure providers during module import") * [Prevent reimport of the _CoreModule_](#prevent-reimport "because bad things happen if a lazy loaded module imports Core") * [NgModule metadata properties](#ngmodule-properties "A technical summary of the @NgModule metadata properties") @@ -40,7 +40,7 @@ block includes * A minimal NgModule app * The first contact module * The revised contact module - * Just before adding _SharedModule_ + * Just before adding _SharedModule_ * The final version ### Frequently Asked Questions (FAQs) @@ -53,30 +53,30 @@ block includes .l-hr -a#angular-modularity +a#angular-modularity .l-main-section :marked ## Angular Modularity - + Modules are a great way to organize the application and extend it with capabilities from external libraries. - - Many Angular libraries are modules (e.g, `FormsModule`, `HttpModule`, `RouterModule`). - Many third party libraries are available as Angular modules (e.g., + + Many Angular libraries are modules (e.g, `FormsModule`, `HttpModule`, `RouterModule`). + Many third party libraries are available as Angular modules (e.g., Material Design, Ionic, AngularFire2). Angular modules consolidate components, directives and pipes into - cohesive blocks of functionality, each focused on a + cohesive blocks of functionality, each focused on a feature area, application business domain, workflow, or common collection of utilities. - + Modules can also add services to the application. Such services might be internally-developed such as the application logger. They can come from outside sources such as the Angular router and Http client. Modules can be loaded eagerly when the application starts. They can also be _lazy loaded_ asynchronously by the router. - + An Angular module is a class decorated with `@NgModule` metadata. The metadata: * declare which components, directives and pipes _belong_ to the module. @@ -84,43 +84,43 @@ a#angular-modularity * import other modules with the components, directives and pipes needed by the components in _this_ module. * provide services at the application level that any application component can use. - Every Angular app has at least one module class, the _root module_. + Every Angular app has at least one module class, the _root module_. We bootstrap that module to launch the application. The _root module_ is all we need in a simple application with a few components. - As the app grows, we refactor the _root module_ into **feature modules** - that represent collections of related functionality. + As the app grows, we refactor the _root module_ into **feature modules** + that represent collections of related functionality. We then import these modules into the _root module_. We'll see how later in the page. Let's start with the _root module_. -a#root-module +a#root-module .l-main-section :marked ## _AppModule_ - the application root module - - Every Angular app has a **root module** class. + + Every Angular app has a **root module** class. By convention it's a class called `AppModule` in a file named `app.module.ts`. This `AppModule` is about as minimal as it gets: +makeExample('ngmodule/ts/app/app.module.0.ts', '', 'app/app.module.ts (minimal)')(format=".") :marked - The `@NgModule` decorator defines the metadata for the module. + The `@NgModule` decorator defines the metadata for the module. We'll take an intuitive approach to understanding the metadata and fill in details as we go. This metadata imports a single helper module, `BrowserModule`, the module every browser app must import. - + `BrowserModule` registers critical application service providers. It also includes common directives like `NgIf` and `NgFor` which become immediately visible and usable - in any of this modules component templates. - - The `declarations` list identifies the application's only component, + in any of this modules component templates. + + The `declarations` list identifies the application's only component, the _root component_, the top of this app's rather bare component tree. The example `AppComponent` simply displays a data-bound title: +makeExample('ngmodule/ts/app/app.component.0.ts', '', 'app/app.component.ts (minimal)')(format=".") :marked - Lastly, the `@NgModule.bootstrap` property identifies this `AppComponent` as the _bootstrap component_. + Lastly, the `@NgModule.bootstrap` property identifies this `AppComponent` as the _bootstrap component_. When Angular launches the app, it places the HTML rendering of `AppComponent` in the DOM, inside the `` element tags of the `index.html` @@ -129,20 +129,20 @@ a#bootstrap :marked ## Bootstrapping in _main.ts_ We launch the application by bootstrapping the `AppModule` in the `main.ts` file. - - Angular offers a variety of bootstrapping options, targeting multiple platforms. + + Angular offers a variety of bootstrapping options, targeting multiple platforms. In this page we consider two options, both targeting the browser. ### Dynamic bootstrapping with the Just-in-time (JiT) compiler - In the first, _dynamic_ option, the [Angular compiler](../cookbook/ngmodule-faq.html#q-angular-compiler "About the Angular Compiler") + In the first, _dynamic_ option, the [Angular compiler](../cookbook/ngmodule-faq.html#q-angular-compiler "About the Angular Compiler") compiles the application in the browser and then launches the app. +makeExample('ngmodule/ts/app/main.ts', '', 'app/main.ts (dynamic)')(format=".") :marked - The samples in this page demonstrate the dynamic bootstrapping approach. + The samples in this page demonstrate the dynamic bootstrapping approach. Try the live example. - + ### Static bootstrapping with the Ahead-Of-time (AoT) compiler @@ -150,17 +150,17 @@ a#bootstrap launches faster, especially on mobile devices and high latency networks. In the _static_ option, the Angular compiler runs ahead-of-time as part of the build process, - producing a collection of class factories in their own files. + producing a collection of class factories in their own files. Among them is the `AppModuleNgFactory`. - The syntax for bootstrapping the pre-compiled `AppModuleNgFactory` is similar to + The syntax for bootstrapping the pre-compiled `AppModuleNgFactory` is similar to the dynamic version that bootstraps the `AppModule` class. +makeExample('ngmodule/ts/app/main-static.ts', '', 'app/main.ts (static)')(format=".") :marked - Because the entire application was pre-compiled, + Because the entire application was pre-compiled, we don't ship the _Angular Compiler_ to the browser and we don't compile in the browser. - + The application code downloaded to the browser is much smaller than the dynamic equivalent and it is ready to execute immediately. The performance boost can be significant. @@ -181,7 +181,7 @@ a#declarations .l-main-section :marked ## Declare directives and components - The app evolves. + The app evolves. The first addition is a `HighlightDirective`, an [attribute directive](attribute-directives.html) that sets the background color of the attached element. +makeExample('ngmodule/ts/app/highlight.directive.ts', '', 'app/highlight.directive.ts')(format=".") @@ -189,7 +189,7 @@ a#declarations We update the `AppComponent` template to attach the directive to the title: +makeExample('ngmodule/ts/app/app.component.1.ts', 'template')(format=".") :marked - If we ran the app now, Angular would not recognize the `highlight` attribute and would ignore it. + If we ran the app now, Angular would not recognize the `highlight` attribute and would ignore it. We must declare the directive in `AppModule`. Import the `HighlightDirective` class and add it to the module's `declarations` like this: @@ -198,7 +198,7 @@ a#declarations :marked ### Add a component - We decide to refactor the title into its own `TitleComponent`. + We decide to refactor the title into its own `TitleComponent`. The component's template binds to the component's `title` and `subtitle` properties like this: +makeExample('ngmodule/ts/app/title.component.html', 'v1', 'app/title.component.html')(format=".") @@ -209,7 +209,7 @@ a#declarations using an input binding to set the `subtitle`. +makeExample('ngmodule/ts/app/app.component.1.ts', '', 'app/app.component.ts (v1)')(format=".") :marked - Angular won't recognize the `` tag until we declare it in `AppModule`. + Angular won't recognize the `` tag until we declare it in `AppModule`. Import the `TitleComponent` class and add it to the module's `declarations`: +makeExample('ngmodule/ts/app/app.module.1.ts', 'component')(format=".") @@ -228,8 +228,8 @@ a#providers A module can add providers to the application's root dependency injector, making those services available everywhere in the application. - Many applications capture information about the currently logged-in user and make that information - accessible through a user service. + Many applications capture information about the currently logged-in user and make that information + accessible through a user service. This sample application has a dummy implementation of such a `UserService`. +makeExample('ngmodule/ts/app/user.service.ts', '', 'app/user.service.ts')(format=".") @@ -252,49 +252,49 @@ a#imports ## Import supporting modules The app shouldn't welcome a user if there is no user. - + Notice in the revised `TitleComponent` that an `*ngIf` directive guards the message. There is no message if there is no user. +makeExample('ngmodule/ts/app/title.component.html', 'ngIf', 'app/title.component.html (ngIf)')(format=".") :marked Although `AppModule` doesn't declare `NgIf`, the application still compiles and runs. How can that be? The Angular compiler should either ignore or complain about unrecognized HTML. - - Angular _does_ recognize `NgIf` because we imported it earlier. + + Angular _does_ recognize `NgIf` because we imported it earlier. The initial version of `AppModule` imports `BrowserModule`. +makeExample('ngmodule/ts/app/app.module.0.ts', 'imports', 'app/app.module.ts (imports)')(format=".") :marked - Importing `BrowserModule` made all of its public components, directives and pipes visible + Importing `BrowserModule` made all of its public components, directives and pipes visible to the component templates in `AppModule`. They are ready to use without further ado. .l-sub-section :marked More accurately, `NgIf` is declared in `CommonModule` from `@angular/common`. `CommonModule` contributes many of the common directives that applications need including `ngIf` and `ngFor`. - + `BrowserModule` imports `CommonModule` and [_re-exports_](../cookbook/ngmodule-faq.html#q-re-export) it. The net effect is that an importer of `BrowserModule` gets `CommonModule` directives automatically. :marked - Many familiar Angular directives do not belong to`CommonModule`. + Many familiar Angular directives do not belong to`CommonModule`. For example, `NgModel` and `RouterLink` belong to Angular's `FormsModule` and `RouterModule` respectively. We must _import_ those modules before we can use their directives. - To illustrate this point, we extend the sample app with `ContactComponent`, + To illustrate this point, we extend the sample app with `ContactComponent`, a form component that imports form support from the Angular `FormsModule`. ### Add the _ContactComponent_ [Angular Forms](forms.html) are a great way to manage user data entry. - The `ContactComponent` presents a "contact editor", + The `ContactComponent` presents a "contact editor", implemented with _Angular Forms_ in the [_template-driven form_](forms.html) style. .l-sub-section :marked - #### Angular Form Styles - + ### Angular Form Styles + We write Angular form components in either the - [_template-driven form_](forms.html) style or + [_template-driven form_](forms.html) style or the [_reactive form_](../cookbook/dynamic-form.html) style. This sample is about to import the `FormsModule` from `@angular/forms` because @@ -303,13 +303,13 @@ a#imports should import the `ReactiveFormsModule` instead. :marked - The `ContactComponent` selector matches an element named ``. + The `ContactComponent` selector matches an element named ``. Add an element with that name to the `AppComponent` template just below the ``: +makeExample('ngmodule/ts/app/app.component.1b.ts', 'template', 'app/app.component.ts (template)')(format=".") :marked - The `ContactComponent` has a lot going on. - Form components are often complex anyway and this one has its own `ContactService`, + The `ContactComponent` has a lot going on. + Form components are often complex anyway and this one has its own `ContactService`, its own [custom pipe](#pipes.html#custom-pipes) called `Awesome`, and an alternative version of the `HighlightDirective`. @@ -322,7 +322,7 @@ a#imports ngmodule/ts/app/contact/contact.service.ts, ngmodule/ts/app/contact/awesome.pipe.ts, ngmodule/ts/app/contact/highlight.directive.ts - `, + `, null, `app/contact/contact.component.html, app/contact/contact.component.ts, @@ -348,12 +348,12 @@ a#imports Add the `FormsModule` to the `AppModule` metadata's `imports` list. +makeExample('ngmodule/ts/app/app.module.1.ts', 'imports')(format=".") :marked - Now `[(ngModel)]` binding will work and the user input will be validated by Angular Forms, + Now `[(ngModel)]` binding will work and the user input will be validated by Angular Forms, once we declare our new component, pipe and directive. .alert.is-critical :marked - **Do not** add `NgModel` — or the `FORMS_DIRECTIVES` — + **Do not** add `NgModel` — or the `FORMS_DIRECTIVES` — to the `AppModule` metadata's declarations! These directives belong to the `FormsModule`. @@ -377,17 +377,17 @@ a#import-name-conflict We work around it by creating an alias for the second, contact version using the `as` JavaScript import keyword: +makeExample('ngmodule/ts/app/app.module.1b.ts', 'import-alias')(format=".") :marked - This solves the immediate problem of referencing both directive _types_ in the same file but + This solves the immediate problem of referencing both directive _types_ in the same file but leaves another problem unresoved as we discuss [below](#resolve-conflicts). :marked ### Provide the _ContactService_ The `ContactComponent` displays contacts retrieved by the `ContactService` - which Angular injects into its constructor. - + which Angular injects into its constructor. + We have to provide that service somewhere. - The `ContactComponent` _could_ provide it. - But then it would be scoped to this component _only_. + The `ContactComponent` _could_ provide it. + But then it would be scoped to this component _only_. We want to share this service with other contact-related components that we will surely add later. In this app we chose to add `ContactService` to the `AppModule` metadata's `providers` list: @@ -398,27 +398,27 @@ a#import-name-conflict a#application-scoped-providers .l-sub-section :marked - #### Application-scoped Providers - The `ContactService` provider is _application_-scoped because Angular + ### Application-scoped Providers + The `ContactService` provider is _application_-scoped because Angular registers a module's `providers` with the application's **root injector**. - Architecturally, the `ContactService` belongs to the Contact business domain. + Architecturally, the `ContactService` belongs to the Contact business domain. Classes in _other_ domains don't need the `ContactService` and shouldn't inject it. - + We might expect Angular to offer a _module_-scoping mechanism to enforce this design. It doesn't. Angular module instances, unlike components, do not have their own injectors so they can't have their own provider scopes. - This omission is intentional. - Angular modules are designed primarily to extend an application, + This omission is intentional. + Angular modules are designed primarily to extend an application, to enrich the entire app with the module's capabilities. - + Service scoping is rarely a problem in practice. Non-contact components can't inject the `ContactService` by accident. To inject `ContactService`, you must first import its _type_. Only Contact components should import the `ContactService` _type_. - See the [FAQ that pursues this issue](../cookbook/ngmodule-faq.html#q-component-scoped-providers) + See the [FAQ that pursues this issue](../cookbook/ngmodule-faq.html#q-component-scoped-providers) and its mitigations in greater detail. :marked @@ -445,9 +445,9 @@ a#application-scoped-providers :marked Try the example: - + a#resolve-conflicts -.l-main-section +.l-main-section :marked ## Resolve directive conflicts @@ -465,10 +465,10 @@ a#resolve-conflicts app/contact/highlight.directive.ts`) :marked - Will Angular use only one of them? No. + Will Angular use only one of them? No. Both directives are declared in this module so _both directives are active_. - - When the two directives compete to color the same element, + + When the two directives compete to color the same element, the directive declared later wins because its DOM changes overwrite the first. In this case, the contact's `HighlightDirective` colors the application title text blue when it should stay gold. @@ -477,7 +477,7 @@ a#resolve-conflicts :marked The real problem is that there are _two different classes_ trying to do the same thing. - It's OK to import the _same_ directive class multiple times. + It's OK to import the _same_ directive class multiple times. Angular removes duplicate classes and only registers one of them. But these are actually two different classes, defined in different files, that happen to have the same name. @@ -486,12 +486,12 @@ a#resolve-conflicts they take turns modifying the same HTML element. :marked - At least the app still compiles. - If we define two different component classes with the same selector specifying the same element tag, + At least the app still compiles. + If we define two different component classes with the same selector specifying the same element tag, the compiler reports an error. It can't insert two components in the same DOM location. - What a mess! - + What a mess! + We can eliminate component and directive conflicts by creating feature modules that insulate the declarations in one module from the declarations in another. @@ -504,7 +504,7 @@ a#feature-modules * The root `AppModule` grows larger with each new application class and shows no signs of stopping. - * We have conflicting directives. + * We have conflicting directives. The `HighlightDirective` in contact is re-coloring the work done by the `HighlightDirective` declared in `AppModule`. And it's coloring the application title text when it should only color the `ContactComponent`. @@ -516,7 +516,7 @@ a#feature-modules ### _Feature Module_ A _feature module_ is a class adorned by the `@NgModule` decorator and its metadata, - just like a root module. + just like a root module. Feature module metadata have the same properties as the metadata for a root module. The root module and the feature module share the same execution context. @@ -533,16 +533,16 @@ a#feature-modules Otherwise, a feature module is distinguished primarily by its intent. A feature module delivers a cohesive set of functionality - focused on an application business domain, a user workflow, a facility (forms, http, routing), + focused on an application business domain, a user workflow, a facility (forms, http, routing), or a collection of related utilities. - + While we can do everything within the root module, feature modules help us partition the app into areas of specific interest and purpose. - A feature module collaborates with the root module and with other modules - through the services it provides and + A feature module collaborates with the root module and with other modules + through the services it provides and the components, directives, and pipes that it chooses to share. - + In the next section, we carve the contact functionality out of the root module and into a dedicated feature module. @@ -557,16 +557,16 @@ a#feature-modules 1. Import the `ContactModule` into the `AppModule`. `AppModule` is the only _existing_ class that changes. But we do add one new file. - + ### Add the _ContactModule_ - + Here's the new `ContactModule` +makeExample('ngmodule/ts/app/contact/contact.module.2.ts', '', 'app/contact/contact.module.ts') :marked We copy from `AppModule` the contact-related import statements and the `@NgModule` properties that concern the contact and paste them in `ContactModule`. - - We _import_ the `FormsModule` because the contact component needs it. + + We _import_ the `FormsModule` because the contact component needs it. .alert.is-important :marked Modules do not inherit access to the components, directives or pipes that are declared in other modules. @@ -582,7 +582,7 @@ a#feature-modules other modules that import the `ContactModule` can include it in their component templates. All other declared contact classes are private by default. - The `AwesomePipe` and `HighlightDirective` are hidden from the rest of the application. + The `AwesomePipe` and `HighlightDirective` are hidden from the rest of the application. The `HighlightDirective` can no longer color the `AppComponent` title text. :marked @@ -600,7 +600,7 @@ a#feature-modules +makeTabs( `ngmodule/ts/app/app.module.2.ts, ngmodule/ts/app/app.module.1b.ts`, - '', + '', `app/app.module.ts (v2), app/app.module.ts (v1)`) :marked @@ -617,7 +617,7 @@ a#feature-modules * No `HighlightDirective` conflict Try this `ContactModule` version of the sample. - + Try the live example. a#lazy-load @@ -625,13 +625,13 @@ a#lazy-load :marked ## Lazy loading modules with the Router - The Heroic Staffing Agency sample app has evolved. + The Heroic Staffing Agency sample app has evolved. It has two more modules, one for managing the heroes-on-staff and another for matching crises to the heroes. - Both modules are in the early stages of development. + Both modules are in the early stages of development. Their specifics aren't important to the story and we won't discuss every line of code. .l-sub-section :marked - Examine and download the complete source for this version from the + Examine and download the complete source for this version from the live example. :marked Some facets of the current application merit discussion. @@ -656,71 +656,73 @@ a#lazy-load Some file names bear a `.3` extension indicating a difference with prior or future versions. We'll explain differences that matter in due course. - -:marked - The module still imports `ContactModule` so that its routes and components are mounted when the app starts. - The module does _not_ import `HeroModule` or `CrisisModule`. +:marked + The module still imports `ContactModule` so that its routes and components are mounted when the app starts. + + The module does _not_ import `HeroModule` or `CrisisModule`. They'll be fetched and mounted asynchronously when the user navigates to one of their routes. - - The significant change from version 2 is the addition of a ***routing*** object to the `imports`. - The routing object, which provides a configured `Router` service, is defined in the `app.routing.ts` file. + + The significant change from version 2 is the addition of the ***AppRoutingModule*** to the module `imports`. + The `AppRoutingModule` is a [_Routing Module_](../guide/router.html#routing-module) + that handles the app's routing concerns. ### App routing -+makeExample('ngmodule/ts/app/app.routing.ts', '', 'app/app.routing.ts')(format='.') ++makeExample('ngmodule/ts/app/app-routing.module.ts', '', 'app/app-routing.module.ts')(format='.') :marked - The router is the subject of [its own page](router.html) so we'll skip lightly over the details and + The router is the subject of [its own page](router.html) so we'll skip lightly over the details and concentrate on the intersection of Angular modules and routing. - This file defines three routes. - - The first redirects the empty URL (e.g., `http://host.com/`) + This file defines three routes. + + The first redirects the empty URL (e.g., `http://host.com/`) to another route whose path is `contact` (e.g., `http://host.com/contact`). - + The `contact` route isn't defined here. - It's defined in the _Contact_ feature's _own_ routing file, `contact.routing.ts`. + It's defined in the _Contact_ feature's _own_ routing module, `contact-routing.module.ts`. It's standard practice for feature modules with routing components to define their own routes. We'll get to that file in a moment. The remaining two routes use lazy loading syntax to tell the router where to find the modules: -+makeExample('ngmodule/ts/app/app.routing.ts', 'lazy-routes')(format='.') ++makeExample('ngmodule/ts/app/app-routing.module.ts', 'lazy-routes')(format='.') .l-sub-section :marked - A lazy loaded module location is a _string_, not a _type_. + A lazy loaded module location is a _string_, not a _type_. In this app, the string identifies both the module _file_ and the module _class_, the latter separated from the former by a `#`. :marked ### RouterModule.forRoot - The last line calls the `forRoot` static class method of the `RouterModule`, passing in the configuration. -+makeExample('ngmodule/ts/app/app.routing.ts', 'forRoot')(format='.') + The `forRoot` static class method of the `RouterModule` with the provided configuration, + added to the `imports` array provides the routing concerns for the module. ++makeExample('ngmodule/ts/app/app-routing.module.ts', 'forRoot')(format='.') :marked - The returned `routing` object is a `ModuleWithProviders` containing both the `RouterModule` directives - and the Dependency Injection providers that produce a configured `Router`. + The returned `AppRoutingModule` class is a `Routing Module` containing both the `RouterModule` directives + and the Dependency Injection providers that produce a configured `Router`. - This `routing` object is intended for the app _root_ module _only_. + This `AppRoutingModule` is intended for the app _root_ module _only_. .alert.is-critical :marked - Never call `RouterModule.forRoot` in a feature module. + Never call `RouterModule.forRoot` in a feature routing module. :marked - Back in the root `AppModule`, we add this `routing` object to its `imports` list, + Back in the root `AppModule`, we add the `AppRoutingModule` to its `imports` list, and the app is ready to navigate. +makeExample('ngmodule/ts/app/app.module.3.ts', 'imports', 'app/app.module.ts (imports)')(format='.') :marked ### Routing to a feature module - The `app/contact` folder holds a new file, `contact.routing.ts`. - It defines the `contact` route we mentioned a bit earlier and also creates a `routing` object like so: -+makeExample('ngmodule/ts/app/contact/contact.routing.ts', 'routing', 'app/contact/contact.routing.ts (routing)')(format='.') + The `app/contact` folder holds a new file, `contact-routing.module.ts`. + It defines the `contact` route we mentioned a bit earlier and also provides a `ContactRoutingModule` like so: ++makeExample('ngmodule/ts/app/contact/contact-routing.module.ts', 'routing', 'app/contact/contact-routing.module.ts (routing)')(format='.') :marked This time we pass the route list to the `forChild` method of the `RouterModule`. - It produces a different kind of object intended for feature modules. + It's only responsible for providing additional routes and is intended for feature modules. .alert.is-important :marked - Always call `RouterModule.forChild` in a feature module. + Always call `RouterModule.forChild` in a feature routing module. .alert.is-helpful :marked @@ -736,15 +738,15 @@ a#lazy-load +makeTabs( `ngmodule/ts/app/contact/contact.module.3.ts, ngmodule/ts/app/contact/contact.module.2.ts`, - 'class, class', + 'class, class', `app/contact/contact.module.3.ts, app/contact/contact.module.2.ts`) :marked - 1. It imports the `routing` object from `contact.routing.ts` + 1. It imports the `ContactRoutingModule` object from `contact-routing.module.ts` 1. It no longer exports `ContactComponent` Now that we navigate to `ContactComponent` with the router there's no reason to make it public. - Nor does it need a selector. + Nor does it need a selector. No template will ever again reference this `ContactComponent`. It's gone from the [_AppComponent_ template](#app-component-template). @@ -755,7 +757,7 @@ a#hero-module The lazy loaded `HeroModule` and `CrisisModule` follow the same principles as any feature module. They don't look different from the eagerly loaded `ContactModule`. - The `HeroModule` is a bit more complex than the `CrisisModule` which makes it + The `HeroModule` is a bit more complex than the `CrisisModule` which makes it a more interesting and useful example. Here's its file structure: .filetree @@ -765,13 +767,13 @@ a#hero-module .file hero-list.component.ts .file hero.component.ts .file hero.module.ts - .file hero.routing.ts + .file hero-routing.module.ts .file hero.service.ts .file highlight.directive.ts :marked This is the child routing scenario familiar to readers of the [Router](router.html#child-routing-component) page. - The `HeroComponent` is the feature's top component and routing host. - Its template has a `` that displays either a list of heroes (`HeroList`) + The `HeroComponent` is the feature's top component and routing host. + Its template has a `` that displays either a list of heroes (`HeroList`) or an editor of a selected hero (`HeroDetail`). Both components delegate to the `HeroService` to fetch and save data. @@ -782,10 +784,10 @@ a#hero-module The `HeroModule` is a feature module like any other. +makeExample('ngmodule/ts/app/hero/hero.module.3.ts', 'class', 'app/hero/hero.module.ts (class)')(format='.') :marked - It imports the `FormsModule` because the `HeroDetailComponent` template binds with `[(ngModel)]`. - It imports a `routing` object from `hero.routing.ts` just as `ContactModule` and `CrisisModule` do. + It imports the `FormsModule` because the `HeroDetailComponent` template binds with `[(ngModel)]`. + It imports the `HeroRoutingModule` from `hero-routing.module.ts` just as `ContactModule` and `CrisisModule` do. - The `CrisisModule` is much the same. There's nothing more to say that's new. + The `CrisisModule` is much the same. There's nothing more to say that's new. Try the live example. @@ -793,12 +795,12 @@ a#shared-module .l-main-section :marked ## Shared modules - - The app is shaping up. + + The app is shaping up. One thing we don't like is carrying three different versions of the `HighlightDirective`. And there's a bunch of other stuff cluttering the app folder level that could be tucked away. - Let's add a `SharedModule` to hold the common components, directives, and pipes + Let's add a `SharedModule` to hold the common components, directives, and pipes and share them with the modules that need them. * create an `app/shared` folder @@ -815,7 +817,7 @@ a#shared-module * It declares and exports the utility pipe, directive, and component classes as expected. * It re-exports the `CommonModule` and `FormsModule` - #### Re-exporting other modules + ### Re-exporting other modules While reviewing our application, we noticed that many components requiring `SharedModule` directives also use `NgIf` and `NgFor` from `CommonModule` @@ -825,9 +827,9 @@ a#shared-module We can reduce the repetition by having `SharedModule` re-export `CommonModule` and `FormsModule` so that importers of `SharedModule` get `CommonModule` and `FormsModule` _for free_. - As it happens, the components declared by `SharedModule` itself don't bind with `[(ngModel)]`. + As it happens, the components declared by `SharedModule` itself don't bind with `[(ngModel)]`. Technically, there is no need for `SharedModule` to import `FormsModule`. - + `SharedModule` can still export `FormsModule` without listing it among its `imports`. ### Why _TitleComponent_ isn't shared @@ -835,22 +837,22 @@ a#shared-module `SharedModule` exists to make commonly used components, directives and pipes available for use in the templates of components in _many_ other modules. - The `TitleComponent` is used _only once_ by the `AppComponent`. + The `TitleComponent` is used _only once_ by the `AppComponent`. There's no point in sharing it. - ### Why _UserService_ isn't shared + ### Why _UserService_ isn't shared While many components share the same service _instances_, they rely on Angular dependency injection to do this kind of sharing, not the module system. - + Several components of our sample inject the `UserService`. - There should be _only one_ instance of the `UserService` in the entire application + There should be _only one_ instance of the `UserService` in the entire application and _only one_ provider of it. - + `UserService` is an application-wide singleton. - We don't want each module to have its own separate instance. - Yet there is [a real danger](../cookbook/ngmodule-faq.html#q-why-it-is-bad) of that happening + We don't want each module to have its own separate instance. + Yet there is [a real danger](../cookbook/ngmodule-faq.html#q-why-it-is-bad) of that happening if the `SharedModule` provides the `UserService`. .alert.is-critical @@ -865,7 +867,7 @@ a#core-module At the moment, our root folder is cluttered with the `UserService` and the `TitleComponent` that only appears in the root `AppComponent`. We did not include them in the `SharedModule` for reasons just explained. - + Instead, we'll gather them in a single `CoreModule` that we **import _once_ when the app starts** and _never import anywhere else_. @@ -875,7 +877,7 @@ a#core-module * move the `UserService` and `TitleComponent` from `app/` to `app/core` * create a `CoreModule` class to own the core material * update the `AppRoot` module to import `CoreModule` - + Again, most of this is familiar blocking and tackling. The interesting part is the `CoreModule` +makeExample('ngmodule/ts/app/core/core.module.ts', 'v4', 'app/app/core/core.module.ts') .l-sub-section @@ -883,29 +885,29 @@ a#core-module We're importing some extra symbols from the Angular core library that we're not using yet. They'll become relevant later in this page. :marked - The `@NgModule` metadata should be familiar. + The `@NgModule` metadata should be familiar. We declare the `TitleComponent` because this module _owns_ it and we export it because `AppComponent` (which is in `AppModule`) displays the title in its template. `TitleComponent` needs the Angular `NgIf` directive that we import from `CommonModule`. `CoreModule` _provides_ the `UserService`. Angular registers that provider with the app root injector, - making a singleton instance of the `UserService` available to any component that needs it, + making a singleton instance of the `UserService` available to any component that needs it, whether that component is eagerly or lazily loaded. .l-sub-section :marked - #### Why bother? - This scenario is clearly contrived. + ### Why bother? + This scenario is clearly contrived. The app is too small to worry about a single service file and a tiny, one-time component. A `TitleComponent` sitting in the root folder isn't bothering anyone. The root `AppModule` can register the `UserService` itself, as it does currently, even if we decide to relocate the `UserService` file to the `app/core` folder. - Real world apps have more to worry about. + Real world apps have more to worry about. They can have several single-use components (e.g., spinners, message toasts, and modal dialogs) - that appear only in the `AppComponent` template. - We don't import them elsewhere so they're not _shared_ in that sense. + that appear only in the `AppComponent` template. + We don't import them elsewhere so they're not _shared_ in that sense. Yet they're too big and messy to leave loose in the root folder. Apps often have many singleton services like this sample's `UserService`. @@ -922,10 +924,10 @@ a#core-module .l-main-section :marked ## Cleanup - Having refactored to a `CoreModule` and a `SharedModule`, it's time to cleanup the other modules. + Having refactored to a `CoreModule` and a `SharedModule`, it's time to cleanup the other modules. ### A trimmer _AppModule_ - + Here is the updated `AppModule` paired with version 3 for comparison: +makeTabs( `ngmodule/ts/app/app.module.ts, @@ -964,7 +966,7 @@ a#core-for-root ## Configure core services with _CoreModule.forRoot_ A module that adds providers to the application can offer a facility for configuring those providers as well. - + By convention, the **_forRoot_** static method both provides and configures services at the same time. It takes a service configuration object and returns a [ModuleWithProviders](../api/core/index/ModuleWithProviders-interface.html) which is @@ -975,8 +977,8 @@ a#core-for-root The root `AppModule` imports the `CoreModule` and adds the `providers` to the `AppModule` providers. .l-sub-section :marked - More precisely, Angular accumulates all imported providers _before_ appending the items listed in `@NgModule.providers`. - This sequence ensures that whatever we add explicitly to the `AppModule` providers takes precedence + More precisely, Angular accumulates all imported providers _before_ appending the items listed in `@NgModule.providers`. + This sequence ensures that whatever we add explicitly to the `AppModule` providers takes precedence over the providers of imported modules. :marked Let's add a `CoreModule.forRoot` method that configures the core `UserService`. @@ -1008,10 +1010,10 @@ a#prevent-reimport :marked ## Prevent reimport of the _CoreModule_ - Only the root `AppModule` should import the `CoreModule`. + Only the root `AppModule` should import the `CoreModule`. [Bad things happen](../cookbook/ngmodule-faq.html#q-why-it-is-bad) if a lazy loaded module imports it. - We could _hope_ that no developer makes that mistake. + We could _hope_ that no developer makes that mistake. Or we can guard against it and fail fast by adding the following `CoreModule` constructor. +makeExample('ngmodule/ts/app/core/core.module.ts', 'ctor')(format='.') :marked @@ -1020,25 +1022,25 @@ a#prevent-reimport The injection _would be circular_ if Angular looked for `CoreModule` in the _current_ injector. The `@SkipSelf` decorator means "_look for_ `CoreModule` _in an ancestor injector, above me in the injector hierarchy._" - - If the constructor executes as intended in the `AppModule`, + + If the constructor executes as intended in the `AppModule`, there is no ancestor injector that could provide an instance of `CoreModule`. The injector should give up. By default the injector throws an error when it can't find a requested provider. - The `@Optional` decorator means not finding the service is OK. + The `@Optional` decorator means not finding the service is OK. The injector returns `null`, the `parentModule` parameter is null, and the constructor concludes uneventfully. It's a different story if we improperly import `CoreModule` into a lazy loaded module such as `HeroModule` (try it). - + Angular creates a lazy loaded module with its own injector, a _child_ of the root injector. `@SkipSelf` causes Angular to look for a `CoreModule` in the parent injector which this time is the root injector. - Of course it finds the instance imported by the root `AppModule`. + Of course it finds the instance imported by the root `AppModule`. Now `parentModule` exists and the constructor throws the error. :marked ### Conclusion - + You made it! You can examine and download the complete source for this final version from the live example. diff --git a/public/docs/ts/latest/guide/router.jade b/public/docs/ts/latest/guide/router.jade index 733ac4753b..f476f43736 100644 --- a/public/docs/ts/latest/guide/router.jade +++ b/public/docs/ts/latest/guide/router.jade @@ -46,6 +46,7 @@ include ../_util-fns * toggling css classes for the [active router link](#router-link-active) * embedding critical information in the URL with [route parameters](#route-parameters) * providing non-critical information in [optional route parameters](#optional-route-parameters) + * refactoring routing into a [routing module](#routing-module) * add [child routes](#child-routing-component) under a feature section * [grouping child routes](#component-less-route) without a component * [redirecting](#redirect) from one route to another @@ -87,7 +88,7 @@ include ../_util-fns It is not part of the Angular core. It is in its own library package, `@angular/router`. We import what we need from it as we would from any other Angular package. -+makeExcerpt('app/app.routing.ts (import)', 'import-router') ++makeExcerpt('app/app.module.1.ts (import)', 'import-router') .l-sub-section :marked @@ -100,13 +101,14 @@ include ../_util-fns A router has no routes until we configure it. We bootstrap our application with an array of routes that we'll provide to our **`RouterModule.forRoot`** function. - In the following example, we configure our application with four route definitions. + In the following example, we configure our application with four route definitions. The configured `RouterModule` is + add to the `AppModule`'s `imports` array. -+makeExcerpt('app/app.routing.1.ts (excerpt)', 'route-config') ++makeExcerpt('app/app.module.0.ts (excerpt)', 'route-config') .l-sub-section :marked - The `Routes` is an array of *routes* that describe how to navigate. + The `RouterModule` is provided an array of *routes* that describe how to navigate. Each *Route* maps a URL `path` to a component. There are no **leading slashes** in our **path**. The router parses and builds the URL for us, @@ -135,14 +137,6 @@ include ../_util-fns that matches as the default route. The wildcard route is listed last as it's the most generic route and should be matched **only** if no other routes are matched first. -:marked - We export the `routing` constant so we can import it into our `app.module.ts` file where we'll add - a configured *Router* module to our `AppModule` imports. -:marked - Next we open `app.module.ts` where we must register our routing, routing providers, and declare our two route components. - -+makeExcerpt('app/app.module.1.ts (basic setup)', 'router-basics') - :marked ### Router Outlet Given this configuration, when the browser URL for this application becomes `/heroes`, @@ -192,7 +186,7 @@ code-example(language="html"). that make up the current state of the router. We can access the current `RouterState` from anywhere in our application using the `Router` service and the `routerState` property. - The router state provides us with methods to traverse up and down the route tree from any activated route + Each `ActivatedRoute` in the `RouterState` provides methods to traverse up and down the route tree to get information we may need from parent, child and sibling routes. :marked @@ -413,20 +407,6 @@ a#base-href need routing and, depending on your requirements, you may need a different routing library. We teach our router how to navigate by configuring it with routes. - We recommend creating a separate `app.routing.ts` file dedicated to this purpose. - -:marked - Here is our first configuration. We pass the array of routes to the `RouterModule.forRoot` method - which returns a module containing the configured `Router` service provider ... and some other, - unseen providers that the routing library requires. We export this as the `routing` token. - -+makeExcerpt('app/app.routing.2.ts') - -.l-sub-section - :marked - We also export an empty `appRoutingProviders` array - so we can simplify registration of router dependencies later in `app.module.ts`. - We don't have any providers to register right now. But we will. a#route-config h4#define-routes Define routes @@ -451,25 +431,23 @@ h4#define-routes Define routes the `CrisisListComponent`, display its view, and update the browser's address location and history with the URL for that path.* -.l-sub-section - :marked - Learn about *providers* in the [Dependency Injection](dependency-injection.html#!#injector-providers) chapter. - -h4#register-providers Register routing in the AppModule :marked - Our app launches from the `app.module.ts` file in the `/app` folder. - - We import the `routing` token we exported from the `app.routing.ts` file and add it to the `imports` array. - - We import our `CrisisListComponent` and `HeroListComponent` components and add them to our *declarations* - so they will be registered within our `AppModule`. - - We also import the `appRoutingProviders` array and add it to the `providers` array. + Here is our first configuration. We pass the array of routes to the `RouterModule.forRoot` method + which returns a module containing the configured `Router` service provider ... and some other, + unseen providers that the routing library requires. Once our application is bootstrapped, the `Router` + will perform the initial navigation based on the current browser URL. +makeExcerpt('app/app.module.1.ts') +.l-sub-section + :marked + Adding the configured `RouterModule` to the `AppModule` is sufficient for simple route configurations. + As our application grows, we'll want to refactor our routing configuration into a separate file + and create a **[Routing Module](#routing-module)**, a special type of `Service Module` dedicating for the purpose + of routing in feature modules. + :marked - Providing the router module in our `AppModule` makes the Router available everywhere in our application. + Providing the `RouterModule` in our `AppModule` makes the Router available everywhere in our application. h3#shell The AppComponent shell :marked @@ -562,7 +540,6 @@ h3#router-directives Router Directives .children .file app.component.ts .file app.module.ts - .file app.routing.ts .file crisis-list.component.ts .file hero-list.component.ts .file main.ts @@ -579,7 +556,6 @@ h3#router-directives Router Directives +makeTabs( `router/ts/app/app.component.1.ts, router/ts/app/app.module.1.ts, - router/ts/app/app.routing.2.ts, router/ts/app/main.ts, router/ts/app/hero-list.component.ts, router/ts/app/crisis-list.component.ts, @@ -587,15 +563,85 @@ h3#router-directives Router Directives ',,,,', `app.component.ts, app.module.ts, - app.routing.ts, main.ts, hero-list.component.ts, crisis-list.component.ts, index.html`) +.l-main-section#routing-module +:marked + ## Milestone #2: The *Routing Module* + + In our initial route configuration, we provided a simple setup with two routes used + to configure our application for routing. This is perfectly fine for simple routing. + As our application grows and we make use of more *Router* features, such as guards, + resolvers, and child routing, we'll naturally want to refactor our routing. We + recommend moving the routing into a separate file using a special-purpose + service called a *Routing Module*. + + The **Routing Module** + * separates our routing concerns from our feature module + * provides a module to replace or remove when testing our feature module + * provides a common place for require routing service providers including guards and resolvers + * is **not** concerned with feature [module declarations](../cookbook/ngmodule-faq.html#!#routing-module) + +:marked + ### Refactor routing into a module + + We'll create a file named `app-routing.module.ts` in our `/app` folder to + contain our `Routing Module`. The routing module will import our `RouterModule` tokens + and configure our routes. We'll follow the convention of our filename and name + the Angular module `AppRoutingModule`. + + We import the `CrisisListComponent` and the `HeroListComponent` components + just like we did in the `app.module.ts`. Then we'll move the `Router` imports + and routing configuration including `RouterModule.forRoot` into our routing module. + + We'll also export the `AppRoutingModule` so we can add it to our `AppModule` imports. + + Our last step is to re-export the `RouterModule`. By re-exporting the `RouterModule`, + our feature module will be provided with the `Router Directives` when using our `Routing Module`. + + Here is our first `Routing Module`: + ++makeExcerpt('app/app-routing.module.1.ts') + +:marked + Next, we'll update our `app.module.ts` file by importing our `AppRoutingModule` token + from the `app-routing.module.ts` and replace our `RouterModule.forRoot` with our newly + created `AppRoutingModule`. + ++makeExcerpt('app/app.module.2.ts') + +:marked + Our application continues to work just the same, and we can use our routing module as + the central place to maintain our routing configuration for each feature module. + +a#why-routing-module +:marked + ### Do you need a _Routing Module_? + + The _Routing Module_ *replaces* the routing configuration in the root or feature module. + _Either_ configure routes in the Routing Module _or_ within the module itself but not in both. + + The Routing Module is a design choice whose value is most obvious when the configuration is complex + and includes specialized guard and resolver services. + It can seem like overkill when the actual configuration is dead simple. + + Some developers skip the Routing Module (e.g., `AppRoutingModule`) when the configuration is simple and + merge the routing configuration directly into the companion module (e.g., `AppModule`). + + We recommend that you choose one pattern or the other and follow that pattern consistently. + + Most developers should always implement a Routing Module for the sake of consistency. + It keeps the code clean when configuration becomes complex. + It makes testing the feature module easier. + Its existence calls attention to the fact that a module is routed. + It is where developers expect to find and expand routing configuration. + .l-main-section#heroes-feature :marked - ## Milestone #2: The Heroes Feature + ## Milestone #3: The Heroes Feature We've seen how to navigate using the `RouterLink` directive. @@ -677,20 +723,25 @@ figure.image-display We recommend giving each feature area its own route configuration file. - Create a new `heroes.routing.ts` in the `heroes` folder like this: + Create a new `heroes-routing.module.ts` in the `heroes` folder like this: -+makeExcerpt('app/heroes/heroes.routing.ts') ++makeExcerpt('app/heroes/heroes-routing.module.ts') + +.l-sub-section + :marked + Keep the Routing Module file in the same folder as its companion module file. + Here both `heroes-routing.module.ts` and `heroes.module.ts` are in the same `app/heroes` folder. :marked - We use the same techniques we learned for `app.routing.ts`. + We use the same techniques we learned in creating the `app-routing.module.ts`. We import the two components from their new locations in the `app/heroes/` folder, define the two hero routes. - and add export our `heroesRouting` that returns configured `RouterModule` for our feature module. + and add export our `HeroRoutingModule` that returns our `RoutingModule` for the hero feature module. :marked Now that we have routes for our `Heroes` module, we'll need to register them with the *Router*. - We'll import the *RouterModule* like we did in the `app.routing.ts`, but there is a slight difference here. - In our `app.routing.ts`, we used the static **forRoot** method to register our routes and application level + We'll import the *RouterModule* like we did in the `app-routing.module.ts`, but there is a slight difference here. + In our `app-routing.module.ts`, we used the static **forRoot** method to register our routes and application level service providers. In a feature module we use static **forChild** method. .l-sub-section @@ -699,7 +750,7 @@ figure.image-display module, we'll use **RouterModule.forChild** method to only register additional routes. :marked - We import our `heroesRouting` token from `heroes.routing.ts` into our `Heroes` module and register the routing. + We import our `HeroRoutingModule` token from `heroes-routing.module.ts` into our `Heroes` module and register the routing. +makeExcerpt('app/heroes/heroes.module.ts (heroes routing)', 'heroes-routes') @@ -707,7 +758,7 @@ figure.image-display ### Route definition with a parameter The route to `HeroDetailComponent` has a twist. -+makeExcerpt('app/heroes/heroes.routing.ts (excerpt)', 'hero-detail-route') ++makeExcerpt('app/heroes/heroes-routing.module.ts (excerpt)', 'hero-detail-route') :marked Notice the `:id` token in the path. That creates a slot in the path for a **Route Parameter**. @@ -963,7 +1014,7 @@ figure.image-display The router embedded the `id` value in the navigation URL because we had defined it as a route parameter with an `:id` placeholder token in the route `path`: -+makeExcerpt('app/heroes/heroes.routing.ts', 'hero-detail-route') ++makeExcerpt('app/heroes/heroes-routing.module.ts', 'hero-detail-route') :marked When the user clicks the back button, the `HeroDetailComponent` constructs another *link parameters array* @@ -975,7 +1026,7 @@ figure.image-display This array lacks a route parameter because we had no reason to send information to the `HeroListComponent`. Now we have a reason. We'd like to send the id of the current hero with the navigation request so that the - `HeroListComponent` can highlight that hero in its list. + `HeroListComponent` can highlight that hero in its list. This is a _nice-to-have_ feature; the list will display perfectly well without it. We do that with an object that contains an _optional_ `id` parameter. @@ -1125,7 +1176,7 @@ h3#merge-hero-routes Import hero module into AppModule Update `app.module.ts` as follows: -+makeExcerpt('app/app.module.2.ts (heroes module import)', 'hero-import') ++makeExcerpt('app/app.module.3.ts (heroes module import)', 'hero-import') :marked We imported the `HeroesModule` and added it to our `AppModule`'s `imports`. @@ -1145,9 +1196,9 @@ h3#merge-hero-routes Import hero module into AppModule We can evolve the hero feature with more components and different routes. That's a key benefit of creating a separate module for each feature area. - Since our `Heroes` routes are defined within our feature module, we can also remove our initial `heroes` route from the `app.routing.ts`. + Since our `Heroes` routes are defined within our feature module, we can also remove our initial `heroes` route from the `app-routing.module.ts`. -+makeExcerpt('app/app.routing.3.ts (v2)', '') ++makeExcerpt('app/app-routing.module.2.ts (v2)', '') :marked ### Heroes App Wrap-up @@ -1173,10 +1224,10 @@ h3#merge-hero-routes Import hero module into AppModule .file hero-list.component.ts .file hero.service.ts .file heroes.module.ts - .file heroes.routing.ts + .file heroes-routing.module.ts .file app.component.ts .file app.module.ts - .file app.routing.ts + .file app-routing.module.ts .file crisis-list.component.ts .file main.ts .file node_modules ... @@ -1193,26 +1244,26 @@ h3#merge-hero-routes Import hero module into AppModule +makeTabs( `router/ts/app/app.component.1.ts, - router/ts/app/app.module.2.ts, - router/ts/app/app.routing.3.ts, + router/ts/app/app.module.3.ts, + router/ts/app/app-routing.module.3.ts, router/ts/app/heroes/hero-list.component.ts, router/ts/app/heroes/hero-detail.component.ts, router/ts/app/heroes/hero.service.ts, router/ts/app/heroes/heroes.module.ts, - router/ts/app/heroes/heroes.routing.ts`, + router/ts/app/heroes/heroes-routing.module.ts`, null, `app.component.ts, app.module.ts, - app.routing.ts, + app-routing.module.ts, hero-list.component.ts, hero-detail.component.ts, hero.service.ts, heroes.module.ts, - heroes.routing.ts`) + heroes-routing.module.ts`) .l-main-section#crisis-center-feature :marked - ## Milestone #3: The Crisis Center + ## Milestone #4: The Crisis Center The *Crisis Center* is a fake view at the moment. Time to make it useful. @@ -1240,9 +1291,6 @@ h3#merge-hero-routes Import hero module into AppModule * The router should block access to certain features until the user logs-in. - * Our `CrisisService` is only needed within the *Crisis Center* module. - We should limit access to it to that module. - * Changes to a feature module such as *Crisis Center* shouldn't provoke changes to the `AppModule` or any other feature's component. We need to [*separate our concerns*](https://blog.8thlight.com/uncle-bob/2014/05/08/SingleReponsibilityPrinciple.html). @@ -1298,31 +1346,6 @@ a#child-routing-component We *can* give it a selector. There's no harm in it. Our point is that we don't *need* one because we only *navigate* to it. -:marked - ### Service isolation - - The `CrisisService` is neither needed nor wanted outside the *Crisis Center* domain. - Instead of registering it with the `AppModule`'s providers — - which makes it visible everywhere — - we register the `CrisisService` in the `CrisisCenterModule` providers array. - -+makeExcerpt('app/crisis-center/crisis-center.module.1.ts', 'providers', '') - -:marked - This limits the scope of the `CrisisService` to the *Crisis Center* routes. - No module outside of the *Crisis Center* can access it. - - There's a practical benefit to restricting its scope in this way. - - First we can evolve the service independently of the rest of the application - without fear of breaking what should be unrelated modules. - - Second, we can delay loading this service into memory until we need it. - We can remove it from the application launch bundle, - reducing the size of the initial payload and improving performance. - We can load it optionally, [asynchronously](#asynchronous-routing) with the other *Crisis Center* components - if and when the user begins that workflow. - :marked ### Child Route Configuration @@ -1334,10 +1357,10 @@ a#child-routing-component +makeExcerpt('app/crisis-center/crisis-center-home.component.ts (minus imports)', 'minus-imports') :marked - We create a `crisis-center.routing.ts` file as we did the `heroes.routing.ts` file. + We create a `crisis-center-routing.module.ts` file as we did the `heroes-routing.module.ts` file. But this time we define **child routes** *within* the parent `crisis-center` route. -+makeExcerpt('app/crisis-center/crisis-center.routing.1.ts (Routes)', 'routes') ++makeExcerpt('app/crisis-center/crisis-center-routing.module.1.ts (Routes)', 'routes') :marked Notice that the parent `crisis-center` route has a `children` property @@ -1378,22 +1401,22 @@ code-example. localhost:3000/crisis-center/2 :marked - Here's the complete `crisis-center.routing.ts` file with its imports. + Here's the complete `crisis-center-routing.module.ts` file with its imports. -+makeExcerpt('app/crisis-center/crisis-center.routing.1.ts', '') ++makeExcerpt('app/crisis-center/crisis-center-routing.module.1.ts', '') h3#import-crisis-module Import crisis center module into the AppModule routes :marked As with the `Heroes` module, we must import the `Crisis Center` module into the `AppModule`: -+makeExcerpt('app/app.module.3.ts (Crisis Center Module)', 'crisis-center-module') ++makeExcerpt('app/app.module.4.ts (import CrisisCenterModule)', 'crisis-center-module') :marked - We also remove the initial crisis center route from our `app.routing.ts`. Our routes - are now being provided by our `HeroesModule` and our `CrisisCenter` feature modules. We'll keep our `app.routing.ts` file + We also remove the initial crisis center route from our `app-routing.module.ts`. Our routes + are now being provided by our `HeroesModule` and our `CrisisCenter` feature modules. We'll keep our `app-routing.module.ts` file for general routes which we'll cover later in the chapter. -+makeExcerpt('app/app.routing.4.ts (v3)', '') ++makeExcerpt('app/app-routing.module.3.ts (v3)', '') a#redirect :marked @@ -1414,7 +1437,7 @@ code-example. The preferred solution is to add a `redirect` route that transparently translates from the initial relative URL (`''`) to the desired default path (`/crisis-center`): -+makeExcerpt('app/crisis-center/crisis-center.routing.2.ts' , 'redirect', '') ++makeExcerpt('app/crisis-center/crisis-center-routing.module.2.ts' , 'redirect', '') :marked A redirect route requires a `pathMatch` property to tell the router how to match a URL to the path of a route. @@ -1445,7 +1468,7 @@ code-example. :marked The updated route definitions look like this: -+makeExcerpt('app/crisis-center/crisis-center.routing.2.ts (routes v2)' , 'routes') ++makeExcerpt('app/crisis-center/crisis-center-routing.module.2.ts (routes v2)' , 'routes') .l-main-section h2#relative-navigation Relative Navigation @@ -1522,7 +1545,7 @@ h2#relative-navigation Relative Navigation .l-main-section h2#guards Route Guards :marked - ## Milestone #4: Route Guards + ## Milestone #5: Route Guards At the moment, *any* user can navigate *anywhere* in the application *anytime*. @@ -1597,7 +1620,7 @@ a#can-activate-guard .file admin-dashboard.component.ts .file admin.component.ts .file admin.module.ts - .file admin.routing.ts + .file admin-routing.module.ts .file manage-crises.component.ts .file manage-heroes.component.ts @@ -1631,7 +1654,7 @@ a#can-activate-guard :marked Our initial admin routing configuration: -+makeExcerpt('app/admin/admin.routing.1.ts (admin routing)', 'admin-routes') ++makeExcerpt('app/admin/admin-routing.module.1.ts (admin routing)', 'admin-routes') h3#component-less-route Component-Less Route: grouping routes without a component :marked @@ -1646,7 +1669,7 @@ h3#component-less-route Component-Less Route: grouping routes without a c Next, we'll import the `AdminModule` into our `app.module.ts` and add it to the `imports` array to register our admin routes. -+makeExcerpt('app/app.module.3.ts (admin module)', 'admin-module') ++makeExcerpt('app/app.module.4.ts (admin module)', 'admin-module') :marked And we add a link to the `AppComponent` shell that users can click to get to this feature. @@ -1671,10 +1694,10 @@ h3#component-less-route Component-Less Route: grouping routes without a c +makeExcerpt('app/auth-guard.service.1.ts') :marked - Next we open `admin.routing.ts `, import the `AuthGuard` class, and + Next we open `admin-routing.module.ts `, import the `AuthGuard` class, and update the admin route with a `CanActivate` guard property that references it: -+makeExcerpt('app/admin/admin.routing.2.ts (guarded admin route)', 'admin-route') ++makeExcerpt('app/admin/admin-routing.module.2.ts (guarded admin route)', 'admin-route') :marked Our admin feature is now protected by the guard, albeit protected poorly. @@ -1716,20 +1739,19 @@ h3#component-less-route Component-Less Route: grouping routes without a c to our stored URL if available, or use the default URL. There is nothing new about this component or the way we wire it into the router configuration. - We'll register a `/login` route in our `app.routing.ts` and add the necessary providers to the `appRoutingProviders` - array we created earlier. In our `app.module.ts`, we'll import the `LoginComponent` and add it to our `AppModule` `declarations`. + We'll register a `/login` route in our `login-routing.module.ts` and add the necessary providers to the `providers` + array. In our `app.module.ts`, we'll import the `LoginComponent` and add it to our `AppModule` `declarations`. + We'll also import and add the `LoginRoutingModule` to our `AppModule` imports. +makeTabs( `router/ts/app/app.module.ts, - router/ts/app/app.routing.6.ts, router/ts/app/login.component.1.ts, - router/ts/app/login.routing.ts + router/ts/app/login-routing.module.ts `, null, `app/app.module.ts, - app/app.routing.ts, app/login.component.ts, - app/login.routing.ts + app/login-routing.module.ts `) .l-sub-section @@ -1759,7 +1781,7 @@ h3#can-activate-child-guard CanActivateChild: guarding child routes We add the same `AuthGuard` to our `component-less` admin route to protect all other child routes at one time instead of adding the `AuthGuard` to each route individually. -+makeExcerpt('app/admin/admin.routing.3.ts (excerpt)', 'can-activate-child') ++makeExcerpt('app/admin/admin-routing.module.3.ts (excerpt)', 'can-activate-child') h3#can-deactivate-guard CanDeactivate: handling unsaved changes :marked @@ -1851,14 +1873,14 @@ a#CanDeactivate to resolve to truthy (navigate) or falsey (stay put). :marked - We add the `Guard` to our crisis detail route in `crisis-center.routing.ts` using the `canDeactivate` array. + We add the `Guard` to our crisis detail route in `crisis-center-routing.module.ts` using the `canDeactivate` array. -+makeExcerpt('app/crisis-center/crisis-center.routing.3.ts (can deactivate guard)', '') ++makeExcerpt('app/crisis-center/crisis-center-routing.module.3.ts (can deactivate guard)', '') :marked - We also need to add the `Guard` to our main `appRoutingProviders` so the `Router` can inject it during the navigation process. + We also need to add the `Guard` to our main `AppRoutingModule` `providers` so the `Router` can inject it during the navigation process. -+makeExample('app/app.routing.6.ts', '', '') ++makeExample('app/app-routing.module.4.ts', '', '') :marked Now we have given our user a safeguard against unsaved changes. @@ -1909,14 +1931,11 @@ h3#resolve-guard Resolve: pre-fetching component data We'll use our `CrisisService.getCrisis` method that returns a promise to prevent our route from loading until the data is fetched. If we don't find a valid `Crisis`, we navigate the user back to the `CrisisList`, canceling the previous in-flight navigation to the crisis details. - Now that our guard is ready, we'll import it in our `crisis-center.routing.ts` and use the `resolve` object in our route configuration. + Now that our guard is ready, we'll import it in our `crisis-center-routing.module.ts` and use the `resolve` object in our route configuration. -+makeExcerpt('app/crisis-center/crisis-center.routing.ts (resolve)', 'crisis-detail-resolve') + We'll add the `CrisisDetailResolve` service to our `CrisisCenterRoutingModule`'s `providers`, so its available to the `Router` during the navigation process. -:marked - We'll add the `CrisisDetailResolve` service to our crisis center module's `providers`, so its available to the `Router` during the navigation process. - -+makeExcerpt('app/crisis-center/crisis-center.module.ts (crisis detail resolve provider)', 'crisis-detail-resolve') ++makeExcerpt('app/crisis-center/crisis-center-routing.module.ts (resolve)', 'crisis-detail-resolve') :marked Now that we've added our `Resolve` guard to fetch data before the route loads, we no longer need to do this once we get into our `CrisisDetailComponent`. @@ -1940,7 +1959,7 @@ h3#resolve-guard Resolve: pre-fetching component data `router/ts/app/app.component.ts, router/ts/app/crisis-center/crisis-center-home.component.ts, router/ts/app/crisis-center/crisis-center.component.ts, - router/ts/app/crisis-center/crisis-center.routing.ts, + router/ts/app/crisis-center/crisis-center-routing.module.ts, router/ts/app/crisis-center/crisis-list.component.ts, router/ts/app/crisis-center/crisis-detail.component.ts, router/ts/app/crisis-center/crisis-detail-resolve.service.ts, @@ -1950,7 +1969,7 @@ h3#resolve-guard Resolve: pre-fetching component data `app.component.ts, crisis-center-home.component.ts, crisis-center.component.ts, - crisis-center.routing.ts, + crisis-center-routing.module.ts, crisis-list.component.ts, crisis-detail.component.ts, crisis-detail-resolve.service.ts, @@ -2026,7 +2045,7 @@ a#fragment .l-main-section :marked - ## Milestone #5: Asynchronous Routing + ## Milestone #6: Asynchronous Routing As we have completed our milestones, our application has naturally gotten larger. As we continue to build out feature areas our overall application size will get larger also. At some point we'll reach a tipping @@ -2047,27 +2066,22 @@ a#fragment :marked ### Lazy-Loading route configuration - We'll start by adding an `admin` route to our `app.routing.ts` file. We want to load our `Admin` module asynchronously, + We'll start by adding an `admin` route to our `app-routing.module.ts` file. We want to load our `Admin` module asynchronously, so we'll use the `loadChildren` property in our route config where previously we used the `children` property to include our child routes. - We'll also change our `admin` **path** in our `admin.routing.ts` to an empty path. The `Router` supports + We'll also change our `admin` **path** in our `admin-routing.module.ts` to an empty path. The `Router` supports *empty path* routes, which we can use for grouping routes together without adding anything additional paths to the URL. Our users will still visit `/admin` and our `AdminComponent` still serves as our *Routing Component* which contains our child routes. +makeTabs( - `router/ts/app/app.routing.ts, - router/ts/app/admin/admin.routing.ts`, + `router/ts/app/app-routing.module.ts, + router/ts/app/admin/admin-routing.module.ts`, 'lazy-load-admin,', - `app.routing.ts (load children), - app/admin/admin.routing.ts (empty path admin) + `app-routing.module.ts (load children), + app/admin/admin-routing.module.ts (empty path admin) `) -.l-sub-section - :marked - We use the ES2015 `spread` feature to flatten the route arrays of our `adminRoutes` and `loginRoutes` - into our `appRoutes` array to provide a simple array of routes. - :marked The `loadChildren` property is used by the `Router` to map to our bundle we want to lazy-load, in this case being the `AdminModule`. @@ -2116,10 +2130,10 @@ h3#can-load-guard CanLoad Guard: guarding against loading of feature modu +makeExcerpt('app/auth-guard.service.ts (can load guard)', '') :marked - Next, we'll import the `AuthGuard` into our `app.routing.ts` and add the `AuthGuard` to the `canLoad` array for + Next, we'll import the `AuthGuard` into our `app-routing.module.ts` and add the `AuthGuard` to the `canLoad` array for our `admin` route. Now our `admin` feature area is only loaded when the proper access has been granted. -+makeExcerpt('app/app.routing.ts (can load guard)', 'can-load-guard') ++makeExcerpt('app/app-routing.module.ts (can load guard)', 'can-load-guard') .l-main-section @@ -2325,4 +2339,4 @@ code-example(format=".", language="bash"). providing the `useHash: true` in an object as the second argument of the `RouterModule.forRoot` in our `AppModule`. -+makeExcerpt('app/app.module.5.ts (hash URL strategy)', '') ++makeExcerpt('app/app.module.6.ts (hash URL strategy)', '') diff --git a/public/docs/ts/latest/tutorial/_data.json b/public/docs/ts/latest/tutorial/_data.json index 54b30c6db2..ab92fcda11 100644 --- a/public/docs/ts/latest/tutorial/_data.json +++ b/public/docs/ts/latest/tutorial/_data.json @@ -27,7 +27,7 @@ }, "toh-pt5": { "title": "Routing", - "intro": "We add the Angular Component Router and learn to navigate among the views", + "intro": "We add the Angular Router and learn to navigate among the views", "nextable": true }, "toh-pt6": { diff --git a/public/docs/ts/latest/tutorial/toh-pt5.jade b/public/docs/ts/latest/tutorial/toh-pt5.jade index 564537fa60..4101aa4646 100644 --- a/public/docs/ts/latest/tutorial/toh-pt5.jade +++ b/public/docs/ts/latest/tutorial/toh-pt5.jade @@ -2,7 +2,7 @@ block includes include ../_util-fns - - var _appRoutingTsVsAppComp = 'app.routing.ts' + - var _appRoutingTsVsAppComp = 'app.module.ts' - var _declsVsDirectives = 'declarations' - var _RoutesVsAtRouteConfig = 'Routes' - var _RouterModuleVsRouterDirectives = 'RouterModule' @@ -194,7 +194,7 @@ block router-config-intro ### Configure routes Our application doesn't have any routes yet. - We'll start by creating a configuration file for the application routes. + We'll start by creating a configuration for the application routes. :marked *Routes* tell the router which views to display when a user clicks a link or @@ -202,11 +202,12 @@ block router-config-intro Let's define our first route as a route to the heroes component: -- var _file = _docsFor == 'dart' ? 'app.component.ts' : 'app.routing.ts' +- var _file = _docsFor == 'dart' ? 'app.component.ts' : 'app.module.2.ts' +makeExcerpt('app/' + _file + ' (heroes route)', 'heroes') - var _are = _docsFor == 'dart' ? 'takes' : 'are' - var _routePathPrefix = _docsFor == 'dart' ? '/' : '' + :marked The `!{_RoutesVsAtRouteConfig}` !{_are} !{_an} !{_array} of *route definitions*. We have only one route definition at the moment but rest assured, we'll add more. @@ -224,24 +225,18 @@ block router-config-intro +ifDocsFor('ts|js') :marked - We'll export a `routing` constant initialized using the `RouterModule.forRoot` method applied to our !{_array} of routes. - This method returns a **configured router module** that we'll add to our root NgModule, `AppModule`. + ### Make the router available - +makeExcerpt('app/app.routing.1.ts (excerpt)', 'routing-export') + We've setup the initial route configuration. Now we'll add it to our `AppModule`. + We'll add our configured `RouterModule` to the `AppModule` imports !{_array}. + + +makeExcerpt('app/app.module.2.ts (app routing)', '') .l-sub-section :marked - We call the `forRoot` method because we're providing a configured router at the _root_ of the application. - The `forRoot` method gives us the Router service providers and directives needed for routing. - - :marked - ### Make the router available - - We've setup initial routes in the `app.routing.ts` file. Now we'll add it to our root NgModule. - - Import the `routing` constant from `app.routing.ts` and add it the `imports` !{_array} of `AppModule`. - - +makeExcerpt('app/app.module.ts', 'routing') + We use the `forRoot` method because we're providing a configured router at the _root_ of the application. + The `forRoot` method gives us the Router service providers and directives needed for routing, and + performs the initial navigation based on the current browser URL. - var _heroesRoute = _docsFor == 'dart' ? "'Heroes'" : 'heroes' :marked @@ -319,12 +314,12 @@ block routerLink Import the dashboard component and add the following route definition to the `!{_RoutesVsAtRouteConfig}` !{_array} of definitions. -- var _file = _docsFor == 'dart' ? 'lib/app_component.dart' : 'app/app.routing.ts' +- var _file = _docsFor == 'dart' ? 'lib/app_component.dart' : 'app/app.module.3.ts' +makeExcerpt(_file + ' (Dashboard route)', 'dashboard') +ifDocsFor('ts|js') :marked - Also import and add `DashboardComponent` to our root NgModule's `declarations`. + Also import and add `DashboardComponent` to our `AppModule`'s `declarations`. +makeExcerpt('app/app.module.ts', 'dashboard') @@ -340,7 +335,7 @@ block redirect-vs-use-as-default We can use a redirect route to make this happen. Add the following to our array of route definitions: - +makeExcerpt('app/app.routing.ts','redirect') + +makeExcerpt('app/app.module.3.ts','redirect') .l-sub-section :marked @@ -466,7 +461,7 @@ code-example(format=''). Here's the *route definition* we'll use. -- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app.routing.ts' +- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app.module.3.ts' +makeExcerpt(_file + ' (hero detail)','hero-detail') :marked @@ -634,7 +629,7 @@ block extract-id token in the parameterized hero detail route definition we added to `!{_appRoutingTsVsAppComp}` earlier in the chapter: -- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app.routing.ts' +- var _file = _docsFor == 'dart' ? 'app/app.component.ts' : 'app/app.module.3.ts' +makeExcerpt(_file + ' (hero detail)', 'hero-detail') :marked @@ -661,7 +656,7 @@ block extract-id :marked Delete the `

    ` at the top (forgot about it during the `AppComponent`-to-`HeroesComponent` conversion). - + Delete the last line of the template with the `` tags. We'll no longer show the full `HeroDetailComponent` here. @@ -864,7 +859,6 @@ block file-tree-end .file app.component.css .file app.component.ts .file app.module.ts - .file app.routing.ts .file dashboard.component.css .file dashboard.component.html .file dashboard.component.ts diff --git a/public/docs/ts/latest/tutorial/toh-pt6.jade b/public/docs/ts/latest/tutorial/toh-pt6.jade index f761a9f19c..f34bfbb9f1 100644 --- a/public/docs/ts/latest/tutorial/toh-pt6.jade +++ b/public/docs/ts/latest/tutorial/toh-pt6.jade @@ -219,7 +219,7 @@ block get-heroes-details Although we made significant *internal* changes to `getHeroes()`, the public signature did not change. We still return a !{_Promise}. We won't have to update any of the components that call `getHeroes()`. - Our stakeholders are thrilled with the added flexibility from the API integration. + Our stakeholders are thrilled with the added flexibility from the API integration. Now they want the ability to create and delete heroes. Let's see first what happens when we try to update a hero's details. @@ -229,7 +229,7 @@ block get-heroes-details ## Update hero details We can edit a hero's name already in the hero detail view. Go ahead and try - it. As we type, the hero name is updated in the view heading. + it. As we type, the hero name is updated in the view heading. But when we hit the `Back` button, the changes are lost! .l-sub-section @@ -515,7 +515,7 @@ block observable-transformers - var _declarations = _docsFor == 'dart' ? 'directives' : 'declarations' - var declFile = _docsFor == 'dart' ? 'app/dashboard.component.ts' : 'app/app.module.ts' :marked - Finally, we import `HeroSearchComponent` from + Finally, we import `HeroSearchComponent` from hero-search.component.ts and add it to the `!{_declarations}` !{_array}: @@ -544,7 +544,7 @@ block filetree .file app.component.ts .file app.component.css .file app.module.ts - .file app.routing.ts + .file app-routing.module.ts .file dashboard.component.css .file dashboard.component.html .file dashboard.component.ts From d9416a8ae97d69dc990f54a29f66e4e21333d0fd Mon Sep 17 00:00:00 2001 From: Tim Xiao Date: Thu, 6 Oct 2016 00:14:44 +0100 Subject: [PATCH 21/56] docs: fixed path typo in tutorial(Routing, HTTP) (#2526) * Fixed typo in tutorial(Routing) The path to `app.component.css` should start from current directory, not 'app/', since the file is already in 'app/' * docs: fixed path error in the tutorial (HTTP) same problem fixed as commit 917e0ce1c2829224e3ee53a069599fccbc5751a3 * docs: Added moduleId for styleUrls referencing in these two classes --- public/docs/_examples/toh-5/ts/app/app.component.ts | 3 ++- public/docs/_examples/toh-6/ts/app/app.component.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/docs/_examples/toh-5/ts/app/app.component.ts b/public/docs/_examples/toh-5/ts/app/app.component.ts index 12fe3bfd52..e0cb229f57 100644 --- a/public/docs/_examples/toh-5/ts/app/app.component.ts +++ b/public/docs/_examples/toh-5/ts/app/app.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; @Component({ + moduleId: module.id, selector: 'my-app', // #docregion template template: ` @@ -14,7 +15,7 @@ import { Component } from '@angular/core'; `, // #enddocregion template // #docregion styleUrls - styleUrls: ['app/app.component.css'], + styleUrls: ['app.component.css'], // #enddocregion styleUrls }) export class AppComponent { diff --git a/public/docs/_examples/toh-6/ts/app/app.component.ts b/public/docs/_examples/toh-6/ts/app/app.component.ts index e55e09f661..01292eb4cd 100644 --- a/public/docs/_examples/toh-6/ts/app/app.component.ts +++ b/public/docs/_examples/toh-6/ts/app/app.component.ts @@ -3,6 +3,7 @@ import { Component } from '@angular/core'; @Component({ + moduleId: module.id, selector: 'my-app', template: ` @@ -13,7 +14,7 @@ import { Component } from '@angular/core'; `, - styleUrls: ['app/app.component.css'] + styleUrls: ['app.component.css'] }) export class AppComponent { title = 'Tour of Heroes'; From eff7e04ac3c433262a19312c3c9e193e14c0bcfa Mon Sep 17 00:00:00 2001 From: Matthew Hegarty Date: Thu, 6 Oct 2016 00:15:42 +0100 Subject: [PATCH 22/56] Router typos (#2523) * Fixed typo which was referring to 'imports' section and not 'setup' section * Fixed 1 char typo: /he *Cancel/the *Cancel/ * Fixed broken link: router.html#optional-route-parameter (added an 's' to 'parameter') * corrected grammar: /affords/afford/ * Fixed typo: /moved them/move them/ --- public/docs/ts/latest/guide/router.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/docs/ts/latest/guide/router.jade b/public/docs/ts/latest/guide/router.jade index f476f43736..2470f006d7 100644 --- a/public/docs/ts/latest/guide/router.jade +++ b/public/docs/ts/latest/guide/router.jade @@ -779,7 +779,7 @@ code-example(format="." language="bash"). the value `15` in the path clearly distinguishes the route to "Magneta" from a route for some other hero. - An [optional-route-parameter](#optional-route-parameter) might be a better choice if we were passing an *optional* value to `HeroDetailComponent`. + An [optional-route-parameter](#optional-route-parameters) might be a better choice if we were passing an *optional* value to `HeroDetailComponent`. a#navigate :marked @@ -986,7 +986,7 @@ figure.image-display doing so greatly complicates the pattern matching required to translate an incoming URL to a named route. Optional parameters are the ideal vehicle for conveying arbitrarily complex information during navigation. - Optional parameters aren't involved in pattern matching and affords enormous flexibility of expression. + Optional parameters aren't involved in pattern matching and afford enormous flexibility of expression. The Router supports navigation with optional parameters as well as required route parameters. We define _optional_ parameters in an *object* after we define our required route parameters. @@ -1817,7 +1817,7 @@ h3#can-deactivate-guard CanDeactivate: handling unsaved changes Users update crisis information in the `CrisisDetailComponent`. Unlike the `HeroDetailComponent`, the user changes do not update the crisis entity immediately. We update the entity when the user presses the *Save* button. - We discard the changes if the user presses he *Cancel* button. + We discard the changes if the user presses the *Cancel* button. Both buttons navigate back to the crisis list after save or cancel. @@ -1922,7 +1922,7 @@ h3#resolve-guard Resolve: pre-fetching component data +makeExample('app/crisis-center/crisis-detail-resolve.service.ts', '') :marked - We'll take the relevant parts of the `ngOnInit` lifecycle hook in our `CrisisDetailComponent` and moved them into our `CrisisDetailResolve` guard. + We'll take the relevant parts of the `ngOnInit` lifecycle hook in our `CrisisDetailComponent` and move them into our `CrisisDetailResolve` guard. We import the `Crisis` model and `CrisisService` and also the `Router` for navigation from our resolve implementation. We want to be explicit about the data we are resolving, so we implement the `Resolve` interface with a type of `Crisis`. This lets us know that what we will resolve will match our `Crisis` model. We inject the `CrisisService` and `Router` and implement the `resolve` method that supports a `Promise`, `Observable` or a synchronous From 88108620f9ea934e0b0c17c213bd1cffa70a954f Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Thu, 6 Oct 2016 12:12:39 -0700 Subject: [PATCH 23/56] chore(api): shredder to use new ng2 dart examples repo (#2556) --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 5db601a5d4..c851ffa5a0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -79,7 +79,7 @@ var _apiShredOptions = { const relDartDocApiDir = path.join('doc', 'api'); var _apiShredOptionsForDart = { lang: 'dart', - examplesDir: path.resolve(ngPathFor('dart'), 'example'), + examplesDir: path.resolve(ANGULAR_PROJECT_PATH + '2_api_examples'), fragmentsDir: path.join(DOCS_PATH, '_fragments/_api'), zipDir: path.join(RESOURCES_PATH, 'zips/api'), logLevel: _dgeniLogLevel From 37af86f6cf467f21c225356e0a55349eed1f0f0f Mon Sep 17 00:00:00 2001 From: Naomi Black Date: Mon, 3 Oct 2016 18:20:03 -0700 Subject: [PATCH 24/56] search(usev2): use v2 of swiftype --- public/_includes/_scripts-include.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/_includes/_scripts-include.jade b/public/_includes/_scripts-include.jade index f02d7cce14..b35cfc16bd 100644 --- a/public/_includes/_scripts-include.jade +++ b/public/_includes/_scripts-include.jade @@ -56,9 +56,9 @@ if current.path[0] == "docs" (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){ (w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t); e=d.getElementsByTagName(t)[0];s.async=1;s.src=u;e.parentNode.insertBefore(s,e); - })(window,document,'script','//s.swiftypecdn.com/install/v1/st.js','_st'); + })(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st'); - _st('install','VsuU7kH5Hnnj9tfyNvfK'); + _st('install','VsuU7kH5Hnnj9tfyNvfK','2.0.0'); script(src="//www.gstatic.com/feedback/api.js" type="text/javascript") From b6e5dc9eece3049793a2ad9cab2ae60eaa83e4df Mon Sep 17 00:00:00 2001 From: Naomi Black Date: Mon, 3 Oct 2016 18:22:47 -0700 Subject: [PATCH 25/56] docs(version): fix the version number on the docs homepage --- public/docs/js/latest/_data.json | 2 +- public/docs/ts/latest/_data.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json index 67e96e2f7f..98d3125fbf 100644 --- a/public/docs/js/latest/_data.json +++ b/public/docs/js/latest/_data.json @@ -4,7 +4,7 @@ "title": "Angular Docs", "subtitle": "JavaScript", "menuTitle": "Docs Home", - "banner": "Angular release is 2.0.0. View the change log to see enhancements, fixes, and breaking changes." + "banner": "Angular release is 2.0. View the change log to see enhancements, fixes, and breaking changes." }, "quickstart": { diff --git a/public/docs/ts/latest/_data.json b/public/docs/ts/latest/_data.json index 93bfe769c4..e58052030e 100644 --- a/public/docs/ts/latest/_data.json +++ b/public/docs/ts/latest/_data.json @@ -4,7 +4,7 @@ "title": "Angular Docs", "subtitle": "TypeScript", "menuTitle": "Docs Home", - "banner": "Angular release is 2.0.0. View the change log to see enhancements, fixes, and breaking changes." + "banner": "Angular release is 2.0. View the change log to see enhancements, fixes, and breaking changes." }, "cli-quickstart": { From ec1c8281e26fcf9a3920c6c9521ed4d94e6bbfe4 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Wed, 5 Oct 2016 15:48:55 -0700 Subject: [PATCH 26/56] docs(change-log): add documentation change log --- public/docs/ts/latest/guide/_data.json | 18 ++++--- public/docs/ts/latest/guide/change-log.jade | 52 +++++++++++++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 public/docs/ts/latest/guide/change-log.jade diff --git a/public/docs/ts/latest/guide/_data.json b/public/docs/ts/latest/guide/_data.json index cbcf39767e..709b3985b3 100644 --- a/public/docs/ts/latest/guide/_data.json +++ b/public/docs/ts/latest/guide/_data.json @@ -63,6 +63,18 @@ "basics": true }, + "glossary": { + "title": "Glossary", + "intro": "Brief definitions of the most important words in the Angular vocabulary", + "basics": true + }, + + "change-log": { + "title": "Change Log", + "intro": "An annotated history of recent documentation improvements.", + "basics": true + }, + "ngmodule": { "title": "Angular Modules (NgModule)", "intro": "Define application modules with @NgModule" @@ -88,12 +100,6 @@ "intro": "Learn how to apply CSS styles to components." }, - "glossary": { - "title": "Glossary", - "intro": "Brief definitions of the most important words in the Angular vocabulary", - "basics": true - }, - "hierarchical-dependency-injection": { "title": "Hierarchical Dependency Injectors", "navTitle": "Hierarchical Injectors", diff --git a/public/docs/ts/latest/guide/change-log.jade b/public/docs/ts/latest/guide/change-log.jade new file mode 100644 index 0000000000..45cf97401e --- /dev/null +++ b/public/docs/ts/latest/guide/change-log.jade @@ -0,0 +1,52 @@ +block includes + include ../_util-fns + +:marked + # Documentation Change Log + + The Angular documentation is a living document with continuous improvements. + This log calls attention to recent significant changes. + + ## "Routing and Navigation" guide with the _Router Module_ (2016-10-5) + The [Routing and Navigation](router.html) guide now locates route configuration + in a _Routing Module_. + The _Routing Module_ replaces the previous _routing object_ involving the `ModuleWithProviders`. + + All guided samples with routing use the _Routing Module_ and prose content has been updated, + most conspicuously in the + [NgModule](ngmodule.html) guide and [NgModule FAQ](../cookbook/ngmodule-faq.html) cookbook. + + ## New "Internationalization" Cookbook (2016-09-30) + + Added a new [Internationalization (i18n)](../cookbook/i18n.html) cookbook that shows how + to use Angular "i18n" facilities to translate template text into multiple languages. + + ## "angular-in-memory-web-api" package rename (2016-09-27) + + Many samples use the `angular-in-memory-web-api` to simulate a remote server. + This library is also useful to you during early development before you have a server to talk to. + + The package name was changed from "angular2-in-memory-web-api" which is still frozen-in-time on npm. + The new "angular-in-memory-web-api" has new features. + Read about them on github. + + ## "Style Guide" with _NgModules_ (2016-09-27) + + [StyleGuide](style-guide.html) explains our recommended conventions for Angular modules (NgModule). + Barrels now are far less useful and have been removed from the style guide; + they remain valuable but are not a matter of Angular style. + We also relaxed the rule that discouraged use of the `@Component.host` property. + + ## _moduleId: module.id_ everywhere (2016-09-25) + + Sample components that get their templates or styles with `templateUrl` or `styleUrls` + have been converted to _module-relative_ URLs. + We added the `moduleId: module.id` property-and-value to their `@Component` metadata. + + This change is a requirement for compilation with AoT compiler when the app loads + modules with SystemJS as the samples currently do. + + ## "Lifecycle Hooks" guide simplified (2016-09-24) + + The [Lifecycle Hooks](lifecycle-hooks.html) guide is shorter, simpler, and + draws more attention to the order in which Angular calls the hooks. From 7c98d162791502e9b18ce1c3c4e8f4e43dd55f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= Date: Thu, 6 Oct 2016 17:40:01 -0400 Subject: [PATCH 27/56] chore: add the styleguide back (#2557) --- .../docs/_includes/styleguide/_styleguide.jade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/docs/_includes/styleguide/_styleguide.jade b/public/docs/_includes/styleguide/_styleguide.jade index a59f700c7e..36684a8841 100644 --- a/public/docs/_includes/styleguide/_styleguide.jade +++ b/public/docs/_includes/styleguide/_styleguide.jade @@ -1,11 +1,11 @@ .grid-fluid .c10 - != partial("_layouts") - != partial("_code-examples") - != partial("_alerts") - != partial("_callouts") - != partial("_tables") - != partial("_aside") - != partial("_images") + include _layouts + include _code-examples + include _alerts + include _callouts + include _tables + include _aside + include _images -//!= partial("_jump-nav") +//include _jump-nav From 5042b3021c4004c99748b35f67dbea1a95536f71 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Thu, 6 Oct 2016 23:25:52 +0100 Subject: [PATCH 28/56] chore(test): add protractor4 (#2233) * chore(test): add protractor4 * fix lint, remove boilerplate files, fix less gen * separate scripts between package.json * ignore a2docs.css in boilerplate * remove tslint in _examples --- gulpfile.js | 56 +- package.json | 1 + public/docs/_examples/.gitignore | 3 +- .../{ => _boilerplate}/example-config.json | 0 .../docs/_examples/_boilerplate/package.json | 29 + .../{ => _boilerplate}/plunker.README.md | 0 .../_examples/{ => _boilerplate}/styles.css | 0 .../{ => _boilerplate}/systemjs.config.js | 0 .../systemjs.config.plunker.build.js | 0 .../systemjs.config.plunker.js | 0 .../tsconfig.json | 10 +- .../_examples/{ => _boilerplate}/tslint.json | 0 public/docs/_examples/_protractor/e2e.d.ts | 14 - .../docs/_examples/_protractor/package.json | 21 - .../docs/_examples/_protractor/typings.json | 8 - public/docs/_examples/animations/e2e-spec.ts | 51 +- .../docs/_examples/architecture/e2e-spec.ts | 15 +- .../attribute-directives/e2e-spec.ts | 6 +- .../cb-a1-a2-quick-reference/e2e-spec.ts | 23 +- .../_examples/cb-aot-compiler/e2e-spec.ts | 6 +- .../cb-aot-compiler/ts/tsconfig-aot.json | 3 +- .../cb-component-communication/e2e-spec.ts | 6 +- .../cb-component-relative-paths/e2e-spec.ts | 12 +- .../cb-dependency-injection/e2e-spec.ts | 8 +- .../_examples/cb-dynamic-form/e2e-spec.ts | 6 +- .../_examples/cb-form-validation/e2e-spec.ts | 24 +- public/docs/_examples/cb-i18n/e2e-spec.ts | 6 +- .../cb-set-document-title/e2e-spec.ts | 8 +- public/docs/_examples/cb-ts-to-js/e2e-spec.ts | 8 +- .../cli-quickstart/e2e-spec.ts.disabled | 6 +- .../_examples/component-styles/e2e-spec.ts | 6 +- .../dependency-injection/e2e-spec.ts | 25 +- .../_examples/displaying-data/e2e-spec.ts | 6 +- public/docs/_examples/forms/e2e-spec.ts | 13 +- .../e2e-spec.ts | 7 +- .../homepage-hello-world/e2e-spec.ts | 11 +- .../docs/_examples/homepage-tabs/e2e-spec.ts | 6 +- .../docs/_examples/homepage-todo/e2e-spec.ts | 6 +- .../_examples/lifecycle-hooks/e2e-spec.ts | 51 +- public/docs/_examples/ngmodule/e2e-spec.ts | 6 +- public/docs/_examples/package.json | 27 +- public/docs/_examples/pipes/e2e-spec.ts | 31 +- public/docs/_examples/protractor-helpers.ts | 36 + .../{_protractor => }/protractor.config.js | 63 +- public/docs/_examples/quickstart/e2e-spec.ts | 6 +- public/docs/_examples/router/e2e-spec.ts | 20 +- public/docs/_examples/security/e2e-spec.ts | 5 +- .../server-communication/e2e-spec.ts | 8 +- .../structural-directives/e2e-spec.ts | 8 +- public/docs/_examples/style-guide/e2e-spec.ts | 6 +- public/docs/_examples/styleguide/e2e-spec.ts | 6 +- .../_examples/template-syntax/e2e-spec.ts | 6 +- public/docs/_examples/toh-1/e2e-spec.ts | 12 +- public/docs/_examples/toh-2/e2e-spec.ts | 14 +- public/docs/_examples/toh-3/e2e-spec.ts | 14 +- public/docs/_examples/toh-4/e2e-spec.ts | 14 +- public/docs/_examples/toh-5/e2e-spec.ts | 16 +- .../_examples/toh-6-aot/ts/dist/build.js.gz | Bin 102759 -> 0 bytes public/docs/_examples/toh-6/e2e-spec.ts | 32 +- public/docs/_examples/tsconfig.json | 19 +- public/docs/_examples/typings.json | 6 + .../upgrade-adapter/e2e-spec.ts.disabled | 6 +- .../upgrade-phonecat-1-typescript/README.md | 3 - .../{e2e-spec.ts => e2e-spec.ts.disabled} | 8 +- .../globals/angular-animate/index.d.ts | 294 -- .../globals/angular-animate/typings.json | 8 - .../globals/angular-mocks/index.d.ts | 339 -- .../globals/angular-mocks/typings.json | 8 - .../globals/angular-resource/index.d.ts | 191 - .../globals/angular-resource/typings.json | 8 - .../globals/angular-route/index.d.ts | 154 - .../globals/angular-route/typings.json | 8 - .../ts/typings-ng1/globals/angular/index.d.ts | 1953 ---------- .../typings-ng1/globals/angular/typings.json | 8 - .../ts/typings-ng1/globals/jquery/index.d.ts | 3199 ----------------- .../typings-ng1/globals/jquery/typings.json | 8 - .../ts/typings-ng1/index.d.ts | 6 - .../upgrade-phonecat-2-hybrid/README.md | 3 - .../e2e-spec.ts.disabled | 13 +- .../globals/angular-animate/index.d.ts | 294 -- .../globals/angular-animate/typings.json | 8 - .../globals/angular-mocks/index.d.ts | 339 -- .../globals/angular-mocks/typings.json | 8 - .../globals/angular-resource/index.d.ts | 191 - .../globals/angular-resource/typings.json | 8 - .../globals/angular-route/index.d.ts | 154 - .../globals/angular-route/typings.json | 8 - .../ts/typings-ng1/globals/angular/index.d.ts | 1953 ---------- .../typings-ng1/globals/angular/typings.json | 8 - .../ts/typings-ng1/globals/jquery/index.d.ts | 3199 ----------------- .../typings-ng1/globals/jquery/typings.json | 8 - .../ts/typings-ng1/index.d.ts | 6 - .../upgrade-phonecat-3-final/e2e-spec.ts | 15 +- public/docs/_examples/user-input/e2e-spec.ts | 42 +- public/docs/_examples/webpack/e2e-spec.ts | 6 +- scripts/examples-install.sh | 3 +- tools/plunker-builder/builder.js | 6 +- 97 files changed, 463 insertions(+), 12826 deletions(-) rename public/docs/_examples/{ => _boilerplate}/example-config.json (100%) create mode 100644 public/docs/_examples/_boilerplate/package.json rename public/docs/_examples/{ => _boilerplate}/plunker.README.md (100%) rename public/docs/_examples/{ => _boilerplate}/styles.css (100%) rename public/docs/_examples/{ => _boilerplate}/systemjs.config.js (100%) rename public/docs/_examples/{ => _boilerplate}/systemjs.config.plunker.build.js (100%) rename public/docs/_examples/{ => _boilerplate}/systemjs.config.plunker.js (100%) rename public/docs/_examples/{_protractor => _boilerplate}/tsconfig.json (69%) rename public/docs/_examples/{ => _boilerplate}/tslint.json (100%) delete mode 100644 public/docs/_examples/_protractor/e2e.d.ts delete mode 100644 public/docs/_examples/_protractor/package.json delete mode 100644 public/docs/_examples/_protractor/typings.json create mode 100644 public/docs/_examples/protractor-helpers.ts rename public/docs/_examples/{_protractor => }/protractor.config.js (76%) delete mode 100644 public/docs/_examples/toh-6-aot/ts/dist/build.js.gz rename public/docs/_examples/upgrade-phonecat-1-typescript/{e2e-spec.ts => e2e-spec.ts.disabled} (92%) delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/index.d.ts delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/typings.json delete mode 100644 public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/index.d.ts diff --git a/gulpfile.js b/gulpfile.js index c851ffa5a0..36936b6222 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -37,7 +37,7 @@ var TEMP_PATH = './_temp'; var DOCS_PATH = path.join(PUBLIC_PATH, 'docs'); var EXAMPLES_PATH = path.join(DOCS_PATH, '_examples'); -var EXAMPLES_PROTRACTOR_PATH = path.join(EXAMPLES_PATH, '_protractor'); +var BOILERPLATE_PATH = path.join(EXAMPLES_PATH, '_boilerplate'); var EXAMPLES_TESTING_PATH = path.join(EXAMPLES_PATH, 'testing/ts'); var NOT_API_DOCS_GLOB = path.join(PUBLIC_PATH, './{docs/*/latest/!(api),!(docs)}/**/*.*'); var RESOURCES_PATH = path.join(PUBLIC_PATH, 'resources'); @@ -92,22 +92,16 @@ var _excludeMatchers = _excludePatterns.map(function(excludePattern){ }); var _exampleBoilerplateFiles = [ - '.editorconfig', 'a2docs.css', 'package.json', 'styles.css', 'systemjs.config.js', 'tsconfig.json', - 'tslint.json', - 'typings.json' + 'tslint.json' ]; var _exampleDartWebBoilerPlateFiles = ['a2docs.css', 'styles.css']; -var _exampleProtractorBoilerplateFiles = [ - 'tsconfig.json' -]; - var _exampleUnitTestingBoilerplateFiles = [ 'karma-test-shim.js', 'karma.conf.js' @@ -205,18 +199,13 @@ function runE2e() { }); */ // Not 'fast'; do full setup - gutil.log('runE2e: install _protractor stuff'); - var spawnInfo = spawnExt('npm', ['install'], { cwd: EXAMPLES_PROTRACTOR_PATH}); + gutil.log('runE2e: install _examples stuff'); + var spawnInfo = spawnExt('npm', ['install'], { cwd: EXAMPLES_PATH}); promise = spawnInfo.promise - .then(function() { - gutil.log('runE2e: install _examples stuff'); - spawnInfo = spawnExt('npm', ['install'], { cwd: EXAMPLES_PATH}) - return spawnInfo.promise; - }) .then(function() { buildStyles(copyExampleBoilerplate, _.noop); gutil.log('runE2e: update webdriver'); - spawnInfo = spawnExt('npm', ['run', 'webdriver:update'], {cwd: EXAMPLES_PROTRACTOR_PATH}); + spawnInfo = spawnExt('npm', ['run', 'webdriver:update'], {cwd: EXAMPLES_PATH}); return spawnInfo.promise; }); }; @@ -251,11 +240,10 @@ function findAndRunE2eTests(filter, outputFile) { fs.writeFileSync(outputFile, header); // create an array of combos where each - // combo consists of { examplePath: ... , protractorConfigFilename: ... } + // combo consists of { examplePath: ... } var examplePaths = []; var e2eSpecPaths = getE2eSpecPaths(EXAMPLES_PATH); e2eSpecPaths.forEach(function(specPath) { - var destConfig = path.join(specPath, 'protractor.config.js'); // get all of the examples under each dir where a pcFilename is found localExamplePaths = getExamplePaths(specPath, true); // Filter by language @@ -326,7 +314,7 @@ function runProtractor(prepPromise, appDir, appRunSpawnInfo, outputFile) { // start protractor var spawnInfo = spawnExt('npm', [ 'run', 'protractor', '--', 'protractor.config.js', - `--specs=${specFilename}`, '--params.appDir=' + appDir, '--params.outputFile=' + outputFile], { cwd: EXAMPLES_PROTRACTOR_PATH }); + `--specs=${specFilename}`, '--params.appDir=' + appDir, '--params.outputFile=' + outputFile], { cwd: EXAMPLES_PATH }); spawnInfo.proc.stderr.on('data', function (data) { transpileError = transpileError || /npm ERR! Exit status 100/.test(data.toString()); @@ -477,7 +465,7 @@ gulp.task('_copy-example-boilerplate', function (done) { function buildStyles(cb, done){ gulp.src(path.join(STYLES_SOURCE_PATH, _styleLessName)) .pipe(less()) - .pipe(gulp.dest(EXAMPLES_PATH)).on('end', function(){ + .pipe(gulp.dest(BOILERPLATE_PATH)).on('end', function(){ cb().then(function() { done(); }); }); } @@ -488,12 +476,12 @@ function buildStyles(cb, done){ function copyExampleBoilerplate() { gutil.log('Copying example boilerplate files'); var sourceFiles = _exampleBoilerplateFiles.map(function(fn) { - return path.join(EXAMPLES_PATH, fn); + return path.join(BOILERPLATE_PATH, fn); }); var examplePaths = excludeDartPaths(getExamplePaths(EXAMPLES_PATH)); var dartWebSourceFiles = _exampleDartWebBoilerPlateFiles.map(function(fn){ - return path.join(EXAMPLES_PATH, fn); + return path.join(BOILERPLATE_PATH, fn); }); var dartExampleWebPaths = getDartExampleWebPaths(EXAMPLES_PATH); @@ -503,14 +491,6 @@ function copyExampleBoilerplate() { .then(function() { return copyFiles(dartWebSourceFiles, dartExampleWebPaths, destFileMode); }) - // copy certain files from _examples/_protractor dir to each subdir that contains an e2e-spec file. - .then(function() { - var protractorSourceFiles = - _exampleProtractorBoilerplateFiles - .map(function(name) {return path.join(EXAMPLES_PROTRACTOR_PATH, name); }); - var e2eSpecPaths = getE2eSpecPaths(EXAMPLES_PATH); - return copyFiles(protractorSourceFiles, e2eSpecPaths, destFileMode); - }) // copy the unit test boilerplate .then(function() { var unittestSourceFiles = @@ -518,6 +498,10 @@ function copyExampleBoilerplate() { .map(function(name) { return path.join(EXAMPLES_TESTING_PATH, name); }); var unittestPaths = getUnitTestingPaths(EXAMPLES_PATH); return copyFiles(unittestSourceFiles, unittestPaths, destFileMode); + }) + .catch(function(err) { + gutil.log(err); + throw err; }); } @@ -596,11 +580,6 @@ function deleteExampleBoilerPlate() { return deleteFiles(_exampleBoilerplateFiles, examplePaths) .then(function() { return deleteFiles(_exampleDartWebBoilerPlateFiles, dartExampleWebPaths); - }) - .then(function() { - var protractorFiles = _exampleProtractorBoilerplateFiles; - var e2eSpecPaths = getE2eSpecPaths(EXAMPLES_PATH); - return deleteFiles(protractorFiles, e2eSpecPaths); }); } @@ -820,7 +799,7 @@ gulp.task('_harp-compile', function() { gulp.task('_shred-devguide-examples', ['_shred-clean-devguide', '_copy-example-boilerplate'], function() { // Split big shredding task into partials 2016-06-14 - var examplePaths = globby.sync(EXAMPLES_PATH+'/*/', {ignore: ['/node_modules', 'typings/', '_protractor/']}); + var examplePaths = globby.sync(EXAMPLES_PATH+'/*/', {ignore: ['/node_modules', 'typings/']}); var promise = Promise.resolve(true); examplePaths.forEach(function (examplePath) { promise = promise.then(() => docShredder.shredSingleExampleDir(_devguideShredOptions, examplePath)); @@ -879,7 +858,6 @@ gulp.task('lint', function() { '!./public/docs/_examples/**/ts-snippets/*.ts', '!./public/docs/_examples/style-guide/ts/**/*.avoid.ts', '!./public/docs/_examples/**/node_modules/**/*', - '!./public/docs/_examples/_protractor/**/*', '!./public/docs/_examples/**/typings/**/*', '!./public/docs/_examples/**/typings-ng1/**/*', '!./public/docs/_examples/**/build/**/*', @@ -1152,7 +1130,7 @@ function getTypingsPaths(basePath) { function getExamplePaths(basePath, includeBase) { // includeBase defaults to false - return getPaths(basePath, _exampleConfigFilename, includeBase) + return getPaths(basePath, _exampleConfigFilename, includeBase); } function getDartExampleWebPaths(basePath) { @@ -1183,6 +1161,8 @@ function getFilenames(basePath, filename, includeBase) { // ignore (skip) the top level version. includePatterns.push("!" + path.join(basePath, "/" + filename)); } + // ignore (skip) the files in BOILERPLATE_PATH. + includePatterns.push("!" + path.join(BOILERPLATE_PATH, "/" + filename)); var nmPattern = path.join(basePath, "**/node_modules/**"); var filenames = globby.sync(includePatterns, {ignore: [nmPattern]}); return filenames; diff --git a/package.json b/package.json index 5ab4ceea6d..c15d92ecb3 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "q": "^1.4.1", "tree-kill": "^1.0.0", "tslint": "^3.15.1", + "typescript": "^2.0.3", "yargs": "^4.7.1" }, "dependencies": { diff --git a/public/docs/_examples/.gitignore b/public/docs/_examples/.gitignore index 768c5e9d97..26c5801eb8 100644 --- a/public/docs/_examples/.gitignore +++ b/public/docs/_examples/.gitignore @@ -9,8 +9,8 @@ tsconfig.json tslint.json typings.json wallaby.js +_boilerplate/a2docs.css -protractor.config.js _test-output **/ts/**/*.js **/ts-snippets/**/*.js @@ -18,3 +18,4 @@ _test-output !**/*e2e-spec.js !systemjs.config.1.js +!_boilerplate/* diff --git a/public/docs/_examples/example-config.json b/public/docs/_examples/_boilerplate/example-config.json similarity index 100% rename from public/docs/_examples/example-config.json rename to public/docs/_examples/_boilerplate/example-config.json diff --git a/public/docs/_examples/_boilerplate/package.json b/public/docs/_examples/_boilerplate/package.json new file mode 100644 index 0000000000..74b692d1f0 --- /dev/null +++ b/public/docs/_examples/_boilerplate/package.json @@ -0,0 +1,29 @@ +{ + "name": "angular2-examples", + "version": "1.0.0", + "description": "Example package.json, only contains needed scripts for examples. See _examples/package.json for master package.json.", + "scripts": { + "start": "tsc && concurrently \"tsc -w\" \"lite-server\" ", + "e2e": "tsc && concurrently \"http-server\" \"protractor protractor.config.js\"", + "http-server": "tsc && http-server", + "http-server:e2e": "http-server", + "http-server:cli": "http-server dist/", + "lite": "lite-server", + "postinstall": "typings install", + "test": "tsc && concurrently \"tsc -w\" \"karma start karma.conf.js\"", + "tsc": "tsc", + "tsc:w": "tsc -w", + "start:webpack": "webpack-dev-server --inline --progress --port 8080", + "test:webpack": "karma start karma.webpack.conf.js", + "build:webpack": "rimraf dist && webpack --config config/webpack.prod.js --bail", + "build:cli": "ng build", + "build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup.js", + "i18n": "ng-xi18n" + }, + "keywords": [], + "author": "", + "license": "ISC", + "dependencies": {}, + "devDependencies": {}, + "repository": {} +} diff --git a/public/docs/_examples/plunker.README.md b/public/docs/_examples/_boilerplate/plunker.README.md similarity index 100% rename from public/docs/_examples/plunker.README.md rename to public/docs/_examples/_boilerplate/plunker.README.md diff --git a/public/docs/_examples/styles.css b/public/docs/_examples/_boilerplate/styles.css similarity index 100% rename from public/docs/_examples/styles.css rename to public/docs/_examples/_boilerplate/styles.css diff --git a/public/docs/_examples/systemjs.config.js b/public/docs/_examples/_boilerplate/systemjs.config.js similarity index 100% rename from public/docs/_examples/systemjs.config.js rename to public/docs/_examples/_boilerplate/systemjs.config.js diff --git a/public/docs/_examples/systemjs.config.plunker.build.js b/public/docs/_examples/_boilerplate/systemjs.config.plunker.build.js similarity index 100% rename from public/docs/_examples/systemjs.config.plunker.build.js rename to public/docs/_examples/_boilerplate/systemjs.config.plunker.build.js diff --git a/public/docs/_examples/systemjs.config.plunker.js b/public/docs/_examples/_boilerplate/systemjs.config.plunker.js similarity index 100% rename from public/docs/_examples/systemjs.config.plunker.js rename to public/docs/_examples/_boilerplate/systemjs.config.plunker.js diff --git a/public/docs/_examples/_protractor/tsconfig.json b/public/docs/_examples/_boilerplate/tsconfig.json similarity index 69% rename from public/docs/_examples/_protractor/tsconfig.json rename to public/docs/_examples/_boilerplate/tsconfig.json index 8c87ff4f20..64548f5b12 100644 --- a/public/docs/_examples/_protractor/tsconfig.json +++ b/public/docs/_examples/_boilerplate/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, @@ -8,9 +8,7 @@ "experimentalDecorators": true, "removeComments": false, "noImplicitAny": true, - "suppressImplicitAnyIndexErrors": true - }, - "files": [ - "e2e-spec.ts" - ] + "suppressImplicitAnyIndexErrors": true, + "types": [] + } } diff --git a/public/docs/_examples/tslint.json b/public/docs/_examples/_boilerplate/tslint.json similarity index 100% rename from public/docs/_examples/tslint.json rename to public/docs/_examples/_boilerplate/tslint.json diff --git a/public/docs/_examples/_protractor/e2e.d.ts b/public/docs/_examples/_protractor/e2e.d.ts deleted file mode 100644 index ab91658443..0000000000 --- a/public/docs/_examples/_protractor/e2e.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -/// - -// Defined in protractor.config.js -declare function setProtractorToNg1Mode(): void; -declare function sendKeys(element: protractor.ElementFinder, str: string): webdriver.promise.Promise; -declare function describeIf(cond: boolean, name: string, func: Function): void; -declare function itIf(cond: boolean, name: string, func: Function): void; - -declare namespace protractor { - interface IBrowser { - appIsTs: boolean; - appIsJs: boolean; - } -} diff --git a/public/docs/_examples/_protractor/package.json b/public/docs/_examples/_protractor/package.json deleted file mode 100644 index 1e12742c38..0000000000 --- a/public/docs/_examples/_protractor/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "angular2-examples-protractor", - "version": "1.0.0", - "description": "Manage _protractor folder installations", - "scripts": { - "postinstall": "typings install", - "typings": "typings", - "protractor": "protractor", - "webdriver:update": "webdriver-manager update" - }, - "keywords": [], - "author": "", - "license": "ISC", - "devDependencies": { - "protractor": "^3.3.0", - "typings": "^1.0.4", - "ts-node": "^1.3.0", - "typescript": "^2.0.2" - }, - "repository": {} -} diff --git a/public/docs/_examples/_protractor/typings.json b/public/docs/_examples/_protractor/typings.json deleted file mode 100644 index a8a5da9134..0000000000 --- a/public/docs/_examples/_protractor/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "globalDependencies": { - "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459", - "jasmine": "registry:dt/jasmine#2.2.0+20160621224255", - "node": "registry:dt/node#6.0.0+20160621231320", - "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654" - } -} diff --git a/public/docs/_examples/animations/e2e-spec.ts b/public/docs/_examples/animations/e2e-spec.ts index 31eefbf345..9e5d72a015 100644 --- a/public/docs/_examples/animations/e2e-spec.ts +++ b/public/docs/_examples/animations/e2e-spec.ts @@ -1,5 +1,8 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; +import { logging, promise } from 'selenium-webdriver'; + /** * The tests here basically just checking that the end styles * of each animation are in effect. @@ -23,7 +26,7 @@ describe('Animation Tests', () => { describe('basic states', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-basic')); @@ -52,7 +55,7 @@ describe('Animation Tests', () => { describe('styles inline in transitions', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(function() { host = element(by.css('hero-list-inline-styles')); @@ -73,7 +76,7 @@ describe('Animation Tests', () => { describe('combined transition syntax', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-combined-transitions')); @@ -102,7 +105,7 @@ describe('Animation Tests', () => { describe('two-way transition syntax', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-twoway')); @@ -131,7 +134,7 @@ describe('Animation Tests', () => { describe('enter & leave', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-enter-leave')); @@ -151,7 +154,7 @@ describe('Animation Tests', () => { describe('enter & leave & states', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(function() { host = element(by.css('hero-list-enter-leave-states')); @@ -180,7 +183,7 @@ describe('Animation Tests', () => { describe('auto style calc', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(function() { host = element(by.css('hero-list-auto')); @@ -200,7 +203,7 @@ describe('Animation Tests', () => { describe('different timings', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-timings')); @@ -221,7 +224,7 @@ describe('Animation Tests', () => { describe('multiple keyframes', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-multistep')); @@ -242,7 +245,7 @@ describe('Animation Tests', () => { describe('parallel groups', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-groups')); @@ -263,7 +266,7 @@ describe('Animation Tests', () => { describe('adding active heroes', () => { - let host: protractor.ElementFinder; + let host: ElementFinder; beforeEach(() => { host = element(by.css('hero-list-basic')); @@ -292,13 +295,14 @@ describe('Animation Tests', () => { describe('callbacks', () => { it('fires a callback on start and done', () => { addActiveHero(); - browser.manage().logs().get('browser').then((logs) => { - const animationMessages = logs.filter((log) => { - return log.message.indexOf('Animation') !== -1 ? true : false; - }); + browser.manage().logs().get(logging.Type.BROWSER) + .then((logs: webdriver.logging.Entry[]) => { + const animationMessages = logs.filter((log) => { + return log.message.indexOf('Animation') !== -1 ? true : false; + }); - expect(animationMessages.length).toBeGreaterThan(0); - }); + expect(animationMessages.length).toBeGreaterThan(0); + }); }); }); @@ -320,8 +324,8 @@ describe('Animation Tests', () => { browser.driver.sleep(sleep); } - function getScaleX(el: protractor.ElementFinder) { - return protractor.promise.all([ + function getScaleX(el: ElementFinder) { + return Promise.all([ getBoundingClientWidth(el), getOffsetWidth(el) ]).then(function(promiseResolutions) { @@ -331,18 +335,17 @@ describe('Animation Tests', () => { }); } - function getBoundingClientWidth(el: protractor.ElementFinder): protractor.promise.Promise { + function getBoundingClientWidth(el: ElementFinder): promise.Promise { return browser.executeScript( 'return arguments[0].getBoundingClientRect().width', el.getWebElement() ); } - function getOffsetWidth(el: protractor.ElementFinder): protractor.promise.Promise { + function getOffsetWidth(el: ElementFinder): promise.Promise { return browser.executeScript( 'return arguments[0].offsetWidth', el.getWebElement() ); } - }); diff --git a/public/docs/_examples/architecture/e2e-spec.ts b/public/docs/_examples/architecture/e2e-spec.ts index 0bdcdd0069..c1ee8cf00d 100644 --- a/public/docs/_examples/architecture/e2e-spec.ts +++ b/public/docs/_examples/architecture/e2e-spec.ts @@ -1,5 +1,6 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { protractor, browser, element, by, ElementFinder } from 'protractor'; const nameSuffix = 'X'; @@ -20,7 +21,7 @@ describe('Architecture', () => { }); it(`has h2 '${expectedH2}'`, () => { - let h2 = element.all(by.css('h2')).map((elt) => elt.getText()); + let h2 = element.all(by.css('h2')).map((elt: any) => elt.getText()); expect(h2).toEqual(expectedH2); }); @@ -52,7 +53,7 @@ function heroTests() { it(`shows updated hero name in details`, async () => { let input = element.all(by.css('input')).first(); - await sendKeys(input, nameSuffix); + input.sendKeys(nameSuffix); let page = getPageElts(); let hero = await heroFromDetail(page.heroDetail); let newName = targetHero.name + nameSuffix; @@ -69,7 +70,7 @@ function salesTaxTests() { it('shows sales tax', async function () { let page = getPageElts(); - await sendKeys(page.salesTaxAmountInput, '10'); + page.salesTaxAmountInput.sendKeys('10', protractor.Key.ENTER); // Note: due to Dart bug USD is shown instead of $ let re = /The sales tax is (\$|USD)1.00/; expect(page.salesTaxDetail.getText()).toMatch(re); @@ -87,10 +88,12 @@ function getPageElts() { }; } -async function heroFromDetail(detail: protractor.ElementFinder): Promise { +async function heroFromDetail(detail: ElementFinder): Promise { // Get hero id from the first
    + // let _id = await detail.all(by.css('div')).first().getText(); let _id = await detail.all(by.css('div')).first().getText(); // Get name from the h2 + // let _name = await detail.element(by.css('h4')).getText(); let _name = await detail.element(by.css('h4')).getText(); return { id: +_id.substr(_id.indexOf(' ') + 1), diff --git a/public/docs/_examples/attribute-directives/e2e-spec.ts b/public/docs/_examples/attribute-directives/e2e-spec.ts index bf63294648..25a0cf258e 100644 --- a/public/docs/_examples/attribute-directives/e2e-spec.ts +++ b/public/docs/_examples/attribute-directives/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Attribute directives', function () { let _title = 'My First Attribute Directive'; diff --git a/public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts b/public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts index 9af9b3f21d..8dac46ddd5 100644 --- a/public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts +++ b/public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Angular 1 to 2 Quick Reference Tests', function () { beforeAll(function () { @@ -100,15 +102,14 @@ describe('Angular 1 to 2 Quick Reference Tests', function () { let resultLabel = movieListComp.element(by.css('span > p')); heroInput.clear().then(function () { - sendKeys(heroInput, heroName || '').then(function () { - expect(resultLabel.getText()).toBe(expectedLabel); - if (heroName) { - expect(favoriteHeroLabel.isDisplayed()).toBe(true); - expect(favoriteHeroLabel.getText()).toContain(heroName); - } else { - expect(favoriteHeroLabel.isDisplayed()).toBe(false); - } - }); + heroInput.sendKeys(heroName || ''); + expect(resultLabel.getText()).toBe(expectedLabel); + if (heroName) { + expect(favoriteHeroLabel.isDisplayed()).toBe(true); + expect(favoriteHeroLabel.getText()).toContain(heroName); + } else { + expect(favoriteHeroLabel.isDisplayed()).toBe(false); + } }); } }); diff --git a/public/docs/_examples/cb-aot-compiler/e2e-spec.ts b/public/docs/_examples/cb-aot-compiler/e2e-spec.ts index fe72681ee3..b03a771faf 100644 --- a/public/docs/_examples/cb-aot-compiler/e2e-spec.ts +++ b/public/docs/_examples/cb-aot-compiler/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + /* tslint:disable:quotemark */ describe('AOT Compilation', function () { diff --git a/public/docs/_examples/cb-aot-compiler/ts/tsconfig-aot.json b/public/docs/_examples/cb-aot-compiler/ts/tsconfig-aot.json index 50cd4b53be..fd8b0617cc 100644 --- a/public/docs/_examples/cb-aot-compiler/ts/tsconfig-aot.json +++ b/public/docs/_examples/cb-aot-compiler/ts/tsconfig-aot.json @@ -8,7 +8,8 @@ "experimentalDecorators": true, "removeComments": false, "noImplicitAny": true, - "suppressImplicitAnyIndexErrors": true + "suppressImplicitAnyIndexErrors": true, + "types": [] }, "files": [ diff --git a/public/docs/_examples/cb-component-communication/e2e-spec.ts b/public/docs/_examples/cb-component-communication/e2e-spec.ts index 47d8c47e05..b83589cc32 100644 --- a/public/docs/_examples/cb-component-communication/e2e-spec.ts +++ b/public/docs/_examples/cb-component-communication/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Component Communication Cookbook Tests', function () { // Note: '?e2e' which app can read to know it is running in protractor diff --git a/public/docs/_examples/cb-component-relative-paths/e2e-spec.ts b/public/docs/_examples/cb-component-relative-paths/e2e-spec.ts index f3db3774e1..13e1636f2e 100644 --- a/public/docs/_examples/cb-component-relative-paths/e2e-spec.ts +++ b/public/docs/_examples/cb-component-relative-paths/e2e-spec.ts @@ -1,11 +1,13 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; + describe('Cookbook: component-relative paths', function () { interface Page { - title: protractor.ElementFinder; - absComp: protractor.ElementFinder; - relComp: protractor.ElementFinder; + title: ElementFinder; + absComp: ElementFinder; + relComp: ElementFinder; } function getPageStruct() { diff --git a/public/docs/_examples/cb-dependency-injection/e2e-spec.ts b/public/docs/_examples/cb-dependency-injection/e2e-spec.ts index d7ea6d4832..8c9d163d5e 100644 --- a/public/docs/_examples/cb-dependency-injection/e2e-spec.ts +++ b/public/docs/_examples/cb-dependency-injection/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Dependency Injection Cookbook', function () { beforeAll(function () { @@ -71,7 +73,7 @@ describe('Dependency Injection Cookbook', function () { let yellow = 'rgba(255, 255, 0, 1)'; expect(target.getCssValue('background-color')).not.toEqual(yellow); - browser.actions().mouseMove(target as any as webdriver.WebElement).perform(); + browser.actions().mouseMove(target.getWebElement()).perform(); expect(target.getCssValue('background-color')).toEqual(yellow); }); diff --git a/public/docs/_examples/cb-dynamic-form/e2e-spec.ts b/public/docs/_examples/cb-dynamic-form/e2e-spec.ts index b6c4a35e0a..408ac75766 100644 --- a/public/docs/_examples/cb-dynamic-form/e2e-spec.ts +++ b/public/docs/_examples/cb-dynamic-form/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + /* tslint:disable:quotemark */ describe('Dynamic Form', function () { diff --git a/public/docs/_examples/cb-form-validation/e2e-spec.ts b/public/docs/_examples/cb-form-validation/e2e-spec.ts index bbd4a7ff03..8ffc01e250 100644 --- a/public/docs/_examples/cb-form-validation/e2e-spec.ts +++ b/public/docs/_examples/cb-form-validation/e2e-spec.ts @@ -1,8 +1,10 @@ -/// 'use strict'; // necessary for node! +import { browser, element, by, protractor, ElementFinder, ElementArrayFinder } from 'protractor'; +import { appLang, describeIf } from '../protractor-helpers'; + // THESE TESTS ARE INCOMPLETE -describeIf(browser.appIsTs || browser.appIsJs, 'Form Validation Tests', function () { +describeIf(appLang.appIsTs || appLang.appIsJs, 'Form Validation Tests', function () { beforeAll(function () { browser.get(''); @@ -41,15 +43,15 @@ describeIf(browser.appIsTs || browser.appIsJs, 'Form Validation Tests', function const testName = 'Test Name'; let page: { - section: protractor.ElementFinder, - form: protractor.ElementFinder, - title: protractor.ElementFinder, - nameInput: protractor.ElementFinder, - alterEgoInput: protractor.ElementFinder, - powerSelect: protractor.ElementFinder, - errorMessages: protractor.ElementArrayFinder, - heroFormButtons: protractor.ElementArrayFinder, - heroSubmitted: protractor.ElementFinder + section: ElementFinder, + form: ElementFinder, + title: ElementFinder, + nameInput: ElementFinder, + alterEgoInput: ElementFinder, + powerSelect: ElementFinder, + errorMessages: ElementArrayFinder, + heroFormButtons: ElementArrayFinder, + heroSubmitted: ElementFinder }; function getPage(sectionTag: string) { diff --git a/public/docs/_examples/cb-i18n/e2e-spec.ts b/public/docs/_examples/cb-i18n/e2e-spec.ts index 6606ca8878..f3249272af 100644 --- a/public/docs/_examples/cb-i18n/e2e-spec.ts +++ b/public/docs/_examples/cb-i18n/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('i18n E2E Tests', () => { beforeEach(function () { diff --git a/public/docs/_examples/cb-set-document-title/e2e-spec.ts b/public/docs/_examples/cb-set-document-title/e2e-spec.ts index 135bfb1a88..801b732995 100644 --- a/public/docs/_examples/cb-set-document-title/e2e-spec.ts +++ b/public/docs/_examples/cb-set-document-title/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; + // gulp run-e2e-tests --filter=cb-set-document-title describe('Set Document Title', function () { @@ -16,7 +18,7 @@ describe('Set Document Title', function () { ]; element.all( by.css( 'ul li a' ) ).each( - function iterator( element, i ) { + function iterator( element: ElementFinder, i: number ) { element.click(); expect( browser.getTitle() ).toEqual( titles[ i ] ); diff --git a/public/docs/_examples/cb-ts-to-js/e2e-spec.ts b/public/docs/_examples/cb-ts-to-js/e2e-spec.ts index 1fc5641bd3..5862beeebf 100644 --- a/public/docs/_examples/cb-ts-to-js/e2e-spec.ts +++ b/public/docs/_examples/cb-ts-to-js/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('TypeScript to Javascript tests', function () { beforeAll(function () { @@ -54,7 +56,7 @@ describe('TypeScript to Javascript tests', function () { expect(h1.getAttribute('class')).toBe('active'); h1.click(); - browser.actions().doubleClick(h1 as any as webdriver.WebElement).perform(); + browser.actions().doubleClick(h1.getWebElement()).perform(); expect(h1.getAttribute('class')).toBe('active'); }); diff --git a/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled b/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled index ef30b01ec1..fb133ce7ab 100644 --- a/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled +++ b/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('cli-quickstart App', () => { beforeEach(() => { return browser.get('/'); diff --git a/public/docs/_examples/component-styles/e2e-spec.ts b/public/docs/_examples/component-styles/e2e-spec.ts index 6a26fe0d67..28a44221a4 100644 --- a/public/docs/_examples/component-styles/e2e-spec.ts +++ b/public/docs/_examples/component-styles/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Component Style Tests', function () { beforeAll(function () { diff --git a/public/docs/_examples/dependency-injection/e2e-spec.ts b/public/docs/_examples/dependency-injection/e2e-spec.ts index 4c702f8801..28fe22a9cb 100644 --- a/public/docs/_examples/dependency-injection/e2e-spec.ts +++ b/public/docs/_examples/dependency-injection/e2e-spec.ts @@ -1,7 +1,8 @@ -/// -'use strict'; -describe('Dependency Injection Tests', function () { +'use strict'; // necessary for es6 output in node +import { browser, element, by, ElementFinder } from 'protractor'; + +describe('Dependency Injection Tests', function () { let expectedMsg: string; let expectedMsgRx: RegExp; @@ -147,14 +148,13 @@ describe('Dependency Injection Tests', function () { let heroes = element.all(by.css('#unauthorized hero-list div')); expect(heroes.count()).toBeGreaterThan(0); - heroes.filter(function(elem, index){ - return elem.getText().then(function(text) { + let filteredHeroes = heroes.filter((elem: ElementFinder, index: number) => { + return elem.getText().then((text: string) => { return /secret/.test(text); }); - }).then(function(filteredElements) { - // console.log("******Secret heroes count: "+filteredElements.length); - expect(filteredElements.length).toEqual(0); }); + + expect(filteredHeroes.count()).toEqual(0); }); it('unauthorized user should have no authorized heroes listed', function () { @@ -182,14 +182,13 @@ describe('Dependency Injection Tests', function () { let heroes = element.all(by.css('#authorized hero-list div')); expect(heroes.count()).toBeGreaterThan(0); - heroes.filter(function(elem, index){ - return elem.getText().then(function(text) { + let filteredHeroes = heroes.filter(function(elem: ElementFinder, index: number){ + return elem.getText().then(function(text: string) { return /secret/.test(text); }); - }).then(function(filteredElements) { - // console.log("******Secret heroes count: "+filteredElements.length); - expect(filteredElements.length).toBeGreaterThan(0); }); + + expect(filteredHeroes.count()).toBeGreaterThan(0); }); it('authorized user should have no unauthorized heroes listed', function () { diff --git a/public/docs/_examples/displaying-data/e2e-spec.ts b/public/docs/_examples/displaying-data/e2e-spec.ts index 5a2bd1c5ca..96c52c5d00 100644 --- a/public/docs/_examples/displaying-data/e2e-spec.ts +++ b/public/docs/_examples/displaying-data/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Displaying Data Tests', function () { let _title = 'Tour of Heroes'; let _defaultHero = 'Windstorm'; diff --git a/public/docs/_examples/forms/e2e-spec.ts b/public/docs/_examples/forms/e2e-spec.ts index 87ab6ef904..2afd370103 100644 --- a/public/docs/_examples/forms/e2e-spec.ts +++ b/public/docs/_examples/forms/e2e-spec.ts @@ -1,6 +1,7 @@ -/// -'use strict'; -describeIf(browser.appIsTs || browser.appIsJs, 'Forms Tests', function () { +import { browser, element, by } from 'protractor'; +import { appLang, describeIf } from '../protractor-helpers'; + +describeIf(appLang.appIsTs || appLang.appIsJs, 'Forms Tests', function () { beforeEach(function () { browser.get(''); @@ -45,12 +46,10 @@ describeIf(browser.appIsTs || browser.appIsJs, 'Forms Tests', function () { let test = 'testing 1 2 3'; let newValue: string; let alterEgoEle = element.all(by.css('input[name=alterEgo]')).get(0); - alterEgoEle.getAttribute('value').then(function(value) { - // alterEgoEle.sendKeys(test); - sendKeys(alterEgoEle, test); + alterEgoEle.getAttribute('value').then(function(value: string) { + alterEgoEle.sendKeys(test); newValue = value + test; expect(alterEgoEle.getAttribute('value')).toEqual(newValue); - }).then(function() { let b = element.all(by.css('button[type=submit]')).get(0); return b.click(); }).then(function() { diff --git a/public/docs/_examples/hierarchical-dependency-injection/e2e-spec.ts b/public/docs/_examples/hierarchical-dependency-injection/e2e-spec.ts index 224d649cad..738e304d1b 100644 --- a/public/docs/_examples/hierarchical-dependency-injection/e2e-spec.ts +++ b/public/docs/_examples/hierarchical-dependency-injection/e2e-spec.ts @@ -1,5 +1,5 @@ -/// -'use strict'; +import { browser, element, by } from 'protractor'; + describe('Hierarchical dependency injection', function () { beforeEach(function () { @@ -38,8 +38,7 @@ describe('Hierarchical dependency injection', function () { let editButtonEle = heroEle.element(by.cssContainingText('button', 'edit')); editButtonEle.click().then(function() { let inputEle = heroEle.element(by.css('hero-editor input')); - // return inputEle.sendKeys("foo"); - return sendKeys(inputEle, 'foo'); + return inputEle.sendKeys('foo'); }).then(function() { let buttonName = shouldSave ? 'save' : 'cancel'; let buttonEle = heroEle.element(by.cssContainingText('button', buttonName)); diff --git a/public/docs/_examples/homepage-hello-world/e2e-spec.ts b/public/docs/_examples/homepage-hello-world/e2e-spec.ts index 54d8f79532..c4c6464937 100644 --- a/public/docs/_examples/homepage-hello-world/e2e-spec.ts +++ b/public/docs/_examples/homepage-hello-world/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Homepage Hello World', function () { beforeAll(function () { @@ -15,9 +17,8 @@ describe('Homepage Hello World', function () { it('should display entered name', function () { let testName = 'Bobby Joe'; let nameEle = element.all(by.css('input')).get(0); - nameEle.getAttribute('value').then(function(value) { - // nameEle.sendKeys(testName); // should work but doesn't - sendKeys(nameEle, testName); // utility that does work + nameEle.getAttribute('value').then(function(value: string) { + nameEle.sendKeys(testName); let newValue = value + testName; // old input box value + new name expect(nameEle.getAttribute('value')).toEqual(newValue); }).then(function() { diff --git a/public/docs/_examples/homepage-tabs/e2e-spec.ts b/public/docs/_examples/homepage-tabs/e2e-spec.ts index 2ac27b289f..2131d75906 100644 --- a/public/docs/_examples/homepage-tabs/e2e-spec.ts +++ b/public/docs/_examples/homepage-tabs/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Homepage Tabs', function () { beforeAll(function () { diff --git a/public/docs/_examples/homepage-todo/e2e-spec.ts b/public/docs/_examples/homepage-todo/e2e-spec.ts index f1dae917c6..fb74e4e70f 100644 --- a/public/docs/_examples/homepage-todo/e2e-spec.ts +++ b/public/docs/_examples/homepage-todo/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Homepage Todo', function () { beforeAll(function () { diff --git a/public/docs/_examples/lifecycle-hooks/e2e-spec.ts b/public/docs/_examples/lifecycle-hooks/e2e-spec.ts index 156ea3c3a9..8e9acb1c76 100644 --- a/public/docs/_examples/lifecycle-hooks/e2e-spec.ts +++ b/public/docs/_examples/lifecycle-hooks/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Lifecycle hooks', function () { beforeAll(function () { @@ -41,18 +43,13 @@ describe('Lifecycle hooks', function () { expect(titleEle.getText()).toContain('Windstorm can sing'); expect(changeLogEles.count()).toEqual(2, 'should start with 2 messages'); - // heroNameInputEle.sendKeys('-foo-').then(function () { - sendKeys(heroNameInputEle, '-foo-').then(function () { - expect(titleEle.getText()).toContain('Windstorm-foo- can sing'); - expect(changeLogEles.count()).toEqual(2, 'should still have 2 messages'); - // protractor bug with sendKeys means that line below does not work. - // return powerInputEle.sendKeys('-bar-'); - return sendKeys(powerInputEle, '-bar-'); - }).then(function () { - expect(titleEle.getText()).toContain('Windstorm-foo- can sing-bar-'); - // 7 == 2 previously + length of '-bar-' - expect(changeLogEles.count()).toEqual(7, 'should have 7 messages now'); - }); + heroNameInputEle.sendKeys('-foo-'); + expect(titleEle.getText()).toContain('Windstorm-foo- can sing'); + expect(changeLogEles.count()).toEqual(2, 'should still have 2 messages'); + powerInputEle.sendKeys('-bar-'); + expect(titleEle.getText()).toContain('Windstorm-foo- can sing-bar-'); + // 7 == 2 previously + length of '-bar-' + expect(changeLogEles.count()).toEqual(7, 'should have 7 messages now'); }); it('should support DoCheck hook', function () { @@ -65,21 +62,19 @@ describe('Lifecycle hooks', function () { let logCount: number; expect(titleEle.getText()).toContain('Windstorm can sing'); - changeLogEles.count().then(function(count) { + changeLogEles.count().then(function(count: number) { // 3 messages to start expect(count).toEqual(3, 'should start with 3 messages'); logCount = count; - // heroNameInputEle.sendKeys('-foo-').then(function () { - return sendKeys(heroNameInputEle, '-foo-'); + return heroNameInputEle.sendKeys('-foo-'); }).then(function () { expect(titleEle.getText()).toContain('Windstorm-foo- can sing'); return changeLogEles.count(); - }).then(function (count) { + }).then(function(count: number) { // one more for each keystroke expect(count).toEqual(logCount + 5, 'should add 5 more messages'); logCount = count; - // return powerInputEle.sendKeys('-bar-'); - return sendKeys(powerInputEle, '-bar-'); + return powerInputEle.sendKeys('-bar-'); }).then(function () { expect(titleEle.getText()).toContain('Windstorm-foo- can sing-bar-'); expect(changeLogEles.count()).toEqual(logCount + 6, 'should add 6 more messages'); @@ -97,16 +92,16 @@ describe('Lifecycle hooks', function () { expect(childViewInputEle.getAttribute('value')).toContain('Magneta'); expect(commentEle.isPresent()).toBe(false, 'comment should not be in DOM'); - logEles.count().then(function(count) { + logEles.count().then(function(count: number) { logCount = count; - return sendKeys(childViewInputEle, '-test-'); + return childViewInputEle.sendKeys('-test-'); }).then(function() { expect(childViewInputEle.getAttribute('value')).toContain('-test-'); expect(commentEle.isPresent()).toBe(true, 'should have comment because >10 chars'); expect(commentEle.getText()).toContain('long name'); return logEles.count(); - }).then(function(count) { - expect(logCount + 6).toEqual(count, '6 additional log messages should have been added'); + }).then(function(count: number) { + expect(logCount + 7).toEqual(count, '7 additional log messages should have been added'); logCount = count; return buttonEle.click(); }).then(function() { @@ -126,15 +121,15 @@ describe('Lifecycle hooks', function () { expect(childViewInputEle.getAttribute('value')).toContain('Magneta'); expect(commentEle.isPresent()).toBe(false, 'comment should not be in DOM'); - logEles.count().then(function(count) { + logEles.count().then(function(count: number) { logCount = count; - return sendKeys(childViewInputEle, '-test-'); + return childViewInputEle.sendKeys('-test-'); }).then(function() { expect(childViewInputEle.getAttribute('value')).toContain('-test-'); expect(commentEle.isPresent()).toBe(true, 'should have comment because >10 chars'); expect(commentEle.getText()).toContain('long name'); return logEles.count(); - }).then(function(count) { + }).then(function(count: number) { expect(logCount + 5).toEqual(count, '5 additional log messages should have been added'); logCount = count; return buttonEle.click(); @@ -151,7 +146,7 @@ describe('Lifecycle hooks', function () { let logEles = element.all(by.css('spy-parent h4 ~ div')); expect(heroEles.count()).toBe(2, 'should have two heroes displayed'); expect(logEles.count()).toBe(2, 'should have two log entries'); - sendKeys(inputEle, '-test-').then(function() { + inputEle.sendKeys('-test-').then(function() { return addHeroButtonEle.click(); }).then(function() { expect(heroEles.count()).toBe(3, 'should have added one hero'); diff --git a/public/docs/_examples/ngmodule/e2e-spec.ts b/public/docs/_examples/ngmodule/e2e-spec.ts index de8f4fa7e0..0fbce1213d 100644 --- a/public/docs/_examples/ngmodule/e2e-spec.ts +++ b/public/docs/_examples/ngmodule/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('NgModule', function () { // helpers diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json index 980813eabd..615db7f811 100644 --- a/public/docs/_examples/package.json +++ b/public/docs/_examples/package.json @@ -1,27 +1,12 @@ { "name": "angular2-examples-master", "version": "1.0.0", - "description": "Master package.json, the superset of all dependencies for all of the _example package.json files.", + "description": "Master package.json, the superset of all dependencies for all of the _example package.json files. See _boilerplate/package.json for example npm scripts.", "scripts": { - "start": "tsc && concurrently \"tsc -w\" \"lite-server\" ", - "e2e": "tsc && concurrently \"http-server\" \"protractor protractor.config.js\"", - "http-server": "tsc && http-server", - "http-server:e2e": "http-server", - "http-server:cli": "http-server dist/", - "lite": "lite-server", "postinstall": "typings install", - "test": "tsc && concurrently \"tsc -w\" \"karma start karma.conf.js\"", - "tsc": "tsc", - "tsc:w": "tsc -w", "typings": "typings", "protractor": "protractor", - "webdriver:update": "webdriver-manager update", - "start:webpack": "webpack-dev-server --inline --progress --port 8080", - "test:webpack": "karma start karma.webpack.conf.js", - "build:webpack": "rimraf dist && webpack --config config/webpack.prod.js --bail", - "build:cli": "ng build", - "build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup.js", - "i18n": "ng-xi18n" + "webdriver:update": "webdriver-manager update" }, "keywords": [], "author": "", @@ -42,6 +27,7 @@ "angular-in-memory-web-api": "~0.1.1", "bootstrap": "^3.3.7", "core-js": "^2.4.1", + "protractor": "^4.0.9", "reflect-metadata": "^0.1.8", "rollup": "^0.36.0", "rollup-plugin-node-resolve": "^2.0.0", @@ -51,7 +37,9 @@ "zone.js": "^0.6.25" }, "devDependencies": { - "angular-cli": "^1.0.0-beta.5", + "@types/angular": "^1.5.15", + "@types/jasmine": "^2.2.34", + "@types/selenium-webdriver": "^2.53.32", "angular2-template-loader": "^0.4.0", "awesome-typescript-loader": "^2.2.4", "canonical-path": "0.0.2", @@ -62,6 +50,7 @@ "html-loader": "^0.4.3", "html-webpack-plugin": "^2.16.1", "http-server": "^0.9.0", + "jasmine": "^2.5.2", "jasmine-core": "^2.5.2", "karma": "^1.3.0", "karma-chrome-launcher": "^2.0.0", @@ -76,7 +65,7 @@ "lodash": "^4.16.2", "null-loader": "^0.1.1", "phantomjs-prebuilt": "^2.1.7", - "protractor": "^3.3.0", + "protractor": "^4.0.9", "raw-loader": "^0.5.1", "rimraf": "^2.5.4", "rollup-plugin-commonjs": "^4.1.0", diff --git a/public/docs/_examples/pipes/e2e-spec.ts b/public/docs/_examples/pipes/e2e-spec.ts index 5f9c4607dc..a2c4062dfd 100644 --- a/public/docs/_examples/pipes/e2e-spec.ts +++ b/public/docs/_examples/pipes/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Pipes', function () { beforeAll(function () { @@ -53,12 +55,10 @@ describe('Pipes', function () { let factorInputEle = eles.get(1); let outputEle = element(by.css('power-boost-calculator p')); baseInputEle.clear().then(function() { - return sendKeys(baseInputEle, '7'); - }).then(function() { + baseInputEle.sendKeys('7'); return factorInputEle.clear(); }).then(function() { - return sendKeys(factorInputEle, '3'); - }).then(function() { + factorInputEle.sendKeys('3'); expect(outputEle.getText()).toContain('343'); }); }); @@ -75,15 +75,10 @@ describe('Pipes', function () { expect(mutateCheckEle.getAttribute('checked')).toEqual('true', 'should default to mutating array'); expect(flyingHeroesEle.count()).toEqual(2, 'only two of the original heroes can fly'); - return sendKeys(nameEle, 'test1\n') - .then(function(){ - expect(flyingHeroesEle.count()).toEqual(2, 'no change while mutating array'); - return mutateCheckEle.click(); - }) - .then(function() { - return sendKeys(nameEle, 'test2\n'); - }) - .then(function() { + nameEle.sendKeys('test1\n'); + expect(flyingHeroesEle.count()).toEqual(2, 'no change while mutating array'); + mutateCheckEle.click().then(function() { + nameEle.sendKeys('test2\n'); expect(flyingHeroesEle.count()).toEqual(4, 'not mutating; should see both adds'); expect(flyingHeroesEle.get(2).getText()).toContain('test1'); expect(flyingHeroesEle.get(3).getText()).toContain('test2'); @@ -105,10 +100,8 @@ describe('Pipes', function () { expect(mutateCheckEle.getAttribute('checked')).toEqual('true', 'should default to mutating array'); expect(flyingHeroesEle.count()).toEqual(2, 'only two of the original heroes can fly'); - return sendKeys(nameEle, 'test1\n') - .then(function(){ - expect(flyingHeroesEle.count()).toEqual(3, 'new flying hero should show in mutating array'); - }); + nameEle.sendKeys('test1\n'); + expect(flyingHeroesEle.count()).toEqual(3, 'new flying hero should show in mutating array'); }); it('should show an async hero message', function () { diff --git a/public/docs/_examples/protractor-helpers.ts b/public/docs/_examples/protractor-helpers.ts new file mode 100644 index 0000000000..f3f784e613 --- /dev/null +++ b/public/docs/_examples/protractor-helpers.ts @@ -0,0 +1,36 @@ +export var appLang = { + appIsTs: false, + appIsJs: false, + appIsDart: false, + appIsUnknown: false +}; + +export function describeIf(cond: boolean, name: string, func: () => void): void { + if (cond) { + describe(name, func); + } else { + xdescribe(name, func); + } +} + +export function itIf(cond: boolean, name: string, func: (done: DoneFn) => void): void { + if (cond) { + it(name, func); + } else { + xit(name, func); + } +} + + // TODO Jesus - figure out what's needed here for the new upgrade chapters +// Allow changing bootstrap mode to NG1 for upgrade tests +export function setProtractorToNg1Mode(): void { + // browser.rootEl = 'body'; + + // let disableNgAnimate = function() { + // angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) { + // $animate.enabled(false); + // }]); + // }; + + // browser.addMockModule('disableNgAnimate', disableNgAnimate); +} diff --git a/public/docs/_examples/_protractor/protractor.config.js b/public/docs/_examples/protractor.config.js similarity index 76% rename from public/docs/_examples/_protractor/protractor.config.js rename to public/docs/_examples/protractor.config.js index 2452bea764..92b5e1fda5 100644 --- a/public/docs/_examples/_protractor/protractor.config.js +++ b/public/docs/_examples/protractor.config.js @@ -43,39 +43,23 @@ exports.config = { // debugging // console.log('browser.params:' + JSON.stringify(browser.params)); + var protractorHelpers = require('./protractor-helpers.ts'); var appDir = browser.params.appDir; if (appDir) { if (appDir.match('/ts') != null) { - browser.appIsTs = true; + protractorHelpers.appLang.appIsTs = true; } else if (appDir.match('/js') != null) { - browser.appIsJs = true; + protractorHelpers.appLang.appIsJs = true; } else if (appDir.match('/dart') != null) { - browser.appIsDart = true; + protractorHelpers.appLang.appIsDart = true; } else { - browser.appIsUnknown = true; + protractorHelpers.appLang.appIsUnknown = true; } } else { - browser.appIsUnknown = true; + protractorHelpers.appLang.appIsUnknown = true; } - jasmine.getEnv().addReporter(new Reporter( browser.params )) ; - global.describeIf = describeIf; - global.itIf = itIf; - global.sendKeys = sendKeys; - - // Allow changing bootstrap mode to NG1 for upgrade tests - global.setProtractorToNg1Mode = function() { - browser.useAllAngular2AppRoots = false; - browser.rootEl = 'body'; - - var disableNgAnimate = function() { - angular.module('disableNgAnimate', []).run(['$animate', function($animate) { - $animate.enabled(false); - }]); - }; - - browser.addMockModule('disableNgAnimate', disableNgAnimate); - }; + jasmine.getEnv().addReporter(new Reporter( browser.params )); }, jasmineNodeOpts: { @@ -87,40 +71,15 @@ exports.config = { beforeLaunch: function() { // add TS support for specs - require('ts-node').register(); + require('ts-node').register({ + project: './tsconfig.json' + }); } }; -function describeIf(cond, name, func) { - if (cond) { - describe(name, func); - } else { - xdescribe(name, func); - } -} - -function itIf(cond, name, func) { - if (cond) { - it(name, func); - } else { - xit(name, func); - } -} - -// Hack - because of bug with protractor send keys -// Hack - because of bug with send keys -function sendKeys(element, str) { - return str.split('').reduce(function (promise, char) { - return promise.then(function () { - return element.sendKeys(char); - }); - }, element.getAttribute('value')); - // better to create a resolved promise here but ... don't know how with protractor; - } - // See http://jasmine.github.io/2.1/custom_reporter.html function Reporter(options) { - var _defaultOutputFile = path.resolve(process.cwd(), "../../../../", 'protractor-results.txt'); + var _defaultOutputFile = path.resolve(process.cwd(), "../../../", 'protractor-results.txt'); options.outputFile = options.outputFile || _defaultOutputFile; var _root = { appDir: options.appDir, suites: [] }; diff --git a/public/docs/_examples/quickstart/e2e-spec.ts b/public/docs/_examples/quickstart/e2e-spec.ts index 5a1c683cfd..a548ec833a 100644 --- a/public/docs/_examples/quickstart/e2e-spec.ts +++ b/public/docs/_examples/quickstart/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('QuickStart E2E Tests', function () { let expectedMsg = 'My First Angular App'; diff --git a/public/docs/_examples/router/e2e-spec.ts b/public/docs/_examples/router/e2e-spec.ts index a82ebd08a5..a3d6d9b926 100644 --- a/public/docs/_examples/router/e2e-spec.ts +++ b/public/docs/_examples/router/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; + describe('Router', function () { beforeAll(function () { @@ -79,12 +81,12 @@ describe('Router', function () { it('should be able to edit and save details from the heroes view', function () { let page = getPageStruct(); - let heroEle: protractor.ElementFinder; + let heroEle: ElementFinder; let heroText: string; page.heroesHref.click().then(function() { heroEle = page.heroesList.get(4); return heroEle.getText(); - }).then(function(text) { + }).then(function(text: string) { expect(text.length).toBeGreaterThan(0, 'should have some text'); // remove leading id from text heroText = text.substr(text.indexOf(' ')).trim(); @@ -94,8 +96,7 @@ describe('Router', function () { expect(page.heroDetail.isPresent()).toBe(true, 'should be able to see crisis detail'); expect(page.heroDetailTitle.getText()).toContain(heroText); let inputEle = page.heroDetail.element(by.css('input')); - return sendKeys(inputEle, '-foo'); - }).then(function() { + inputEle.sendKeys('-foo'); expect(page.heroDetailTitle.getText()).toContain(heroText + '-foo'); let buttonEle = page.heroDetail.element(by.css('button')); return buttonEle.click(); @@ -106,13 +107,13 @@ describe('Router', function () { function crisisCenterEdit(index: number, shouldSave: boolean) { let page = getPageStruct(); - let crisisEle: protractor.ElementFinder; + let crisisEle: ElementFinder; let crisisText: string; page.crisisHref.click() .then(function () { crisisEle = page.crisisList.get(index); return crisisEle.getText(); - }).then(function (text) { + }).then(function(text: string) { expect(text.length).toBeGreaterThan(0, 'should have some text'); // remove leading id from text crisisText = text.substr(text.indexOf(' ')).trim(); @@ -121,8 +122,7 @@ describe('Router', function () { expect(page.crisisDetail.isPresent()).toBe(true, 'should be able to see crisis detail'); expect(page.crisisDetailTitle.getText()).toContain(crisisText); let inputEle = page.crisisDetail.element(by.css('input')); - return sendKeys(inputEle, '-foo'); - }).then(function () { + inputEle.sendKeys('-foo'); expect(page.crisisDetailTitle.getText()).toContain(crisisText + '-foo'); let buttonEle = page.crisisDetail.element(by.cssContainingText('button', shouldSave ? 'Save' : 'Cancel')); return buttonEle.click(); diff --git a/public/docs/_examples/security/e2e-spec.ts b/public/docs/_examples/security/e2e-spec.ts index d1a373a781..23d11cd12b 100644 --- a/public/docs/_examples/security/e2e-spec.ts +++ b/public/docs/_examples/security/e2e-spec.ts @@ -1,5 +1,6 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, By } from 'protractor'; describe('Security E2E Tests', () => { beforeAll(() => browser.get('')); diff --git a/public/docs/_examples/server-communication/e2e-spec.ts b/public/docs/_examples/server-communication/e2e-spec.ts index 3468d363a0..2b6571b039 100644 --- a/public/docs/_examples/server-communication/e2e-spec.ts +++ b/public/docs/_examples/server-communication/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Server Communication', function () { beforeAll(function () { @@ -35,7 +37,7 @@ describe('Server Communication', function () { it('should add a new hero to the list', function () { expect(heroNameInput).toBeDefined(' for hero name must exist'); expect(addButton).toBeDefined('"Add Hero" button must be defined'); - sendKeys(heroNameInput, newHeroName); + heroNameInput.sendKeys(newHeroName); addButton.click().then(function() { expect(heroTags.count()).toBe(heroCountAfterAdd, 'A new hero should be added'); let newHeroInList = heroTags.get(heroCountAfterAdd - 1).getText(); diff --git a/public/docs/_examples/structural-directives/e2e-spec.ts b/public/docs/_examples/structural-directives/e2e-spec.ts index 5f48b08835..335915eb86 100644 --- a/public/docs/_examples/structural-directives/e2e-spec.ts +++ b/public/docs/_examples/structural-directives/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Structural Directives', function () { // tests interact - so we need beforeEach instead of beforeAll @@ -34,7 +36,7 @@ describe('Structural Directives', function () { let cssButtonEle = element(by.cssContainingText('button', 'show | hide')); let cssSiblingEle = cssButtonEle.element(by.xpath('..')).element(by.css('heavy-loader')); let setConditionText: string; - setConditionButtonEle.getText().then(function(text) { + setConditionButtonEle.getText().then(function(text: string) { setConditionText = text; expect(ngIfButtonEle.isPresent()).toBe(true, 'should be able to find ngIfButton'); expect(cssButtonEle.isPresent()).toBe(true, 'should be able to find cssButton'); diff --git a/public/docs/_examples/style-guide/e2e-spec.ts b/public/docs/_examples/style-guide/e2e-spec.ts index 2809e65e44..d143ae5573 100644 --- a/public/docs/_examples/style-guide/e2e-spec.ts +++ b/public/docs/_examples/style-guide/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Style Guide', function () { it('01-01', function () { browser.get('#/01-01'); diff --git a/public/docs/_examples/styleguide/e2e-spec.ts b/public/docs/_examples/styleguide/e2e-spec.ts index 321e86c8a1..af10d2b71d 100644 --- a/public/docs/_examples/styleguide/e2e-spec.ts +++ b/public/docs/_examples/styleguide/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Documentation StyleGuide E2E Tests', function() { let expectedMsg = 'My First Angular App'; diff --git a/public/docs/_examples/template-syntax/e2e-spec.ts b/public/docs/_examples/template-syntax/e2e-spec.ts index 47cbce0d59..124f633280 100644 --- a/public/docs/_examples/template-syntax/e2e-spec.ts +++ b/public/docs/_examples/template-syntax/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + // Not yet complete describe('Template Syntax', function () { diff --git a/public/docs/_examples/toh-1/e2e-spec.ts b/public/docs/_examples/toh-1/e2e-spec.ts index 11e51e4df9..75f99788a6 100644 --- a/public/docs/_examples/toh-1/e2e-spec.ts +++ b/public/docs/_examples/toh-1/e2e-spec.ts @@ -1,7 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node -type WPromise = webdriver.promise.Promise; +import { browser, element, by, ElementFinder } from 'protractor'; +import { promise } from 'selenium-webdriver'; const expectedH1 = 'Tour of Heroes'; const expectedTitle = `Angular ${expectedH1}`; @@ -12,7 +12,7 @@ class Hero { // Factory method // Get hero id and name from the given detail element. - static async fromDetail(detail: protractor.ElementFinder): Promise { + static async fromDetail(detail: ElementFinder): Promise { // Get hero id from the first
    let _id = await detail.all(by.css('div')).first().getText(); // Get name from the h2 @@ -25,9 +25,9 @@ class Hero { } const nameSuffix = 'X'; -function addToHeroName(text: string): WPromise { +function addToHeroName(text: string): promise.Promise { let input = element(by.css('input')); - return sendKeys(input, text); + return input.sendKeys(text); } describe('Tutorial part 1', () => { diff --git a/public/docs/_examples/toh-2/e2e-spec.ts b/public/docs/_examples/toh-2/e2e-spec.ts index cde9e93edf..b5df938cd3 100644 --- a/public/docs/_examples/toh-2/e2e-spec.ts +++ b/public/docs/_examples/toh-2/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; +import { promise } from 'selenium-webdriver'; const expectedH1 = 'Tour of Heroes'; const expectedTitle = `Angular ${expectedH1}`; @@ -7,8 +9,6 @@ const expectedH2 = 'My Heroes'; const targetHero = { id: 16, name: 'RubberMan' }; const nameSuffix = 'X'; -type WPromise = webdriver.promise.Promise; - class Hero { id: number; name: string; @@ -24,7 +24,7 @@ class Hero { } // Get hero id and name from the given detail element. - static async fromDetail(detail: protractor.ElementFinder): Promise { + static async fromDetail(detail: ElementFinder): Promise { // Get hero id from the first
    let _id = await detail.all(by.css('div')).first().getText(); // Get name from the h2 @@ -113,9 +113,9 @@ function updateHeroTests() { } -function addToHeroName(text: string): WPromise { +function addToHeroName(text: string): promise.Promise { let input = element(by.css('input')); - return sendKeys(input, text); + return input.sendKeys(text); } function expectHeading(hLevel: number, expectedText: string): void { diff --git a/public/docs/_examples/toh-3/e2e-spec.ts b/public/docs/_examples/toh-3/e2e-spec.ts index f1e51f5b39..cce266dcaa 100644 --- a/public/docs/_examples/toh-3/e2e-spec.ts +++ b/public/docs/_examples/toh-3/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; +import { promise } from 'selenium-webdriver'; const expectedH1 = 'Tour of Heroes'; const expectedTitle = `Angular ${expectedH1}`; @@ -7,8 +9,6 @@ const expectedH2 = 'My Heroes'; const targetHero = { id: 16, name: 'RubberMan' }; const nameSuffix = 'X'; -type WPromise = webdriver.promise.Promise; - class Hero { id: number; name: string; @@ -24,7 +24,7 @@ class Hero { } // Get hero id and name from the given detail element. - static async fromDetail(detail: protractor.ElementFinder): Promise { + static async fromDetail(detail: ElementFinder): Promise { // Get hero id from the first
    let _id = await detail.all(by.css('div')).first().getText(); // Get name from the h2 @@ -113,9 +113,9 @@ function updateHeroTests() { } -function addToHeroName(text: string): WPromise { +function addToHeroName(text: string): promise.Promise { let input = element(by.css('input')); - return sendKeys(input, text); + return input.sendKeys(text); } function expectHeading(hLevel: number, expectedText: string): void { diff --git a/public/docs/_examples/toh-4/e2e-spec.ts b/public/docs/_examples/toh-4/e2e-spec.ts index 456297b6d2..2307ba17c9 100644 --- a/public/docs/_examples/toh-4/e2e-spec.ts +++ b/public/docs/_examples/toh-4/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; +import { promise } from 'selenium-webdriver'; const expectedH1 = 'Tour of Heroes'; const expectedTitle = `Angular ${expectedH1}`; @@ -7,8 +9,6 @@ const expectedH2 = 'My Heroes'; const targetHero = { id: 16, name: 'RubberMan' }; const nameSuffix = 'X'; -type WPromise = webdriver.promise.Promise; - class Hero { id: number; name: string; @@ -24,7 +24,7 @@ class Hero { } // Get hero id and name from the given detail element. - static async fromDetail(detail: protractor.ElementFinder): Promise { + static async fromDetail(detail: ElementFinder): Promise { // Get hero id from the first
    let _id = await detail.all(by.css('div')).first().getText(); // Get name from the h2 @@ -113,9 +113,9 @@ function updateHeroTests() { } -function addToHeroName(text: string): WPromise { +function addToHeroName(text: string): promise.Promise { let input = element(by.css('input')); - return sendKeys(input, text); + return input.sendKeys(text); } function expectHeading(hLevel: number, expectedText: string): void { diff --git a/public/docs/_examples/toh-5/e2e-spec.ts b/public/docs/_examples/toh-5/e2e-spec.ts index 6935ff19a2..1bb398b7f7 100644 --- a/public/docs/_examples/toh-5/e2e-spec.ts +++ b/public/docs/_examples/toh-5/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; +import { promise } from 'selenium-webdriver'; const expectedH1 = 'Tour of Heroes'; const expectedTitle = `Angular ${expectedH1}`; @@ -8,8 +10,6 @@ const targetHeroDashboardIndex = 3; const nameSuffix = 'X'; const newHeroName = targetHero.name + nameSuffix; -type WPromise = webdriver.promise.Promise; - class Hero { id: number; name: string; @@ -25,7 +25,7 @@ class Hero { } // Get hero id and name from the given detail element. - static async fromDetail(detail: protractor.ElementFinder): Promise { + static async fromDetail(detail: ElementFinder): Promise { // Get hero id from the first
    let _id = await detail.all(by.css('div')).first().getText(); // Get name from the h2 @@ -73,7 +73,7 @@ describe('Tutorial part 5', () => { const expectedViewNames = ['Dashboard', 'Heroes']; it(`has views ${expectedViewNames}`, () => { - let viewNames = getPageElts().hrefs.map(el => el.getText()); + let viewNames = getPageElts().hrefs.map((el: ElementFinder) => el.getText()); expect(viewNames).toEqual(expectedViewNames); }); @@ -173,9 +173,9 @@ describe('Tutorial part 5', () => { }); -function addToHeroName(text: string): WPromise { +function addToHeroName(text: string): promise.Promise { let input = element(by.css('input')); - return sendKeys(input, text); + return input.sendKeys(text); } function expectHeading(hLevel: number, expectedText: string): void { diff --git a/public/docs/_examples/toh-6-aot/ts/dist/build.js.gz b/public/docs/_examples/toh-6-aot/ts/dist/build.js.gz deleted file mode 100644 index 0f71e85c96cb66b5e590fb6a753aec134c3b55fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102759 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
      #)rWq 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 diff --git a/public/docs/_examples/toh-6/e2e-spec.ts b/public/docs/_examples/toh-6/e2e-spec.ts index 8152ac308c..814fa2004c 100644 --- a/public/docs/_examples/toh-6/e2e-spec.ts +++ b/public/docs/_examples/toh-6/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder, ElementArrayFinder } from 'protractor'; +import { promise } from 'selenium-webdriver'; const expectedH1 = 'Tour of Heroes'; const expectedTitle = `Angular ${expectedH1}`; @@ -8,8 +10,6 @@ const targetHeroDashboardIndex = 3; const nameSuffix = 'X'; const newHeroName = targetHero.name + nameSuffix; -type WPromise = webdriver.promise.Promise; - class Hero { id: number; name: string; @@ -25,13 +25,13 @@ class Hero { } // Hero from hero list
    • element. - static async fromLi(li: protractor.ElementFinder): Promise { + static async fromLi(li: ElementFinder): Promise { let strings = await li.all(by.xpath('span')).getText(); return { id: +strings[0], name: strings[1] }; } // Hero id and name from the given detail element. - static async fromDetail(detail: protractor.ElementFinder): Promise { + static async fromDetail(detail: ElementFinder): Promise { // Get hero id from the first
      let _id = await detail.all(by.css('div')).first().getText(); // Get name from the h2 @@ -82,7 +82,7 @@ describe('Tutorial part 6', () => { const expectedViewNames = ['Dashboard', 'Heroes']; it(`has views ${expectedViewNames}`, () => { - let viewNames = getPageElts().hrefs.map(el => el.getText()); + let viewNames = getPageElts().hrefs.map((el: ElementFinder) => el.getText()); expect(viewNames).toEqual(expectedViewNames); }); @@ -188,7 +188,7 @@ describe('Tutorial part 6', () => { const heroesBefore = await toHeroArray(getPageElts().allHeroes); const numHeroes = heroesBefore.length; - sendKeys(element(by.css('input')), newHeroName); + element(by.css('input')).sendKeys(newHeroName); element(by.buttonText('Add')).click(); let page = getPageElts(); @@ -207,19 +207,19 @@ describe('Tutorial part 6', () => { beforeAll(() => browser.get('')); it(`searches for 'Ma'`, async () => { - sendKeys(getPageElts().searchBox, 'Ma'); + getPageElts().searchBox.sendKeys('Ma'); browser.sleep(1000); expect(getPageElts().searchResults.count()).toBe(4); }); it(`continues search with 'g'`, async () => { - sendKeys(getPageElts().searchBox, 'g'); + getPageElts().searchBox.sendKeys('g'); browser.sleep(1000); expect(getPageElts().searchResults.count()).toBe(2); }); it(`continues search with 'n' and gets ${targetHero.name}`, async () => { - sendKeys(getPageElts().searchBox, 'n'); + getPageElts().searchBox.sendKeys('n'); browser.sleep(1000); let page = getPageElts(); expect(page.searchResults.count()).toBe(1); @@ -260,9 +260,9 @@ describe('Tutorial part 6', () => { }); -function addToHeroName(text: string): WPromise { +function addToHeroName(text: string): promise.Promise { let input = element(by.css('input')); - return sendKeys(input, text); + return input.sendKeys(text); } function expectHeading(hLevel: number, expectedText: string): void { @@ -271,13 +271,13 @@ function expectHeading(hLevel: number, expectedText: string): void { expect(hText).toEqual(expectedText, hTag); }; -function getHeroLiEltById(id: number): protractor.ElementFinder { +function getHeroLiEltById(id: number): ElementFinder { let spanForId = element(by.cssContainingText('li span.badge', id.toString())); return spanForId.element(by.xpath('..')); } -async function toHeroArray(allHeroes: protractor.ElementArrayFinder): Promise { - let promisedHeroes: Array> = await allHeroes.map(Hero.fromLi); +async function toHeroArray(allHeroes: ElementArrayFinder): Promise { + let promisedHeroes = await allHeroes.map(Hero.fromLi); // The cast is necessary to get around issuing with the signature of Promise.all() return > Promise.all(promisedHeroes); } diff --git a/public/docs/_examples/tsconfig.json b/public/docs/_examples/tsconfig.json index fd1d10190d..9357b07770 100644 --- a/public/docs/_examples/tsconfig.json +++ b/public/docs/_examples/tsconfig.json @@ -1,6 +1,8 @@ +// this tsconfig is used for protractor tests +// see _boilerplate/tsconfig.json for the the tsconfig used in examples { "compilerOptions": { - "target": "es5", + "target": "es6", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, @@ -8,6 +10,15 @@ "experimentalDecorators": true, "removeComments": false, "noImplicitAny": true, - "suppressImplicitAnyIndexErrors": true - } -} + "suppressImplicitAnyIndexErrors": true, + "typeRoots": [ + "node_modules/@types" + ] + }, + "files": [ + "protractor-helpers.ts" + ], + "include": [ + "*/e2e-spec.ts" + ] +} \ No newline at end of file diff --git a/public/docs/_examples/typings.json b/public/docs/_examples/typings.json index 7da31ca0af..ac640054e5 100644 --- a/public/docs/_examples/typings.json +++ b/public/docs/_examples/typings.json @@ -1,7 +1,13 @@ { "globalDependencies": { + "angular": "registry:dt/angular#1.5.0+20160829152510", + "angular-animate": "registry:dt/angular-animate#1.5.0+20160709061515", + "angular-mocks": "registry:dt/angular-mocks#1.5.0+20160608104721", + "angular-resource": "registry:dt/angular-resource#1.5.0+20160613142217", + "angular-route": "registry:dt/angular-route#1.3.0+20160317120654", "core-js": "registry:dt/core-js#0.0.0+20160725163759", "jasmine": "registry:dt/jasmine#2.2.0+20160621224255", + "jquery": "registry:dt/jquery#1.10.0+20160704162008", "node": "registry:dt/node#6.0.0+20160909174046" } } diff --git a/public/docs/_examples/upgrade-adapter/e2e-spec.ts.disabled b/public/docs/_examples/upgrade-adapter/e2e-spec.ts.disabled index de7ffa68cc..271224cccc 100644 --- a/public/docs/_examples/upgrade-adapter/e2e-spec.ts.disabled +++ b/public/docs/_examples/upgrade-adapter/e2e-spec.ts.disabled @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('Upgrade Tests', function () { // Protractor doesn't support the UpgradeAdapter's asynchronous diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/README.md b/public/docs/_examples/upgrade-phonecat-1-typescript/README.md index dafa67ece9..5770656e86 100644 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/README.md +++ b/public/docs/_examples/upgrade-phonecat-1-typescript/README.md @@ -12,9 +12,6 @@ The following changes from vanilla Phonecat are applied: in index.html and karma.conf.ng1.js. * E2E tests have been moved to the parent directory, where `gulp run-e2e-tests` can discover and run them along with all the other examples. -* Angular 1 typings (from DefinitelyTyped) are added to typings-ng1 so that - TypeScript can recognize Angular 1 code. (typings.json comes from boilerplate - so we can't add them there). * Most of the phone JSON and image data removed in the interest of keeping repo weight down. Keeping enough to retain testability of the app. diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts.disabled similarity index 92% rename from public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts rename to public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts.disabled index 48b0f9baa9..4598a7f6dc 100644 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts +++ b/public/docs/_examples/upgrade-phonecat-1-typescript/e2e-spec.ts.disabled @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, ElementFinder } from 'protractor'; +import { setProtractorToNg1Mode } from '../protractor-helpers'; // Angular E2E Testing Guide: // https://docs.angularjs.org/guide/e2e-testing @@ -43,7 +45,7 @@ describe('PhoneCat Application', function() { let phoneNameColumn = element.all(by.repeater('phone in $ctrl.phones').column('phone.name')); function getNames() { - return phoneNameColumn.map(function(elem) { + return phoneNameColumn.map(function(elem: ElementFinder) { return elem.getText(); }); } diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/index.d.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/index.d.ts deleted file mode 100644 index c720d9293a..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/index.d.ts +++ /dev/null @@ -1,294 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f0b2681b481397d0c03557ac2ac4d70c1c61c464/angularjs/angular-animate.d.ts -declare module "angular-animate" { - var _: string; - export = _; -} - -/** - * ngAnimate module (angular-animate.js) - */ -declare namespace angular.animate { - interface IAnimateFactory { - (...args: any[]): IAnimateCallbackObject; - } - - interface IAnimateCallbackObject { - eventFn?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - setClass?: (element: IAugmentedJQuery, addedClasses: string, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any; - addClass?: (element: IAugmentedJQuery, addedClasses: string, doneFunction: Function, options: IAnimationOptions) => any; - removeClass?: (element: IAugmentedJQuery, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any; - enter?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - leave?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - move?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - animate?: (element: IAugmentedJQuery, fromStyles: string, toStyles: string, doneFunction: Function, options: IAnimationOptions) => any; - } - - interface IAnimationPromise extends IPromise {} - - /** - * AnimateService - * see http://docs.angularjs.org/api/ngAnimate/service/$animate - */ - interface IAnimateService { - /** - * Sets up an event listener to fire whenever the animation event has fired on the given element or among any of its children. - * - * @param event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...) - * @param container the container element that will capture each of the animation events that are fired on itself as well as among its children - * @param callback the callback function that will be fired when the listener is triggered - */ - on(event: string, container: JQuery, callback: Function): void; - - /** - * Deregisters an event listener based on the event which has been associated with the provided element. - * - * @param event the animation event (e.g. enter, leave, move, addClass, removeClass, etc...) - * @param container the container element the event listener was placed on - * @param callback the callback function that was registered as the listener - */ - off(event: string, container?: JQuery, callback?: Function): void; - - /** - * Associates the provided element with a host parent element to allow the element to be animated even if it exists outside of the DOM structure of the Angular application. - * - * @param element the external element that will be pinned - * @param parentElement the host parent element that will be associated with the external element - */ - pin(element: JQuery, parentElement: JQuery): void; - - /** - * Globally enables / disables animations. - * - * @param element If provided then the element will be used to represent the enable/disable operation. - * @param value If provided then set the animation on or off. - * @returns current animation state - */ - enabled(element: JQuery, value?: boolean): boolean; - enabled(value: boolean): boolean; - - /** - * Cancels the provided animation. - */ - cancel(animationPromise: IAnimationPromise): void; - - /** - * Performs an inline animation on the element. - * - * @param element the element that will be the focus of the animation - * @param from a collection of CSS styles that will be applied to the element at the start of the animation - * @param to a collection of CSS styles that the element will animate towards - * @param className an optional CSS class that will be added to the element for the duration of the animation (the default class is 'ng-inline-animate') - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - animate(element: JQuery, from: any, to: any, className?: string, options?: IAnimationOptions): IAnimationPromise; - - /** - * Appends the element to the parentElement element that resides in the document and then runs the enter animation. - * - * @param element the element that will be the focus of the enter animation - * @param parentElement the parent element of the element that will be the focus of the enter animation - * @param afterElement the sibling element (which is the previous element) of the element that will be the focus of the enter animation - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - enter(element: JQuery, parentElement: JQuery, afterElement?: JQuery, options?: IAnimationOptions): IAnimationPromise; - - /** - * Runs the leave animation operation and, upon completion, removes the element from the DOM. - * - * @param element the element that will be the focus of the leave animation - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - leave(element: JQuery, options?: IAnimationOptions): IAnimationPromise; - - /** - * Fires the move DOM operation. Just before the animation starts, the animate service will either append - * it into the parentElement container or add the element directly after the afterElement element if present. - * Then the move animation will be run. - * - * @param element the element that will be the focus of the move animation - * @param parentElement the parent element of the element that will be the focus of the move animation - * @param afterElement the sibling element (which is the previous element) of the element that will be the focus of the move animation - * @returns the animation callback promise - */ - move(element: JQuery, parentElement: JQuery, afterElement?: JQuery): IAnimationPromise; - - /** - * Triggers a custom animation event based off the className variable and then attaches the className - * value to the element as a CSS class. - * - * @param element the element that will be animated - * @param className the CSS class that will be added to the element and then animated - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - addClass(element: JQuery, className: string, options?: IAnimationOptions): IAnimationPromise; - - /** - * Triggers a custom animation event based off the className variable and then removes the CSS class - * provided by the className value from the element. - * - * @param element the element that will be animated - * @param className the CSS class that will be animated and then removed from the element - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - removeClass(element: JQuery, className: string, options?: IAnimationOptions): IAnimationPromise; - - /** - * Adds and/or removes the given CSS classes to and from the element. Once complete, the done() callback - * will be fired (if provided). - * - * @param element the element which will have its CSS classes changed removed from it - * @param add the CSS classes which will be added to the element - * @param remove the CSS class which will be removed from the element CSS classes have been set on the element - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - setClass(element: JQuery, add: string, remove: string, options?: IAnimationOptions): IAnimationPromise; - } - - /** - * AnimateProvider - * see http://docs.angularjs.org/api/ngAnimate/provider/$animateProvider - */ - interface IAnimateProvider { - /** - * Registers a new injectable animation factory function. - * - * @param name The name of the animation. - * @param factory The factory function that will be executed to return the animation object. - */ - register(name: string, factory: IAnimateFactory): void; - - /** - * Gets and/or sets the CSS class expression that is checked when performing an animation. - * - * @param expression The className expression which will be checked against all animations. - * @returns The current CSS className expression value. If null then there is no expression value. - */ - classNameFilter(expression?: RegExp): RegExp; - } - - /** - * Angular Animation Options - * see https://docs.angularjs.org/api/ngAnimate/#applying-directive-specific-styles-to-an-animation - */ - interface IAnimationOptions { - /** - * The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition. - */ - to?: Object; - - /** - * The starting CSS styles (a key/value object) that will be applied at the start of the animation. - */ - from?: Object; - - /** - * The DOM event (e.g. enter, leave, move). When used, a generated CSS class of ng-EVENT and - * ng-EVENT-active will be applied to the element during the animation. Multiple events can be provided when - * spaces are used as a separator. (Note that this will not perform any DOM operation.) - */ - event?: string; - - /** - * The CSS easing value that will be applied to the transition or keyframe animation (or both). - */ - easing?: string; - - /** - * The raw CSS transition style that will be used (e.g. 1s linear all). - */ - transition?: string; - - /** - * The raw CSS keyframe animation style that will be used (e.g. 1s my_animation linear). - */ - keyframe?: string; - - /** - * A space separated list of CSS classes that will be added to the element and spread across the animation. - */ - addClass?: string; - - /** - * A space separated list of CSS classes that will be removed from the element and spread across - * the animation. - */ - removeClass?: string; - - /** - * A number value representing the total duration of the transition and/or keyframe (note that a value - * of 1 is 1000ms). If a value of 0 is provided then the animation will be skipped entirely. - */ - duration?: number; - - /** - * A number value representing the total delay of the transition and/or keyframe (note that a value of - * 1 is 1000ms). If a value of true is used then whatever delay value is detected from the CSS classes will be - * mirrored on the elements styles (e.g. by setting delay true then the style value of the element will be - * transition-delay: DETECTED_VALUE). Using true is useful when you want the CSS classes and inline styles to - * all share the same CSS delay value. - */ - delay?: number; - - /** - * A numeric time value representing the delay between successively animated elements (Click here to - * learn how CSS-based staggering works in ngAnimate.) - */ - stagger?: number; - - /** - * The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item - * in the stagger; therefore when a stagger option value of 0.1 is used then there will be a stagger delay of 600ms) - * applyClassesEarly - Whether or not the classes being added or removed will be used when detecting the animation. - * This is set by $animate when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. - * (Note that this will prevent any transitions from occuring on the classes being added and removed.) - */ - staggerIndex?: number; - } - - interface IAnimateCssRunner { - /** - * Starts the animation - * - * @returns The animation runner with a done function for supplying a callback. - */ - start(): IAnimateCssRunnerStart; - - /** - * Ends (aborts) the animation - */ - end(): void; - } - - interface IAnimateCssRunnerStart extends IPromise { - /** - * Allows you to add done callbacks to the running animation - * - * @param callbackFn: the callback function to be run - */ - done(callbackFn: (animationFinished: boolean) => void): void; - } - - /** - * AnimateCssService - * see http://docs.angularjs.org/api/ngAnimate/service/$animateCss - */ - interface IAnimateCssService { - (element: JQuery, animateCssOptions: IAnimationOptions): IAnimateCssRunner; - } -} - -declare module angular { - interface IModule { - animation(name: string, animationFactory: angular.animate.IAnimateFactory): IModule; - animation(name: string, inlineAnnotatedFunction: any[]): IModule; - animation(object: Object): IModule; - } - -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/typings.json b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/typings.json deleted file mode 100644 index ea2467c89a..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-animate/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f0b2681b481397d0c03557ac2ac4d70c1c61c464/angularjs/angular-animate.d.ts", - "raw": "registry:dt/angular-animate#1.5.0+20160407085121", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f0b2681b481397d0c03557ac2ac4d70c1c61c464/angularjs/angular-animate.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/index.d.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/index.d.ts deleted file mode 100644 index fd6e92534b..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/index.d.ts +++ /dev/null @@ -1,339 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5b7257019ae959533341a715b339d2562bbf9b85/angularjs/angular-mocks.d.ts -declare module "angular-mocks/ngMock" { - var _: string; - export = _; -} - -declare module "angular-mocks/ngMockE2E" { - var _: string; - export = _; -} - -declare module "angular-mocks/ngAnimateMock" { - var _: string; - export = _; -} - -/////////////////////////////////////////////////////////////////////////////// -// ngMock module (angular-mocks.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular { - - /////////////////////////////////////////////////////////////////////////// - // AngularStatic - // We reopen it to add the MockStatic definition - /////////////////////////////////////////////////////////////////////////// - interface IAngularStatic { - mock: IMockStatic; - } - - // see https://docs.angularjs.org/api/ngMock/function/angular.mock.inject - interface IInjectStatic { - (...fns: Function[]): any; - (...inlineAnnotatedConstructor: any[]): any; // this overload is undocumented, but works - strictDi(val?: boolean): void; - } - - interface IMockStatic { - // see https://docs.angularjs.org/api/ngMock/function/angular.mock.dump - dump(obj: any): string; - - inject: IInjectStatic - - // see https://docs.angularjs.org/api/ngMock/function/angular.mock.module - module: { - (...modules: any[]): any; - sharedInjector(): void; - } - - // see https://docs.angularjs.org/api/ngMock/type/angular.mock.TzDate - TzDate(offset: number, timestamp: number): Date; - TzDate(offset: number, timestamp: string): Date; - } - - /////////////////////////////////////////////////////////////////////////// - // ExceptionHandlerService - // see https://docs.angularjs.org/api/ngMock/service/$exceptionHandler - // see https://docs.angularjs.org/api/ngMock/provider/$exceptionHandlerProvider - /////////////////////////////////////////////////////////////////////////// - interface IExceptionHandlerProvider extends IServiceProvider { - mode(mode: string): void; - } - - /////////////////////////////////////////////////////////////////////////// - // TimeoutService - // see https://docs.angularjs.org/api/ngMock/service/$timeout - // Augments the original service - /////////////////////////////////////////////////////////////////////////// - interface ITimeoutService { - flush(delay?: number): void; - flushNext(expectedDelay?: number): void; - verifyNoPendingTasks(): void; - } - - /////////////////////////////////////////////////////////////////////////// - // IntervalService - // see https://docs.angularjs.org/api/ngMock/service/$interval - // Augments the original service - /////////////////////////////////////////////////////////////////////////// - interface IIntervalService { - flush(millis?: number): number; - } - - /////////////////////////////////////////////////////////////////////////// - // LogService - // see https://docs.angularjs.org/api/ngMock/service/$log - // Augments the original service - /////////////////////////////////////////////////////////////////////////// - interface ILogService { - assertEmpty(): void; - reset(): void; - } - - interface ILogCall { - logs: string[]; - } - - /////////////////////////////////////////////////////////////////////////// - // ControllerService mock - // see https://docs.angularjs.org/api/ngMock/service/$controller - // This interface extends http://docs.angularjs.org/api/ng.$controller - /////////////////////////////////////////////////////////////////////////// - interface IControllerService { - // Although the documentation doesn't state this, locals are optional - (controllerConstructor: new (...args: any[]) => T, locals?: any, bindings?: any): T; - (controllerConstructor: Function, locals?: any, bindings?: any): T; - (controllerName: string, locals?: any, bindings?: any): T; - } - - /////////////////////////////////////////////////////////////////////////// - // ComponentControllerService - // see https://docs.angularjs.org/api/ngMock/service/$componentController - /////////////////////////////////////////////////////////////////////////// - interface IComponentControllerService { - // TBinding is an interface exposed by a component as per John Papa's style guide - // https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#accessible-members-up-top - (componentName: string, locals: { $scope: IScope, [key: string]: any }, bindings?: TBinding, ident?: string): T; - } - - - /////////////////////////////////////////////////////////////////////////// - // HttpBackendService - // see https://docs.angularjs.org/api/ngMock/service/$httpBackend - /////////////////////////////////////////////////////////////////////////// - interface IHttpBackendService { - /** - * Flushes all pending requests using the trained responses. - * @param count Number of responses to flush (in the order they arrived). If undefined, all pending requests will be flushed. - */ - flush(count?: number): void; - - /** - * Resets all request expectations, but preserves all backend definitions. - */ - resetExpectations(): void; - - /** - * Verifies that all of the requests defined via the expect api were made. If any of the requests were not made, verifyNoOutstandingExpectation throws an exception. - */ - verifyNoOutstandingExpectation(): void; - - /** - * Verifies that there are no outstanding requests that need to be flushed. - */ - verifyNoOutstandingRequest(): void; - - /** - * Creates a new request expectation. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param method HTTP method. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expect(method: string, url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)) :mock.IRequestHandler; - - /** - * Creates a new request expectation for DELETE requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url is as expected. - * @param headers HTTP headers object to be compared with the HTTP headers in the request. - */ - expectDELETE(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for GET requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object to be compared with the HTTP headers in the request. - */ - expectGET(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for HEAD requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object to be compared with the HTTP headers in the request. - */ - expectHEAD(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for JSONP requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - */ - expectJSONP(url: string | RegExp | ((url: string) => boolean)): mock.IRequestHandler; - - /** - * Creates a new request expectation for PATCH requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expectPATCH(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for POST requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expectPOST(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for PUT requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expectPUT(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new backend definition. - * Returns an object with respond method that controls how a matched request is handled. - * @param method HTTP method. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - when(method: string, url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for DELETE requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenDELETE(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for GET requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenGET(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for HEAD requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenHEAD(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for JSONP requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenJSONP(url: string | RegExp | ((url: string) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for PATCH requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenPATCH(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for POST requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenPOST(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for PUT requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenPUT(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - } - - export module mock { - // returned interface by the the mocked HttpBackendService expect/when methods - interface IRequestHandler { - - /** - * Controls the response for a matched request using a function to construct the response. - * Returns the RequestHandler object for possible overrides. - * @param func Function that receives the request HTTP method, url, data, and headers and returns an array containing response status (number), data, headers, and status text. - */ - respond(func: ((method: string, url: string, data: string | Object, headers: Object) => [number, string | Object, Object, string])): IRequestHandler; - - /** - * Controls the response for a matched request using supplied static data to construct the response. - * Returns the RequestHandler object for possible overrides. - * @param status HTTP status code to add to the response. - * @param data Data to add to the response. - * @param headers Headers object to add to the response. - * @param responseText Response text to add to the response. - */ - respond(status: number, data: string | Object, headers?: Object, responseText?: string): IRequestHandler; - - /** - * Controls the response for a matched request using the HTTP status code 200 and supplied static data to construct the response. - * Returns the RequestHandler object for possible overrides. - * @param data Data to add to the response. - * @param headers Headers object to add to the response. - * @param responseText Response text to add to the response. - */ - respond(data: string | Object, headers?: Object, responseText?: string): IRequestHandler; - - // Available when ngMockE2E is loaded - /** - * Any request matching a backend definition or expectation with passThrough handler will be passed through to the real backend (an XHR request will be made to the server.) - */ - passThrough(): IRequestHandler; - } - - } - -} - -/////////////////////////////////////////////////////////////////////////////// -// functions attached to global object (window) -/////////////////////////////////////////////////////////////////////////////// -//Use `angular.mock.module` instead of `module`, as `module` conflicts with commonjs. -//declare var module: (...modules: any[]) => any; -declare var inject: angular.IInjectStatic; \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/typings.json b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/typings.json deleted file mode 100644 index 4e51b0e278..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-mocks/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5b7257019ae959533341a715b339d2562bbf9b85/angularjs/angular-mocks.d.ts", - "raw": "registry:dt/angular-mocks#1.3.0+20160425155016", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5b7257019ae959533341a715b339d2562bbf9b85/angularjs/angular-mocks.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/index.d.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/index.d.ts deleted file mode 100644 index 3735f9430c..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/index.d.ts +++ /dev/null @@ -1,191 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/e684481e0cd360db62fd6213ca7248245315e8a2/angularjs/angular-resource.d.ts -declare module 'angular-resource' { - var _: string; - export = _; -} - -/////////////////////////////////////////////////////////////////////////////// -// ngResource module (angular-resource.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular.resource { - - /** - * Currently supported options for the $resource factory options argument. - */ - interface IResourceOptions { - /** - * If true then the trailing slashes from any calculated URL will be stripped (defaults to true) - */ - stripTrailingSlashes?: boolean; - /** - * If true, the request made by a "non-instance" call will be cancelled (if not already completed) by calling - * $cancelRequest() on the call's return value. This can be overwritten per action. (Defaults to false.) - */ - cancellable?: boolean; - } - - - /////////////////////////////////////////////////////////////////////////// - // ResourceService - // see http://docs.angularjs.org/api/ngResource.$resource - // Most part of the following definitions were achieved by analyzing the - // actual implementation, since the documentation doesn't seem to cover - // that deeply. - /////////////////////////////////////////////////////////////////////////// - interface IResourceService { - (url: string, paramDefaults?: any, - /** example: {update: { method: 'PUT' }, delete: deleteDescriptor } - where deleteDescriptor : IActionDescriptor */ - actions?: any, options?: IResourceOptions): IResourceClass>; - (url: string, paramDefaults?: any, - /** example: {update: { method: 'PUT' }, delete: deleteDescriptor } - where deleteDescriptor : IActionDescriptor */ - actions?: any, options?: IResourceOptions): U; - (url: string, paramDefaults?: any, - /** example: {update: { method: 'PUT' }, delete: deleteDescriptor } - where deleteDescriptor : IActionDescriptor */ - actions?: any, options?: IResourceOptions): IResourceClass; - } - - // Just a reference to facilitate describing new actions - interface IActionDescriptor { - method: string; - params?: any; - url?: string; - isArray?: boolean; - transformRequest?: angular.IHttpRequestTransformer | angular.IHttpRequestTransformer[]; - transformResponse?: angular.IHttpResponseTransformer | angular.IHttpResponseTransformer[]; - headers?: any; - cache?: boolean | angular.ICacheObject; - /** - * Note: In contrast to $http.config, promises are not supported in $resource, because the same value - * would be used for multiple requests. If you are looking for a way to cancel requests, you should - * use the cancellable option. - */ - timeout?: number - cancellable?: boolean; - withCredentials?: boolean; - responseType?: string; - interceptor?: IHttpInterceptor; - } - - // Allow specify more resource methods - // No need to add duplicates for all four overloads. - interface IResourceMethod { - (): T; - (params: Object): T; - (success: Function, error?: Function): T; - (params: Object, success: Function, error?: Function): T; - (params: Object, data: Object, success?: Function, error?: Function): T; - } - - // Allow specify resource moethod which returns the array - // No need to add duplicates for all four overloads. - interface IResourceArrayMethod { - (): IResourceArray; - (params: Object): IResourceArray; - (success: Function, error?: Function): IResourceArray; - (params: Object, success: Function, error?: Function): IResourceArray; - (params: Object, data: Object, success?: Function, error?: Function): IResourceArray; - } - - // Baseclass for everyresource with default actions. - // If you define your new actions for the resource, you will need - // to extend this interface and typecast the ResourceClass to it. - // - // In case of passing the first argument as anything but a function, - // it's gonna be considered data if the action method is POST, PUT or - // PATCH (in other words, methods with body). Otherwise, it's going - // to be considered as parameters to the request. - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L461-L465 - // - // Only those methods with an HTTP body do have 'data' as first parameter: - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L463 - // More specifically, those methods are POST, PUT and PATCH: - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L432 - // - // Also, static calls always return the IResource (or IResourceArray) retrieved - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L549 - interface IResourceClass { - new(dataOrParams? : any) : T; - get: IResourceMethod; - - query: IResourceArrayMethod; - - save: IResourceMethod; - - remove: IResourceMethod; - - delete: IResourceMethod; - } - - // Instance calls always return the the promise of the request which retrieved the object - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L546 - interface IResource { - $get(): angular.IPromise; - $get(params?: Object, success?: Function, error?: Function): angular.IPromise; - $get(success: Function, error?: Function): angular.IPromise; - - $query(): angular.IPromise>; - $query(params?: Object, success?: Function, error?: Function): angular.IPromise>; - $query(success: Function, error?: Function): angular.IPromise>; - - $save(): angular.IPromise; - $save(params?: Object, success?: Function, error?: Function): angular.IPromise; - $save(success: Function, error?: Function): angular.IPromise; - - $remove(): angular.IPromise; - $remove(params?: Object, success?: Function, error?: Function): angular.IPromise; - $remove(success: Function, error?: Function): angular.IPromise; - - $delete(): angular.IPromise; - $delete(params?: Object, success?: Function, error?: Function): angular.IPromise; - $delete(success: Function, error?: Function): angular.IPromise; - - $cancelRequest(): void; - - /** the promise of the original server interaction that created this instance. **/ - $promise : angular.IPromise; - $resolved : boolean; - toJSON(): T; - } - - /** - * Really just a regular Array object with $promise and $resolve attached to it - */ - interface IResourceArray extends Array> { - /** the promise of the original server interaction that created this collection. **/ - $promise : angular.IPromise>; - $resolved : boolean; - } - - /** when creating a resource factory via IModule.factory */ - interface IResourceServiceFactoryFunction { - ($resource: angular.resource.IResourceService): IResourceClass; - >($resource: angular.resource.IResourceService): U; - } - - // IResourceServiceProvider used to configure global settings - interface IResourceServiceProvider extends angular.IServiceProvider { - - defaults: IResourceOptions; - } - -} - -/** extensions to base ng based on using angular-resource */ -declare namespace angular { - - interface IModule { - /** creating a resource service factory */ - factory(name: string, resourceServiceFactoryFunction: angular.resource.IResourceServiceFactoryFunction): IModule; - } -} - -interface Array -{ - /** the promise of the original server interaction that created this collection. **/ - $promise : angular.IPromise>; - $resolved : boolean; -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/typings.json b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/typings.json deleted file mode 100644 index b60eafd673..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-resource/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/e684481e0cd360db62fd6213ca7248245315e8a2/angularjs/angular-resource.d.ts", - "raw": "registry:dt/angular-resource#1.5.0+20160412142209", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/e684481e0cd360db62fd6213ca7248245315e8a2/angularjs/angular-resource.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/index.d.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/index.d.ts deleted file mode 100644 index 5fad393d0a..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/index.d.ts +++ /dev/null @@ -1,154 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/angularjs/angular-route.d.ts -declare module "angular-route" { - var _: string; - export = _; -} - -/////////////////////////////////////////////////////////////////////////////// -// ngRoute module (angular-route.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular.route { - - /////////////////////////////////////////////////////////////////////////// - // RouteParamsService - // see http://docs.angularjs.org/api/ngRoute.$routeParams - /////////////////////////////////////////////////////////////////////////// - interface IRouteParamsService { - [key: string]: any; - } - - /////////////////////////////////////////////////////////////////////////// - // RouteService - // see http://docs.angularjs.org/api/ngRoute.$route - // see http://docs.angularjs.org/api/ngRoute.$routeProvider - /////////////////////////////////////////////////////////////////////////// - interface IRouteService { - reload(): void; - routes: any; - - // May not always be available. For instance, current will not be available - // to a controller that was not initialized as a result of a route maching. - current?: ICurrentRoute; - - /** - * Causes $route service to update the current URL, replacing current route parameters with those specified in newParams. - * Provided property names that match the route's path segment definitions will be interpolated into the - * location's path, while remaining properties will be treated as query params. - * - * @param newParams Object. mapping of URL parameter names to values - */ - updateParams(newParams:{[key:string]:string}): void; - - } - - type InlineAnnotatedFunction = Function|Array - - /** - * see http://docs.angularjs.org/api/ngRoute/provider/$routeProvider#when for API documentation - */ - interface IRoute { - /** - * {(string|function()=} - * Controller fn that should be associated with newly created scope or the name of a registered controller if passed as a string. - */ - controller?: string|InlineAnnotatedFunction; - /** - * A controller alias name. If present the controller will be published to scope under the controllerAs name. - */ - controllerAs?: string; - /** - * Undocumented? - */ - name?: string; - /** - * {string=|function()=} - * Html template as a string or a function that returns an html template as a string which should be used by ngView or ngInclude directives. This property takes precedence over templateUrl. - * - * If template is a function, it will be called with the following parameters: - * - * {Array.} - route parameters extracted from the current $location.path() by applying the current route - */ - template?: string|{($routeParams?: angular.route.IRouteParamsService) : string;} - /** - * {string=|function()=} - * Path or function that returns a path to an html template that should be used by ngView. - * - * If templateUrl is a function, it will be called with the following parameters: - * - * {Array.} - route parameters extracted from the current $location.path() by applying the current route - */ - templateUrl?: string|{ ($routeParams?: angular.route.IRouteParamsService): string; } - /** - * {Object.=} - An optional map of dependencies which should be injected into the controller. If any of these dependencies are promises, the router will wait for them all to be resolved or one to be rejected before the controller is instantiated. If all the promises are resolved successfully, the values of the resolved promises are injected and $routeChangeSuccess event is fired. If any of the promises are rejected the $routeChangeError event is fired. The map object is: - * - * - key - {string}: a name of a dependency to be injected into the controller. - * - factory - {string|function}: If string then it is an alias for a service. Otherwise if function, then it is injected and the return value is treated as the dependency. If the result is a promise, it is resolved before its value is injected into the controller. Be aware that ngRoute.$routeParams will still refer to the previous route within these resolve functions. Use $route.current.params to access the new route parameters, instead. - */ - resolve?: {[key: string]: any}; - /** - * {(string|function())=} - * Value to update $location path with and trigger route redirection. - * - * If redirectTo is a function, it will be called with the following parameters: - * - * - {Object.} - route parameters extracted from the current $location.path() by applying the current route templateUrl. - * - {string} - current $location.path() - * - {Object} - current $location.search() - * - The custom redirectTo function is expected to return a string which will be used to update $location.path() and $location.search(). - */ - redirectTo?: string|{($routeParams?: angular.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) : string}; - /** - * Reload route when only $location.search() or $location.hash() changes. - * - * This option defaults to true. If the option is set to false and url in the browser changes, then $routeUpdate event is broadcasted on the root scope. - */ - reloadOnSearch?: boolean; - /** - * Match routes without being case sensitive - * - * This option defaults to false. If the option is set to true, then the particular route can be matched without being case sensitive - */ - caseInsensitiveMatch?: boolean; - } - - // see http://docs.angularjs.org/api/ng.$route#current - interface ICurrentRoute extends IRoute { - locals: { - [index: string]: any; - $scope: IScope; - $template: string; - }; - - params: any; - } - - interface IRouteProvider extends IServiceProvider { - /** - * Match routes without being case sensitive - * - * This option defaults to false. If the option is set to true, then the particular route can be matched without being case sensitive - */ - caseInsensitiveMatch?: boolean; - /** - * Sets route definition that will be used on route change when no other route definition is matched. - * - * @params Mapping information to be assigned to $route.current. - */ - otherwise(params: IRoute): IRouteProvider; - /** - * Adds a new route definition to the $route service. - * - * @param path Route path (matched against $location.path). If $location.path contains redundant trailing slash or is missing one, the route will still match and the $location.path will be updated to add or drop the trailing slash to exactly match the route definition. - * - * - path can contain named groups starting with a colon: e.g. :name. All characters up to the next slash are matched and stored in $routeParams under the given name when the route matches. - * - path can contain named groups starting with a colon and ending with a star: e.g.:name*. All characters are eagerly stored in $routeParams under the given name when the route matches. - * - path can contain optional named groups with a question mark: e.g.:name?. - * - * For example, routes like /color/:color/largecode/:largecode*\/edit will match /color/brown/largecode/code/with/slashes/edit and extract: color: brown and largecode: code/with/slashes. - * - * @param route Mapping information to be assigned to $route.current on route match. - */ - when(path: string, route: IRoute): IRouteProvider; - } -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/typings.json b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/typings.json deleted file mode 100644 index 4c4677f34f..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular-route/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/angularjs/angular-route.d.ts", - "raw": "registry:dt/angular-route#1.3.0+20160317120654", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/angularjs/angular-route.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/index.d.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/index.d.ts deleted file mode 100644 index dfde81e26b..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/index.d.ts +++ /dev/null @@ -1,1953 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/b76dd8a7f95b71696982befbb7589940d27e940b/angularjs/angular.d.ts -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; -} - -/////////////////////////////////////////////////////////////////////////////// -// ng module (angular.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular { - - // not directly implemented, but ensures that constructed class implements $get - interface IServiceProviderClass { - new (...args: any[]): IServiceProvider; - } - - interface IServiceProviderFactory { - (...args: any[]): IServiceProvider; - } - - // All service providers extend this interface - interface IServiceProvider { - $get: any; - } - - interface IAngularBootstrapConfig { - strictDi?: boolean; - debugInfoEnabled?: boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // AngularStatic - // see http://docs.angularjs.org/api - /////////////////////////////////////////////////////////////////////////// - interface IAngularStatic { - bind(context: any, fn: Function, ...args: any[]): Function; - - /** - * Use this function to manually start up angular application. - * - * @param element DOM element which is the root of angular application. - * @param modules An array of modules to load into the application. - * Each item in the array should be the name of a predefined module or a (DI annotated) - * function that will be invoked by the injector as a config block. - * @param config an object for defining configuration options for the application. The following keys are supported: - * - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code. - */ - bootstrap(element: string|Element|JQuery|Document, modules?: (string|Function|any[])[], config?: IAngularBootstrapConfig): auto.IInjectorService; - - /** - * Creates a deep copy of source, which should be an object or an array. - * - * - If no destination is supplied, a copy of the object or array is created. - * - If a destination is provided, all of its elements (for array) or properties (for objects) are deleted and then all elements/properties from the source are copied to it. - * - If source is not an object or array (inc. null and undefined), source is returned. - * - If source is identical to 'destination' an exception will be thrown. - * - * @param source The source that will be used to make a copy. Can be any type, including primitives, null, and undefined. - * @param destination Destination into which the source is copied. If provided, must be of the same type as source. - */ - copy(source: T, destination?: T): T; - - /** - * Wraps a raw DOM element or HTML string as a jQuery element. - * - * If jQuery is available, angular.element is an alias for the jQuery function. If jQuery is not available, angular.element delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite." - */ - element: IAugmentedJQueryStatic; - equals(value1: any, value2: any): boolean; - extend(destination: any, ...sources: any[]): any; - - /** - * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional. - * - * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method. - * - * @param obj Object to iterate over. - * @param iterator Iterator function. - * @param context Object to become context (this) for the iterator function. - */ - forEach(obj: T[], iterator: (value: T, key: number) => any, context?: any): any; - /** - * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional. - * - * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method. - * - * @param obj Object to iterate over. - * @param iterator Iterator function. - * @param context Object to become context (this) for the iterator function. - */ - forEach(obj: { [index: string]: T; }, iterator: (value: T, key: string) => any, context?: any): any; - /** - * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional. - * - * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method. - * - * @param obj Object to iterate over. - * @param iterator Iterator function. - * @param context Object to become context (this) for the iterator function. - */ - forEach(obj: any, iterator: (value: any, key: any) => any, context?: any): any; - - fromJson(json: string): any; - identity(arg?: T): T; - injector(modules?: any[], strictDi?: boolean): auto.IInjectorService; - isArray(value: any): boolean; - isDate(value: any): boolean; - isDefined(value: any): boolean; - isElement(value: any): boolean; - isFunction(value: any): boolean; - isNumber(value: any): boolean; - isObject(value: any): boolean; - isString(value: any): boolean; - isUndefined(value: any): boolean; - lowercase(str: string): string; - - /** - * Deeply extends the destination object dst by copying own enumerable properties from the src object(s) to dst. You can specify multiple src objects. If you want to preserve original objects, you can do so by passing an empty object as the target: var object = angular.merge({}, object1, object2). - * - * Unlike extend(), merge() recursively descends into object properties of source objects, performing a deep copy. - * - * @param dst Destination object. - * @param src Source object(s). - */ - merge(dst: any, ...src: any[]): any; - - /** - * The angular.module is a global place for creating, registering and retrieving Angular modules. All modules (angular core or 3rd party) that should be available to an application must be registered using this mechanism. - * - * When passed two or more arguments, a new module is created. If passed only one argument, an existing module (the name passed as the first argument to module) is retrieved. - * - * @param name The name of the module to create or retrieve. - * @param requires The names of modules this module depends on. If specified then new module is being created. If unspecified then the module is being retrieved for further configuration. - * @param configFn Optional configuration function for the module. - */ - module( - name: string, - requires?: string[], - configFn?: Function): IModule; - - noop(...args: any[]): void; - reloadWithDebugInfo(): void; - toJson(obj: any, pretty?: boolean): string; - uppercase(str: string): string; - version: { - full: string; - major: number; - minor: number; - dot: number; - codeName: string; - }; - - /** - * If window.name contains prefix NG_DEFER_BOOTSTRAP! when angular.bootstrap is called, the bootstrap process will be paused until angular.resumeBootstrap() is called. - * @param extraModules An optional array of modules that should be added to the original list of modules that the app was about to be bootstrapped with. - */ - resumeBootstrap?(extraModules?: string[]): ng.auto.IInjectorService; - } - - /////////////////////////////////////////////////////////////////////////// - // Module - // see http://docs.angularjs.org/api/angular.Module - /////////////////////////////////////////////////////////////////////////// - interface IModule { - /** - * Use this method to register a component. - * - * @param name The name of the component. - * @param options A definition object passed into the component. - */ - component(name: string, options: IComponentOptions): IModule; - /** - * Use this method to register work which needs to be performed on module loading. - * - * @param configFn Execute this function on module load. Useful for service configuration. - */ - config(configFn: Function): IModule; - /** - * Use this method to register work which needs to be performed on module loading. - * - * @param inlineAnnotatedFunction Execute this function on module load. Useful for service configuration. - */ - config(inlineAnnotatedFunction: any[]): IModule; - config(object: Object): IModule; - /** - * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator. - * - * @param name The name of the constant. - * @param value The constant value. - */ - constant(name: string, value: T): IModule; - constant(object: Object): IModule; - /** - * The $controller service is used by Angular to create new controllers. - * - * This provider allows controller registration via the register method. - * - * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors. - * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation). - */ - controller(name: string, controllerConstructor: Function): IModule; - /** - * The $controller service is used by Angular to create new controllers. - * - * This provider allows controller registration via the register method. - * - * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors. - * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation). - */ - controller(name: string, inlineAnnotatedConstructor: any[]): IModule; - controller(object: Object): IModule; - /** - * Register a new directive with the compiler. - * - * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind) - * @param directiveFactory An injectable directive factory function. - */ - directive(name: string, directiveFactory: IDirectiveFactory): IModule; - /** - * Register a new directive with the compiler. - * - * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind) - * @param directiveFactory An injectable directive factory function. - */ - directive(name: string, inlineAnnotatedFunction: any[]): IModule; - directive(object: Object): IModule; - /** - * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider. - * - * @param name The name of the instance. - * @param $getFn The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}). - */ - factory(name: string, $getFn: Function): IModule; - /** - * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider. - * - * @param name The name of the instance. - * @param inlineAnnotatedFunction The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}). - */ - factory(name: string, inlineAnnotatedFunction: any[]): IModule; - factory(object: Object): IModule; - filter(name: string, filterFactoryFunction: Function): IModule; - filter(name: string, inlineAnnotatedFunction: any[]): IModule; - filter(object: Object): IModule; - provider(name: string, serviceProviderFactory: IServiceProviderFactory): IModule; - provider(name: string, serviceProviderConstructor: IServiceProviderClass): IModule; - provider(name: string, inlineAnnotatedConstructor: any[]): IModule; - provider(name: string, providerObject: IServiceProvider): IModule; - provider(object: Object): IModule; - /** - * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests. - */ - run(initializationFunction: Function): IModule; - /** - * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests. - */ - run(inlineAnnotatedFunction: any[]): IModule; - /** - * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function. - * - * @param name The name of the instance. - * @param serviceConstructor An injectable class (constructor function) that will be instantiated. - */ - service(name: string, serviceConstructor: Function): IModule; - /** - * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function. - * - * @param name The name of the instance. - * @param inlineAnnotatedConstructor An injectable class (constructor function) that will be instantiated. - */ - service(name: string, inlineAnnotatedConstructor: any[]): IModule; - service(object: Object): IModule; - /** - * Register a value service with the $injector, such as a string, a number, an array, an object or a function. This is short for registering a service where its provider's $get property is a factory function that takes no arguments and returns the value service. - - Value services are similar to constant services, except that they cannot be injected into a module configuration function (see config) but they can be overridden by an Angular decorator. - * - * @param name The name of the instance. - * @param value The value. - */ - value(name: string, value: T): IModule; - value(object: Object): IModule; - - /** - * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service. - * @param name The name of the service to decorate - * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to. - */ - decorator(name:string, decoratorConstructor: Function): IModule; - decorator(name:string, inlineAnnotatedConstructor: any[]): IModule; - - // Properties - name: string; - requires: string[]; - } - - /////////////////////////////////////////////////////////////////////////// - // Attributes - // see http://docs.angularjs.org/api/ng.$compile.directive.Attributes - /////////////////////////////////////////////////////////////////////////// - interface IAttributes { - /** - * this is necessary to be able to access the scoped attributes. it's not very elegant - * because you have to use attrs['foo'] instead of attrs.foo but I don't know of a better way - * this should really be limited to return string but it creates this problem: http://stackoverflow.com/q/17201854/165656 - */ - [name: string]: any; - - /** - * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with x- or data-) to its normalized, camelCase form. - * - * Also there is special case for Moz prefix starting with upper case letter. - * - * For further information check out the guide on @see https://docs.angularjs.org/guide/directive#matching-directives - */ - $normalize(name: string): string; - - /** - * Adds the CSS class value specified by the classVal parameter to the - * element. If animations are enabled then an animation will be triggered - * for the class addition. - */ - $addClass(classVal: string): void; - - /** - * Removes the CSS class value specified by the classVal parameter from the - * element. If animations are enabled then an animation will be triggered for - * the class removal. - */ - $removeClass(classVal: string): void; - - /** - * Adds and removes the appropriate CSS class values to the element based on the difference between - * the new and old CSS class values (specified as newClasses and oldClasses). - */ - $updateClass(newClasses: string, oldClasses: string): void; - - /** - * Set DOM element attribute value. - */ - $set(key: string, value: any): void; - - /** - * Observes an interpolated attribute. - * The observer function will be invoked once during the next $digest - * following compilation. The observer is then invoked whenever the - * interpolated value changes. - */ - $observe(name: string, fn: (value?: T) => any): Function; - - /** - * A map of DOM element attribute names to the normalized name. This is needed - * to do reverse lookup from normalized name back to actual name. - */ - $attr: Object; - } - - /** - * form.FormController - type in module ng - * see https://docs.angularjs.org/api/ng/type/form.FormController - */ - interface IFormController { - - /** - * Indexer which should return ng.INgModelController for most properties but cannot because of "All named properties must be assignable to string indexer type" constraint - see https://github.com/Microsoft/TypeScript/issues/272 - */ - [name: string]: any; - - $pristine: boolean; - $dirty: boolean; - $valid: boolean; - $invalid: boolean; - $submitted: boolean; - $error: any; - $pending: any; - $addControl(control: INgModelController | IFormController): void; - $removeControl(control: INgModelController | IFormController): void; - $setValidity(validationErrorKey: string, isValid: boolean, control: INgModelController | IFormController): void; - $setDirty(): void; - $setPristine(): void; - $commitViewValue(): void; - $rollbackViewValue(): void; - $setSubmitted(): void; - $setUntouched(): void; - } - - /////////////////////////////////////////////////////////////////////////// - // NgModelController - // see http://docs.angularjs.org/api/ng.directive:ngModel.NgModelController - /////////////////////////////////////////////////////////////////////////// - interface INgModelController { - $render(): void; - $setValidity(validationErrorKey: string, isValid: boolean): void; - // Documentation states viewValue and modelValue to be a string but other - // types do work and it's common to use them. - $setViewValue(value: any, trigger?: string): void; - $setPristine(): void; - $setDirty(): void; - $validate(): void; - $setTouched(): void; - $setUntouched(): void; - $rollbackViewValue(): void; - $commitViewValue(): void; - $isEmpty(value: any): boolean; - - $viewValue: any; - - $modelValue: any; - - $parsers: IModelParser[]; - $formatters: IModelFormatter[]; - $viewChangeListeners: IModelViewChangeListener[]; - $error: any; - $name: string; - - $touched: boolean; - $untouched: boolean; - - $validators: IModelValidators; - $asyncValidators: IAsyncModelValidators; - - $pending: any; - $pristine: boolean; - $dirty: boolean; - $valid: boolean; - $invalid: boolean; - } - - //Allows tuning how model updates are done. - //https://docs.angularjs.org/api/ng/directive/ngModelOptions - interface INgModelOptions { - updateOn?: string; - debounce?: any; - allowInvalid?: boolean; - getterSetter?: boolean; - timezone?: string; - } - - interface IModelValidators { - /** - * viewValue is any because it can be an object that is called in the view like $viewValue.name:$viewValue.subName - */ - [index: string]: (modelValue: any, viewValue: any) => boolean; - } - - interface IAsyncModelValidators { - [index: string]: (modelValue: any, viewValue: any) => IPromise; - } - - interface IModelParser { - (value: any): any; - } - - interface IModelFormatter { - (value: any): any; - } - - interface IModelViewChangeListener { - (): void; - } - - /** - * $rootScope - $rootScopeProvider - service in module ng - * see https://docs.angularjs.org/api/ng/type/$rootScope.Scope and https://docs.angularjs.org/api/ng/service/$rootScope - */ - interface IRootScopeService { - [index: string]: any; - - $apply(): any; - $apply(exp: string): any; - $apply(exp: (scope: IScope) => any): any; - - $applyAsync(): any; - $applyAsync(exp: string): any; - $applyAsync(exp: (scope: IScope) => any): any; - - /** - * Dispatches an event name downwards to all child scopes (and their children) notifying the registered $rootScope.Scope listeners. - * - * The event life cycle starts at the scope on which $broadcast was called. All listeners listening for name event on this scope get notified. Afterwards, the event propagates to all direct and indirect scopes of the current scope and calls all registered listeners along the way. The event cannot be canceled. - * - * Any exception emitted from the listeners will be passed onto the $exceptionHandler service. - * - * @param name Event name to broadcast. - * @param args Optional one or more arguments which will be passed onto the event listeners. - */ - $broadcast(name: string, ...args: any[]): IAngularEvent; - $destroy(): void; - $digest(): void; - /** - * Dispatches an event name upwards through the scope hierarchy notifying the registered $rootScope.Scope listeners. - * - * The event life cycle starts at the scope on which $emit was called. All listeners listening for name event on this scope get notified. Afterwards, the event traverses upwards toward the root scope and calls all registered listeners along the way. The event will stop propagating if one of the listeners cancels it. - * - * Any exception emitted from the listeners will be passed onto the $exceptionHandler service. - * - * @param name Event name to emit. - * @param args Optional one or more arguments which will be passed onto the event listeners. - */ - $emit(name: string, ...args: any[]): IAngularEvent; - - $eval(): any; - $eval(expression: string, locals?: Object): any; - $eval(expression: (scope: IScope) => any, locals?: Object): any; - - $evalAsync(): void; - $evalAsync(expression: string): void; - $evalAsync(expression: (scope: IScope) => any): void; - - // Defaults to false by the implementation checking strategy - $new(isolate?: boolean, parent?: IScope): IScope; - - /** - * Listens on events of a given type. See $emit for discussion of event life cycle. - * - * The event listener function format is: function(event, args...). - * - * @param name Event name to listen on. - * @param listener Function to call when the event is emitted. - */ - $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): () => void; - - $watch(watchExpression: string, listener?: string, objectEquality?: boolean): () => void; - $watch(watchExpression: string, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void; - $watch(watchExpression: (scope: IScope) => any, listener?: string, objectEquality?: boolean): () => void; - $watch(watchExpression: (scope: IScope) => T, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void; - - $watchCollection(watchExpression: string, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void; - $watchCollection(watchExpression: (scope: IScope) => T, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void; - - $watchGroup(watchExpressions: any[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void; - $watchGroup(watchExpressions: { (scope: IScope): any }[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void; - - $parent: IScope; - $root: IRootScopeService; - $id: number; - - // Hidden members - $$isolateBindings: any; - $$phase: any; - } - - interface IScope extends IRootScopeService { } - - /** - * $scope for ngRepeat directive. - * see https://docs.angularjs.org/api/ng/directive/ngRepeat - */ - interface IRepeatScope extends IScope { - - /** - * iterator offset of the repeated element (0..length-1). - */ - $index: number; - - /** - * true if the repeated element is first in the iterator. - */ - $first: boolean; - - /** - * true if the repeated element is between the first and last in the iterator. - */ - $middle: boolean; - - /** - * true if the repeated element is last in the iterator. - */ - $last: boolean; - - /** - * true if the iterator position $index is even (otherwise false). - */ - $even: boolean; - - /** - * true if the iterator position $index is odd (otherwise false). - */ - $odd: boolean; - - } - - interface IAngularEvent { - /** - * the scope on which the event was $emit-ed or $broadcast-ed. - */ - targetScope: IScope; - /** - * the scope that is currently handling the event. Once the event propagates through the scope hierarchy, this property is set to null. - */ - currentScope: IScope; - /** - * name of the event. - */ - name: string; - /** - * calling stopPropagation function will cancel further event propagation (available only for events that were $emit-ed). - */ - stopPropagation?: Function; - /** - * calling preventDefault sets defaultPrevented flag to true. - */ - preventDefault: Function; - /** - * true if preventDefault was called. - */ - defaultPrevented: boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // WindowService - // see http://docs.angularjs.org/api/ng.$window - /////////////////////////////////////////////////////////////////////////// - interface IWindowService extends Window { - [key: string]: any; - } - - /////////////////////////////////////////////////////////////////////////// - // TimeoutService - // see http://docs.angularjs.org/api/ng.$timeout - /////////////////////////////////////////////////////////////////////////// - interface ITimeoutService { - (delay?: number, invokeApply?: boolean): IPromise; - (fn: (...args: any[]) => T, delay?: number, invokeApply?: boolean, ...args: any[]): IPromise; - cancel(promise?: IPromise): boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // IntervalService - // see http://docs.angularjs.org/api/ng.$interval - /////////////////////////////////////////////////////////////////////////// - interface IIntervalService { - (func: Function, delay: number, count?: number, invokeApply?: boolean, ...args: any[]): IPromise; - cancel(promise: IPromise): boolean; - } - - /** - * $filter - $filterProvider - service in module ng - * - * Filters are used for formatting data displayed to the user. - * - * see https://docs.angularjs.org/api/ng/service/$filter - */ - interface IFilterService { - (name: 'filter'): IFilterFilter; - (name: 'currency'): IFilterCurrency; - (name: 'number'): IFilterNumber; - (name: 'date'): IFilterDate; - (name: 'json'): IFilterJson; - (name: 'lowercase'): IFilterLowercase; - (name: 'uppercase'): IFilterUppercase; - (name: 'limitTo'): IFilterLimitTo; - (name: 'orderBy'): IFilterOrderBy; - /** - * Usage: - * $filter(name); - * - * @param name Name of the filter function to retrieve - */ - (name: string): T; - } - - interface IFilterFilter { - (array: T[], expression: string | IFilterFilterPatternObject | IFilterFilterPredicateFunc, comparator?: IFilterFilterComparatorFunc|boolean): T[]; - } - - interface IFilterFilterPatternObject { - [name: string]: any; - } - - interface IFilterFilterPredicateFunc { - (value: T, index: number, array: T[]): boolean; - } - - interface IFilterFilterComparatorFunc { - (actual: T, expected: T): boolean; - } - - interface IFilterCurrency { - /** - * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default symbol for current locale is used. - * @param amount Input to filter. - * @param symbol Currency symbol or identifier to be displayed. - * @param fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale - * @return Formatted number - */ - (amount: number, symbol?: string, fractionSize?: number): string; - } - - interface IFilterNumber { - /** - * Formats a number as text. - * @param number Number to format. - * @param fractionSize Number of decimal places to round the number to. If this is not provided then the fraction size is computed from the current locale's number formatting pattern. In the case of the default locale, it will be 3. - * @return Number rounded to decimalPlaces and places a “,” after each third digit. - */ - (value: number|string, fractionSize?: number|string): string; - } - - interface IFilterDate { - /** - * Formats date to a string based on the requested format. - * - * @param date Date to format either as Date object, milliseconds (string or number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is specified in the string input, the time is considered to be in the local timezone. - * @param format Formatting rules (see Description). If not specified, mediumDate is used. - * @param timezone Timezone to be used for formatting. It understands UTC/GMT and the continental US time zone abbreviations, but for general use, use a time zone offset, for example, '+0430' (4 hours, 30 minutes east of the Greenwich meridian) If not specified, the timezone of the browser will be used. - * @return Formatted string or the input if input is not recognized as date/millis. - */ - (date: Date | number | string, format?: string, timezone?: string): string; - } - - interface IFilterJson { - /** - * Allows you to convert a JavaScript object into JSON string. - * @param object Any JavaScript object (including arrays and primitive types) to filter. - * @param spacing The number of spaces to use per indentation, defaults to 2. - * @return JSON string. - */ - (object: any, spacing?: number): string; - } - - interface IFilterLowercase { - /** - * Converts string to lowercase. - */ - (value: string): string; - } - - interface IFilterUppercase { - /** - * Converts string to uppercase. - */ - (value: string): string; - } - - interface IFilterLimitTo { - /** - * Creates a new array containing only a specified number of elements. The elements are taken from either the beginning or the end of the source array, string or number, as specified by the value and sign (positive or negative) of limit. - * @param input Source array to be limited. - * @param limit The length of the returned array. If the limit number is positive, limit number of items from the beginning of the source array/string are copied. If the number is negative, limit number of items from the end of the source array are copied. The limit will be trimmed if it exceeds array.length. If limit is undefined, the input will be returned unchanged. - * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0. - * @return A new sub-array of length limit or less if input array had less than limit elements. - */ - (input: T[], limit: string|number, begin?: string|number): T[]; - /** - * Creates a new string containing only a specified number of elements. The elements are taken from either the beginning or the end of the source string or number, as specified by the value and sign (positive or negative) of limit. If a number is used as input, it is converted to a string. - * @param input Source string or number to be limited. - * @param limit The length of the returned string. If the limit number is positive, limit number of items from the beginning of the source string are copied. If the number is negative, limit number of items from the end of the source string are copied. The limit will be trimmed if it exceeds input.length. If limit is undefined, the input will be returned unchanged. - * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0. - * @return A new substring of length limit or less if input had less than limit elements. - */ - (input: string|number, limit: string|number, begin?: string|number): string; - } - - interface IFilterOrderBy { - /** - * Orders a specified array by the expression predicate. It is ordered alphabetically for strings and numerically for numbers. Note: if you notice numbers are not being sorted as expected, make sure they are actually being saved as numbers and not strings. - * @param array The array to sort. - * @param expression A predicate to be used by the comparator to determine the order of elements. - * @param reverse Reverse the order of the array. - * @return Reverse the order of the array. - */ - (array: T[], expression: string|((value: T) => any)|(((value: T) => any)|string)[], reverse?: boolean): T[]; - } - - /** - * $filterProvider - $filter - provider in module ng - * - * Filters are just functions which transform input to an output. However filters need to be Dependency Injected. To achieve this a filter definition consists of a factory function which is annotated with dependencies and is responsible for creating a filter function. - * - * see https://docs.angularjs.org/api/ng/provider/$filterProvider - */ - interface IFilterProvider extends IServiceProvider { - /** - * register(name); - * - * @param name Name of the filter function, or an object map of filters where the keys are the filter names and the values are the filter factories. Note: Filter names must be valid angular Expressions identifiers, such as uppercase or orderBy. Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace your filters, then you can use capitalization (myappSubsectionFilterx) or underscores (myapp_subsection_filterx). - */ - register(name: string | {}): IServiceProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // LocaleService - // see http://docs.angularjs.org/api/ng.$locale - /////////////////////////////////////////////////////////////////////////// - interface ILocaleService { - id: string; - - // These are not documented - // Check angular's i18n files for exemples - NUMBER_FORMATS: ILocaleNumberFormatDescriptor; - DATETIME_FORMATS: ILocaleDateTimeFormatDescriptor; - pluralCat: (num: any) => string; - } - - interface ILocaleNumberFormatDescriptor { - DECIMAL_SEP: string; - GROUP_SEP: string; - PATTERNS: ILocaleNumberPatternDescriptor[]; - CURRENCY_SYM: string; - } - - interface ILocaleNumberPatternDescriptor { - minInt: number; - minFrac: number; - maxFrac: number; - posPre: string; - posSuf: string; - negPre: string; - negSuf: string; - gSize: number; - lgSize: number; - } - - interface ILocaleDateTimeFormatDescriptor { - MONTH: string[]; - SHORTMONTH: string[]; - DAY: string[]; - SHORTDAY: string[]; - AMPMS: string[]; - medium: string; - short: string; - fullDate: string; - longDate: string; - mediumDate: string; - shortDate: string; - mediumTime: string; - shortTime: string; - } - - /////////////////////////////////////////////////////////////////////////// - // LogService - // see http://docs.angularjs.org/api/ng.$log - // see http://docs.angularjs.org/api/ng.$logProvider - /////////////////////////////////////////////////////////////////////////// - interface ILogService { - debug: ILogCall; - error: ILogCall; - info: ILogCall; - log: ILogCall; - warn: ILogCall; - } - - interface ILogProvider extends IServiceProvider { - debugEnabled(): boolean; - debugEnabled(enabled: boolean): ILogProvider; - } - - // We define this as separate interface so we can reopen it later for - // the ngMock module. - interface ILogCall { - (...args: any[]): void; - } - - /////////////////////////////////////////////////////////////////////////// - // ParseService - // see http://docs.angularjs.org/api/ng.$parse - // see http://docs.angularjs.org/api/ng.$parseProvider - /////////////////////////////////////////////////////////////////////////// - interface IParseService { - (expression: string): ICompiledExpression; - } - - interface IParseProvider { - logPromiseWarnings(): boolean; - logPromiseWarnings(value: boolean): IParseProvider; - - unwrapPromises(): boolean; - unwrapPromises(value: boolean): IParseProvider; - } - - interface ICompiledExpression { - (context: any, locals?: any): any; - - literal: boolean; - constant: boolean; - - // If value is not provided, undefined is gonna be used since the implementation - // does not check the parameter. Let's force a value for consistency. If consumer - // whants to undefine it, pass the undefined value explicitly. - assign(context: any, value: any): any; - } - - /** - * $location - $locationProvider - service in module ng - * see https://docs.angularjs.org/api/ng/service/$location - */ - interface ILocationService { - absUrl(): string; - hash(): string; - hash(newHash: string): ILocationService; - host(): string; - - /** - * Return path of current url - */ - path(): string; - - /** - * Change path when called with parameter and return $location. - * Note: Path should always begin with forward slash (/), this method will add the forward slash if it is missing. - * - * @param path New path - */ - path(path: string): ILocationService; - - port(): number; - protocol(): string; - replace(): ILocationService; - - /** - * Return search part (as object) of current url - */ - search(): any; - - /** - * Change search part when called with parameter and return $location. - * - * @param search When called with a single argument the method acts as a setter, setting the search component of $location to the specified value. - * - * If the argument is a hash object containing an array of values, these values will be encoded as duplicate search parameters in the url. - */ - search(search: any): ILocationService; - - /** - * Change search part when called with parameter and return $location. - * - * @param search New search params - * @param paramValue If search is a string or a Number, then paramValue will override only a single search property. If paramValue is null, the property specified via the first argument will be deleted. If paramValue is an array, it will override the property of the search component of $location specified via the first argument. If paramValue is true, the property specified via the first argument will be added with no value nor trailing equal sign. - */ - search(search: string, paramValue: string|number|string[]|boolean): ILocationService; - - state(): any; - state(state: any): ILocationService; - url(): string; - url(url: string): ILocationService; - } - - interface ILocationProvider extends IServiceProvider { - hashPrefix(): string; - hashPrefix(prefix: string): ILocationProvider; - html5Mode(): boolean; - - // Documentation states that parameter is string, but - // implementation tests it as boolean, which makes more sense - // since this is a toggler - html5Mode(active: boolean): ILocationProvider; - html5Mode(mode: { enabled?: boolean; requireBase?: boolean; rewriteLinks?: boolean; }): ILocationProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // DocumentService - // see http://docs.angularjs.org/api/ng.$document - /////////////////////////////////////////////////////////////////////////// - interface IDocumentService extends IAugmentedJQuery {} - - /////////////////////////////////////////////////////////////////////////// - // ExceptionHandlerService - // see http://docs.angularjs.org/api/ng.$exceptionHandler - /////////////////////////////////////////////////////////////////////////// - interface IExceptionHandlerService { - (exception: Error, cause?: string): void; - } - - /////////////////////////////////////////////////////////////////////////// - // RootElementService - // see http://docs.angularjs.org/api/ng.$rootElement - /////////////////////////////////////////////////////////////////////////// - interface IRootElementService extends JQuery {} - - interface IQResolveReject { - (): void; - (value: T): void; - } - /** - * $q - service in module ng - * A promise/deferred implementation inspired by Kris Kowal's Q. - * See http://docs.angularjs.org/api/ng/service/$q - */ - interface IQService { - new (resolver: (resolve: IQResolveReject) => any): IPromise; - new (resolver: (resolve: IQResolveReject, reject: IQResolveReject) => any): IPromise; - (resolver: (resolve: IQResolveReject) => any): IPromise; - (resolver: (resolve: IQResolveReject, reject: IQResolveReject) => any): IPromise; - - /** - * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved. - * - * Returns a single promise that will be resolved with an array of values, each value corresponding to the promise at the same index in the promises array. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value. - * - * @param promises An array of promises. - */ - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise, T8 | IPromise, T9 | IPromise, T10 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise, T8 | IPromise, T9 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise, T8 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise]): IPromise<[T1, T2, T3, T4, T5]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise ]): IPromise<[T1, T2, T3, T4]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise]): IPromise<[T1, T2, T3]>; - all(values: [T1 | IPromise, T2 | IPromise]): IPromise<[T1, T2]>; - all(promises: IPromise[]): IPromise; - /** - * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved. - * - * Returns a single promise that will be resolved with a hash of values, each value corresponding to the promise at the same key in the promises hash. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value. - * - * @param promises A hash of promises. - */ - all(promises: { [id: string]: IPromise; }): IPromise<{ [id: string]: any; }>; - all(promises: { [id: string]: IPromise; }): IPromise; - /** - * Creates a Deferred object which represents a task which will finish in the future. - */ - defer(): IDeferred; - /** - * Creates a promise that is resolved as rejected with the specified reason. This api should be used to forward rejection in a chain of promises. If you are dealing with the last promise in a promise chain, you don't need to worry about it. - * - * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of reject as the throw keyword in JavaScript. This also means that if you "catch" an error via a promise error callback and you want to forward the error to the promise derived from the current promise, you have to "rethrow" the error by returning a rejection constructed via reject. - * - * @param reason Constant, message, exception or an object representing the rejection reason. - */ - reject(reason?: any): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - * - * @param value Value or a promise - */ - resolve(value: IPromise|T): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - */ - resolve(): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - * - * @param value Value or a promise - */ - when(value: IPromise|T): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - */ - when(): IPromise; - } - - interface IPromise { - /** - * Regardless of when the promise was or will be resolved or rejected, then calls one of the success or error callbacks asynchronously as soon as the result is available. The callbacks are called with a single argument: the result or rejection reason. Additionally, the notify callback may be called zero or more times to provide a progress indication, before the promise is resolved or rejected. - * The successCallBack may return IPromise for when a $q.reject() needs to be returned - * This method returns a new promise which is resolved or rejected via the return value of the successCallback, errorCallback. It also notifies via the return value of the notifyCallback method. The promise can not be resolved or rejected from the notifyCallback method. - */ - then(successCallback: (promiseValue: T) => IPromise|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise; - - /** - * Shorthand for promise.then(null, errorCallback) - */ - catch(onRejected: (reason: any) => IPromise|TResult): IPromise; - - /** - * Allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful to release resources or do some clean-up that needs to be done whether the promise was rejected or resolved. See the full specification for more information. - * - * Because finally is a reserved word in JavaScript and reserved keywords are not supported as property names by ES3, you'll need to invoke the method like promise['finally'](callback) to make your code IE8 and Android 2.x compatible. - */ - finally(finallyCallback: () => any): IPromise; - } - - interface IDeferred { - resolve(value?: T|IPromise): void; - reject(reason?: any): void; - notify(state?: any): void; - promise: IPromise; - } - - /////////////////////////////////////////////////////////////////////////// - // AnchorScrollService - // see http://docs.angularjs.org/api/ng.$anchorScroll - /////////////////////////////////////////////////////////////////////////// - interface IAnchorScrollService { - (): void; - (hash: string): void; - yOffset: any; - } - - interface IAnchorScrollProvider extends IServiceProvider { - disableAutoScrolling(): void; - } - - /** - * $cacheFactory - service in module ng - * - * Factory that constructs Cache objects and gives access to them. - * - * see https://docs.angularjs.org/api/ng/service/$cacheFactory - */ - interface ICacheFactoryService { - /** - * Factory that constructs Cache objects and gives access to them. - * - * @param cacheId Name or id of the newly created cache. - * @param optionsMap Options object that specifies the cache behavior. Properties: - * - * capacity — turns the cache into LRU cache. - */ - (cacheId: string, optionsMap?: { capacity?: number; }): ICacheObject; - - /** - * Get information about all the caches that have been created. - * @returns key-value map of cacheId to the result of calling cache#info - */ - info(): any; - - /** - * Get access to a cache object by the cacheId used when it was created. - * - * @param cacheId Name or id of a cache to access. - */ - get(cacheId: string): ICacheObject; - } - - /** - * $cacheFactory.Cache - type in module ng - * - * A cache object used to store and retrieve data, primarily used by $http and the script directive to cache templates and other data. - * - * see https://docs.angularjs.org/api/ng/type/$cacheFactory.Cache - */ - interface ICacheObject { - /** - * Retrieve information regarding a particular Cache. - */ - info(): { - /** - * the id of the cache instance - */ - id: string; - - /** - * the number of entries kept in the cache instance - */ - size: number; - - //...: any additional properties from the options object when creating the cache. - }; - - /** - * Inserts a named entry into the Cache object to be retrieved later, and incrementing the size of the cache if the key was not already present in the cache. If behaving like an LRU cache, it will also remove stale entries from the set. - * - * It will not insert undefined values into the cache. - * - * @param key the key under which the cached data is stored. - * @param value the value to store alongside the key. If it is undefined, the key will not be stored. - */ - put(key: string, value?: T): T; - - /** - * Retrieves named data stored in the Cache object. - * - * @param key the key of the data to be retrieved - */ - get(key: string): T; - - /** - * Removes an entry from the Cache object. - * - * @param key the key of the entry to be removed - */ - remove(key: string): void; - - /** - * Clears the cache object of any entries. - */ - removeAll(): void; - - /** - * Destroys the Cache object entirely, removing it from the $cacheFactory set. - */ - destroy(): void; - } - - /////////////////////////////////////////////////////////////////////////// - // CompileService - // see http://docs.angularjs.org/api/ng.$compile - // see http://docs.angularjs.org/api/ng.$compileProvider - /////////////////////////////////////////////////////////////////////////// - interface ICompileService { - (element: string, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction; - (element: Element, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction; - (element: JQuery, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction; - } - - interface ICompileProvider extends IServiceProvider { - directive(name: string, directiveFactory: Function): ICompileProvider; - directive(directivesMap: Object, directiveFactory: Function): ICompileProvider; - directive(name: string, inlineAnnotatedFunction: any[]): ICompileProvider; - directive(directivesMap: Object, inlineAnnotatedFunction: any[]): ICompileProvider; - - // Undocumented, but it is there... - directive(directivesMap: any): ICompileProvider; - - component(name: string, options: IComponentOptions): ICompileProvider; - - aHrefSanitizationWhitelist(): RegExp; - aHrefSanitizationWhitelist(regexp: RegExp): ICompileProvider; - - imgSrcSanitizationWhitelist(): RegExp; - imgSrcSanitizationWhitelist(regexp: RegExp): ICompileProvider; - - debugInfoEnabled(enabled?: boolean): any; - } - - interface ICloneAttachFunction { - // Let's hint but not force cloneAttachFn's signature - (clonedElement?: JQuery, scope?: IScope): any; - } - - // This corresponds to the "publicLinkFn" returned by $compile. - interface ITemplateLinkingFunction { - (scope: IScope, cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery; - } - - // This corresponds to $transclude (and also the transclude function passed to link). - interface ITranscludeFunction { - // If the scope is provided, then the cloneAttachFn must be as well. - (scope: IScope, cloneAttachFn: ICloneAttachFunction): IAugmentedJQuery; - // If one argument is provided, then it's assumed to be the cloneAttachFn. - (cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery; - } - - /////////////////////////////////////////////////////////////////////////// - // ControllerService - // see http://docs.angularjs.org/api/ng.$controller - // see http://docs.angularjs.org/api/ng.$controllerProvider - /////////////////////////////////////////////////////////////////////////// - interface IControllerService { - // Although the documentation doesn't state this, locals are optional - (controllerConstructor: new (...args: any[]) => T, locals?: any, later?: boolean, ident?: string): T; - (controllerConstructor: Function, locals?: any, later?: boolean, ident?: string): T; - (controllerName: string, locals?: any, later?: boolean, ident?: string): T; - } - - interface IControllerProvider extends IServiceProvider { - register(name: string, controllerConstructor: Function): void; - register(name: string, dependencyAnnotatedConstructor: any[]): void; - allowGlobals(): void; - } - - /** - * xhrFactory - * Replace or decorate this service to create your own custom XMLHttpRequest objects. - * see https://docs.angularjs.org/api/ng/service/$xhrFactory - */ - interface IXhrFactory { - (method: string, url: string): T; - } - - /** - * HttpService - * see http://docs.angularjs.org/api/ng/service/$http - */ - interface IHttpService { - /** - * Object describing the request to be made and how it should be processed. - */ - (config: IRequestConfig): IHttpPromise; - - /** - * Shortcut method to perform GET request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - get(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform DELETE request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - delete(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform HEAD request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - head(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform JSONP request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - jsonp(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform POST request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param data Request content - * @param config Optional configuration object - */ - post(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform PUT request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param data Request content - * @param config Optional configuration object - */ - put(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform PATCH request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param data Request content - * @param config Optional configuration object - */ - patch(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Runtime equivalent of the $httpProvider.defaults property. Allows configuration of default headers, withCredentials as well as request and response transformations. - */ - defaults: IHttpProviderDefaults; - - /** - * Array of config objects for currently pending requests. This is primarily meant to be used for debugging purposes. - */ - pendingRequests: IRequestConfig[]; - } - - /** - * Object describing the request to be made and how it should be processed. - * see http://docs.angularjs.org/api/ng/service/$http#usage - */ - interface IRequestShortcutConfig extends IHttpProviderDefaults { - /** - * {Object.} - * Map of strings or objects which will be turned to ?key1=value1&key2=value2 after the url. If the value is not a string, it will be JSONified. - */ - params?: any; - - /** - * {string|Object} - * Data to be sent as the request message data. - */ - data?: any; - - /** - * Timeout in milliseconds, or promise that should abort the request when resolved. - */ - timeout?: number|IPromise; - - /** - * See [XMLHttpRequest.responseType]https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype - */ - responseType?: string; - } - - /** - * Object describing the request to be made and how it should be processed. - * see http://docs.angularjs.org/api/ng/service/$http#usage - */ - interface IRequestConfig extends IRequestShortcutConfig { - /** - * HTTP method (e.g. 'GET', 'POST', etc) - */ - method: string; - /** - * Absolute or relative URL of the resource that is being requested. - */ - url: string; - } - - interface IHttpHeadersGetter { - (): { [name: string]: string; }; - (headerName: string): string; - } - - interface IHttpPromiseCallback { - (data: T, status: number, headers: IHttpHeadersGetter, config: IRequestConfig): void; - } - - interface IHttpPromiseCallbackArg { - data?: T; - status?: number; - headers?: IHttpHeadersGetter; - config?: IRequestConfig; - statusText?: string; - } - - interface IHttpPromise extends IPromise> { - /** - * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead. - * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error. - * @deprecated - */ - success?(callback: IHttpPromiseCallback): IHttpPromise; - /** - * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead. - * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error. - * @deprecated - */ - error?(callback: IHttpPromiseCallback): IHttpPromise; - } - - // See the jsdoc for transformData() at https://github.com/angular/angular.js/blob/master/src/ng/http.js#L228 - interface IHttpRequestTransformer { - (data: any, headersGetter: IHttpHeadersGetter): any; - } - - // The definition of fields are the same as IHttpPromiseCallbackArg - interface IHttpResponseTransformer { - (data: any, headersGetter: IHttpHeadersGetter, status: number): any; - } - - type HttpHeaderType = {[requestType: string]:string|((config:IRequestConfig) => string)}; - - interface IHttpRequestConfigHeaders { - [requestType: string]: any; - common?: any; - get?: any; - post?: any; - put?: any; - patch?: any; - } - - /** - * Object that controls the defaults for $http provider. Not all fields of IRequestShortcutConfig can be configured - * via defaults and the docs do not say which. The following is based on the inspection of the source code. - * https://docs.angularjs.org/api/ng/service/$http#defaults - * https://docs.angularjs.org/api/ng/service/$http#usage - * https://docs.angularjs.org/api/ng/provider/$httpProvider The properties section - */ - interface IHttpProviderDefaults { - /** - * {boolean|Cache} - * If true, a default $http cache will be used to cache the GET request, otherwise if a cache instance built with $cacheFactory, this cache will be used for caching. - */ - cache?: any; - - /** - * Transform function or an array of such functions. The transform function takes the http request body and - * headers and returns its transformed (typically serialized) version. - * @see {@link https://docs.angularjs.org/api/ng/service/$http#transforming-requests-and-responses} - */ - transformRequest?: IHttpRequestTransformer |IHttpRequestTransformer[]; - - /** - * Transform function or an array of such functions. The transform function takes the http response body and - * headers and returns its transformed (typically deserialized) version. - */ - transformResponse?: IHttpResponseTransformer | IHttpResponseTransformer[]; - - /** - * Map of strings or functions which return strings representing HTTP headers to send to the server. If the - * return value of a function is null, the header will not be sent. - * The key of the map is the request verb in lower case. The "common" key applies to all requests. - * @see {@link https://docs.angularjs.org/api/ng/service/$http#setting-http-headers} - */ - headers?: IHttpRequestConfigHeaders; - - /** Name of HTTP header to populate with the XSRF token. */ - xsrfHeaderName?: string; - - /** Name of cookie containing the XSRF token. */ - xsrfCookieName?: string; - - /** - * whether to to set the withCredentials flag on the XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5 for more information. - */ - withCredentials?: boolean; - - /** - * A function used to the prepare string representation of request parameters (specified as an object). If - * specified as string, it is interpreted as a function registered with the $injector. Defaults to - * $httpParamSerializer. - */ - paramSerializer?: string | ((obj: any) => string); - } - - interface IHttpInterceptor { - request?: (config: IRequestConfig) => IRequestConfig|IPromise; - requestError?: (rejection: any) => any; - response?: (response: IHttpPromiseCallbackArg) => IPromise>|IHttpPromiseCallbackArg; - responseError?: (rejection: any) => any; - } - - interface IHttpInterceptorFactory { - (...args: any[]): IHttpInterceptor; - } - - interface IHttpProvider extends IServiceProvider { - defaults: IHttpProviderDefaults; - - /** - * Register service factories (names or implementations) for interceptors which are called before and after - * each request. - */ - interceptors: (string|IHttpInterceptorFactory|(string|IHttpInterceptorFactory)[])[]; - useApplyAsync(): boolean; - useApplyAsync(value: boolean): IHttpProvider; - - /** - * - * @param {boolean=} value If true, `$http` will return a normal promise without the `success` and `error` methods. - * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining. - * otherwise, returns the current configured value. - */ - useLegacyPromiseExtensions(value:boolean) : boolean | IHttpProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // HttpBackendService - // see http://docs.angularjs.org/api/ng.$httpBackend - // You should never need to use this service directly. - /////////////////////////////////////////////////////////////////////////// - interface IHttpBackendService { - // XXX Perhaps define callback signature in the future - (method: string, url: string, post?: any, callback?: Function, headers?: any, timeout?: number, withCredentials?: boolean): void; - } - - /////////////////////////////////////////////////////////////////////////// - // InterpolateService - // see http://docs.angularjs.org/api/ng.$interpolate - // see http://docs.angularjs.org/api/ng.$interpolateProvider - /////////////////////////////////////////////////////////////////////////// - interface IInterpolateService { - (text: string, mustHaveExpression?: boolean, trustedContext?: string, allOrNothing?: boolean): IInterpolationFunction; - endSymbol(): string; - startSymbol(): string; - } - - interface IInterpolationFunction { - (context: any): string; - } - - interface IInterpolateProvider extends IServiceProvider { - startSymbol(): string; - startSymbol(value: string): IInterpolateProvider; - endSymbol(): string; - endSymbol(value: string): IInterpolateProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // TemplateCacheService - // see http://docs.angularjs.org/api/ng.$templateCache - /////////////////////////////////////////////////////////////////////////// - interface ITemplateCacheService extends ICacheObject {} - - /////////////////////////////////////////////////////////////////////////// - // SCEService - // see http://docs.angularjs.org/api/ng.$sce - /////////////////////////////////////////////////////////////////////////// - interface ISCEService { - getTrusted(type: string, mayBeTrusted: any): any; - getTrustedCss(value: any): any; - getTrustedHtml(value: any): any; - getTrustedJs(value: any): any; - getTrustedResourceUrl(value: any): any; - getTrustedUrl(value: any): any; - parse(type: string, expression: string): (context: any, locals: any) => any; - parseAsCss(expression: string): (context: any, locals: any) => any; - parseAsHtml(expression: string): (context: any, locals: any) => any; - parseAsJs(expression: string): (context: any, locals: any) => any; - parseAsResourceUrl(expression: string): (context: any, locals: any) => any; - parseAsUrl(expression: string): (context: any, locals: any) => any; - trustAs(type: string, value: any): any; - trustAsHtml(value: any): any; - trustAsJs(value: any): any; - trustAsResourceUrl(value: any): any; - trustAsUrl(value: any): any; - isEnabled(): boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // SCEProvider - // see http://docs.angularjs.org/api/ng.$sceProvider - /////////////////////////////////////////////////////////////////////////// - interface ISCEProvider extends IServiceProvider { - enabled(value: boolean): void; - } - - /////////////////////////////////////////////////////////////////////////// - // SCEDelegateService - // see http://docs.angularjs.org/api/ng.$sceDelegate - /////////////////////////////////////////////////////////////////////////// - interface ISCEDelegateService { - getTrusted(type: string, mayBeTrusted: any): any; - trustAs(type: string, value: any): any; - valueOf(value: any): any; - } - - - /////////////////////////////////////////////////////////////////////////// - // SCEDelegateProvider - // see http://docs.angularjs.org/api/ng.$sceDelegateProvider - /////////////////////////////////////////////////////////////////////////// - interface ISCEDelegateProvider extends IServiceProvider { - resourceUrlBlacklist(blacklist: any[]): void; - resourceUrlWhitelist(whitelist: any[]): void; - resourceUrlBlacklist(): any[]; - resourceUrlWhitelist(): any[]; - } - - /** - * $templateRequest service - * see http://docs.angularjs.org/api/ng/service/$templateRequest - */ - interface ITemplateRequestService { - /** - * Downloads a template using $http and, upon success, stores the - * contents inside of $templateCache. - * - * If the HTTP request fails or the response data of the HTTP request is - * empty then a $compile error will be thrown (unless - * {ignoreRequestError} is set to true). - * - * @param tpl The template URL. - * @param ignoreRequestError Whether or not to ignore the exception - * when the request fails or the template is - * empty. - * - * @return A promise whose value is the template content. - */ - (tpl: string, ignoreRequestError?: boolean): IPromise; - /** - * total amount of pending template requests being downloaded. - * @type {number} - */ - totalPendingRequests: number; - } - - /////////////////////////////////////////////////////////////////////////// - // Component - // see http://angularjs.blogspot.com.br/2015/11/angularjs-15-beta2-and-14-releases.html - // and http://toddmotto.com/exploring-the-angular-1-5-component-method/ - /////////////////////////////////////////////////////////////////////////// - /** - * Runtime representation a type that a Component or other object is instances of. - * - * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by - * the `MyCustomComponent` constructor function. - */ - interface Type extends Function { - } - - /** - * `RouteDefinition` defines a route within a {@link RouteConfig} decorator. - * - * Supported keys: - * - `path` or `aux` (requires exactly one of these) - * - `component`, `loader`, `redirectTo` (requires exactly one of these) - * - `name` or `as` (optional) (requires exactly one of these) - * - `data` (optional) - * - * See also {@link Route}, {@link AsyncRoute}, {@link AuxRoute}, and {@link Redirect}. - */ - interface RouteDefinition { - path?: string; - aux?: string; - component?: Type | ComponentDefinition | string; - loader?: Function; - redirectTo?: any[]; - as?: string; - name?: string; - data?: any; - useAsDefault?: boolean; - } - - /** - * Represents either a component type (`type` is `component`) or a loader function - * (`type` is `loader`). - * - * See also {@link RouteDefinition}. - */ - interface ComponentDefinition { - type: string; - loader?: Function; - component?: Type; - } - - /** - * Component definition object (a simplified directive definition object) - */ - interface IComponentOptions { - /** - * Controller constructor function that should be associated with newly created scope or the name of a registered - * controller if passed as a string. Empty function by default. - * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) - */ - controller?: string | Function | (string | Function)[]; - /** - * An identifier name for a reference to the controller. If present, the controller will be published to scope under - * the controllerAs name. If not present, this will default to be the same as the component name. - * @default "$ctrl" - */ - controllerAs?: string; - /** - * html template as a string or a function that returns an html template as a string which should be used as the - * contents of this component. Empty string by default. - * If template is a function, then it is injected with the following locals: - * $element - Current element - * $attrs - Current attributes object for the element - * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) - */ - template?: string | Function | (string | Function)[]; - /** - * path or function that returns a path to an html template that should be used as the contents of this component. - * If templateUrl is a function, then it is injected with the following locals: - * $element - Current element - * $attrs - Current attributes object for the element - * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) - */ - templateUrl?: string | Function | (string | Function)[]; - /** - * Define DOM attribute binding to component properties. Component properties are always bound to the component - * controller and not to the scope. - */ - bindings?: {[binding: string]: string}; - /** - * Whether transclusion is enabled. Enabled by default. - */ - transclude?: boolean | string | {[slot: string]: string}; - require?: string | string[] | {[controller: string]: string}; - } - - interface IComponentTemplateFn { - ( $element?: IAugmentedJQuery, $attrs?: IAttributes ): string; - } - - /////////////////////////////////////////////////////////////////////////// - // Directive - // see http://docs.angularjs.org/api/ng.$compileProvider#directive - // and http://docs.angularjs.org/guide/directive - /////////////////////////////////////////////////////////////////////////// - - interface IDirectiveFactory { - (...args: any[]): IDirective; - } - - interface IDirectiveLinkFn { - ( - scope: IScope, - instanceElement: IAugmentedJQuery, - instanceAttributes: IAttributes, - controller: {}, - transclude: ITranscludeFunction - ): void; - } - - interface IDirectivePrePost { - pre?: IDirectiveLinkFn; - post?: IDirectiveLinkFn; - } - - interface IDirectiveCompileFn { - ( - templateElement: IAugmentedJQuery, - templateAttributes: IAttributes, - /** - * @deprecated - * Note: The transclude function that is passed to the compile function is deprecated, - * as it e.g. does not know about the right outer scope. Please use the transclude function - * that is passed to the link function instead. - */ - transclude: ITranscludeFunction - ): IDirectivePrePost; - } - - interface IDirective { - compile?: IDirectiveCompileFn; - controller?: any; - controllerAs?: string; - /** - * @deprecated - * Deprecation warning: although bindings for non-ES6 class controllers are currently bound to this before - * the controller constructor is called, this use is now deprecated. Please place initialization code that - * relies upon bindings inside a $onInit method on the controller, instead. - */ - bindToController?: boolean | Object; - link?: IDirectiveLinkFn | IDirectivePrePost; - multiElement?: boolean; - name?: string; - priority?: number; - /** - * @deprecated - */ - replace?: boolean; - require?: string | string[] | {[controller: string]: string}; - restrict?: string; - scope?: boolean | Object; - template?: string | Function; - templateNamespace?: string; - templateUrl?: string | Function; - terminal?: boolean; - transclude?: boolean | string | {[slot: string]: string}; - } - - /** - * angular.element - * when calling angular.element, angular returns a jQuery object, - * augmented with additional methods like e.g. scope. - * see: http://docs.angularjs.org/api/angular.element - */ - interface IAugmentedJQueryStatic extends JQueryStatic { - (selector: string, context?: any): IAugmentedJQuery; - (element: Element): IAugmentedJQuery; - (object: {}): IAugmentedJQuery; - (elementArray: Element[]): IAugmentedJQuery; - (object: JQuery): IAugmentedJQuery; - (func: Function): IAugmentedJQuery; - (array: any[]): IAugmentedJQuery; - (): IAugmentedJQuery; - } - - interface IAugmentedJQuery extends JQuery { - // TODO: events, how to define? - //$destroy - - find(selector: string): IAugmentedJQuery; - find(element: any): IAugmentedJQuery; - find(obj: JQuery): IAugmentedJQuery; - controller(): any; - controller(name: string): any; - injector(): any; - scope(): IScope; - - /** - * Overload for custom scope interfaces - */ - scope(): T; - isolateScope(): IScope; - - inheritedData(key: string, value: any): JQuery; - inheritedData(obj: { [key: string]: any; }): JQuery; - inheritedData(key?: string): any; - } - - /////////////////////////////////////////////////////////////////////////// - // AUTO module (angular.js) - /////////////////////////////////////////////////////////////////////////// - export module auto { - - /////////////////////////////////////////////////////////////////////// - // InjectorService - // see http://docs.angularjs.org/api/AUTO.$injector - /////////////////////////////////////////////////////////////////////// - interface IInjectorService { - annotate(fn: Function, strictDi?: boolean): string[]; - annotate(inlineAnnotatedFunction: any[]): string[]; - get(name: string, caller?: string): T; - get(name: '$anchorScroll'): IAnchorScrollService - get(name: '$cacheFactory'): ICacheFactoryService - get(name: '$compile'): ICompileService - get(name: '$controller'): IControllerService - get(name: '$document'): IDocumentService - get(name: '$exceptionHandler'): IExceptionHandlerService - get(name: '$filter'): IFilterService - get(name: '$http'): IHttpService - get(name: '$httpBackend'): IHttpBackendService - get(name: '$httpParamSerializer'): IHttpParamSerializer - get(name: '$httpParamSerializerJQLike'): IHttpParamSerializer - get(name: '$interpolate'): IInterpolateService - get(name: '$interval'): IIntervalService - get(name: '$locale'): ILocaleService - get(name: '$location'): ILocationService - get(name: '$log'): ILogService - get(name: '$parse'): IParseService - get(name: '$q'): IQService - get(name: '$rootElement'): IRootElementService - get(name: '$rootScope'): IRootScopeService - get(name: '$sce'): ISCEService - get(name: '$sceDelegate'): ISCEDelegateService - get(name: '$templateCache'): ITemplateCacheService - get(name: '$templateRequest'): ITemplateRequestService - get(name: '$timeout'): ITimeoutService - get(name: '$window'): IWindowService - get(name: '$xhrFactory'): IXhrFactory - has(name: string): boolean; - instantiate(typeConstructor: Function, locals?: any): T; - invoke(inlineAnnotatedFunction: any[]): any; - invoke(func: Function, context?: any, locals?: any): any; - strictDi: boolean; - } - - /////////////////////////////////////////////////////////////////////// - // ProvideService - // see http://docs.angularjs.org/api/AUTO.$provide - /////////////////////////////////////////////////////////////////////// - interface IProvideService { - // Documentation says it returns the registered instance, but actual - // implementation does not return anything. - // constant(name: string, value: any): any; - /** - * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator. - * - * @param name The name of the constant. - * @param value The constant value. - */ - constant(name: string, value: any): void; - - /** - * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service. - * - * @param name The name of the service to decorate. - * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: - * - * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to. - */ - decorator(name: string, decorator: Function): void; - /** - * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service. - * - * @param name The name of the service to decorate. - * @param inlineAnnotatedFunction This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: - * - * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to. - */ - decorator(name: string, inlineAnnotatedFunction: any[]): void; - factory(name: string, serviceFactoryFunction: Function): IServiceProvider; - factory(name: string, inlineAnnotatedFunction: any[]): IServiceProvider; - provider(name: string, provider: IServiceProvider): IServiceProvider; - provider(name: string, serviceProviderConstructor: Function): IServiceProvider; - service(name: string, constructor: Function): IServiceProvider; - service(name: string, inlineAnnotatedFunction: any[]): IServiceProvider; - value(name: string, value: any): IServiceProvider; - } - - } - - /** - * $http params serializer that converts objects to strings - * see https://docs.angularjs.org/api/ng/service/$httpParamSerializer - */ - interface IHttpParamSerializer { - (obj: Object): string; - } -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/typings.json b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/typings.json deleted file mode 100644 index c974311fa7..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/angular/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/b76dd8a7f95b71696982befbb7589940d27e940b/angularjs/angular.d.ts", - "raw": "registry:dt/angular#1.5.0+20160517064839", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/b76dd8a7f95b71696982befbb7589940d27e940b/angularjs/angular.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/index.d.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/index.d.ts deleted file mode 100644 index b4208b3b82..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/index.d.ts +++ /dev/null @@ -1,3199 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/4cdfbe96b666eec5e1defbb519a62abf04e96764/jquery/jquery.d.ts -interface JQueryAjaxSettings { - /** - * The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. - */ - accepts?: any; - /** - * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests do not support synchronous operation. Note that synchronous requests may temporarily lock the browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async: false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback options instead of the corresponding methods of the jqXHR object such as jqXHR.done() or the deprecated jqXHR.success(). - */ - async?: boolean; - /** - * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless of the type of request. - */ - beforeSend? (jqXHR: JQueryXHR, settings: JQueryAjaxSettings): any; - /** - * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}" to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a POST is made to a URL that has already been requested by a GET. - */ - cache?: boolean; - /** - * A function to be called when the request finishes (after success and error callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request ("success", "notmodified", "error", "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event. - */ - complete? (jqXHR: JQueryXHR, textStatus: string): any; - /** - * An object of string/regular-expression pairs that determine how jQuery will parse the response, given its content type. (version added: 1.5) - */ - contents?: { [key: string]: any; }; - //According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false" - // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742 - /** - * When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding. - */ - contentType?: any; - /** - * This object will be made the context of all Ajax-related callbacks. By default, the context is an object that represents the ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax). - */ - context?: any; - /** - * An object containing dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response. (version added: 1.5) - */ - converters?: { [key: string]: any; }; - /** - * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. (version added: 1.5) - */ - crossDomain?: boolean; - /** - * Data to be sent to the server. It is converted to a query string, if not already a string. It's appended to the url for GET-requests. See processData option to prevent this automatic processing. Object must be Key/Value pairs. If value is an Array, jQuery serializes multiple values with same key based on the value of the traditional setting (described below). - */ - data?: any; - /** - * A function to be used to handle the raw response data of XMLHttpRequest.This is a pre-filtering function to sanitize the response. You should return the sanitized data. The function accepts two arguments: The raw data returned from the server and the 'dataType' parameter. - */ - dataFilter? (data: any, ty: any): any; - /** - * The type of data that you're expecting back from the server. If none is specified, jQuery will try to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be returned as a string). - */ - dataType?: string; - /** - * A function to be called if the request fails. The function receives three arguments: The jqXHR (in jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an optional exception object, if one occurred. Possible values for the second argument (besides null) are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note: This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event. - */ - error? (jqXHR: JQueryXHR, textStatus: string, errorThrown: string): any; - /** - * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to control various Ajax Events. - */ - global?: boolean; - /** - * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest transport. The header X-Requested-With: XMLHttpRequest is always added, but its default XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from within the beforeSend function. (version added: 1.5) - */ - headers?: { [key: string]: any; }; - /** - * Allow the request to be successful only if the response has changed since the last request. This is done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data. - */ - ifModified?: boolean; - /** - * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery does not recognize it as such by default. The following protocols are currently recognized as local: file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. (version added: 1.5.1) - */ - isLocal?: boolean; - /** - * Override the callback function name in a jsonp request. This value will be used instead of 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation. In this case, you should also explicitly set the jsonpCallback setting. For example, { jsonp: false, jsonpCallback: "callbackName" } - */ - jsonp?: any; - /** - * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function. - */ - jsonpCallback?: any; - /** - * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0) - */ - method?: string; - /** - * A mime type to override the XHR mime type. (version added: 1.5.1) - */ - mimeType?: string; - /** - * A password to be used with XMLHttpRequest in response to an HTTP access authentication request. - */ - password?: string; - /** - * By default, data passed in to the data option as an object (technically, anything other than a string) will be processed and transformed into a query string, fitting to the default content-type "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data, set this option to false. - */ - processData?: boolean; - /** - * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request. Used when the character set on the local page is not the same as the one on the remote script. - */ - scriptCharset?: string; - /** - * An object of numeric HTTP codes and functions to be called when the response has the corresponding code. f the request is successful, the status code functions take the same parameters as the success callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback. (version added: 1.5) - */ - statusCode?: { [key: string]: any; }; - /** - * A function to be called if the request succeeds. The function gets passed three arguments: The data returned from the server, formatted according to the dataType parameter; a string describing the status; and the jqXHR (in jQuery 1.4.x, XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event. - */ - success? (data: any, textStatus: string, jqXHR: JQueryXHR): any; - /** - * Set a timeout (in milliseconds) for the request. This will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the $.ajax call is made; if several other requests are in progress and the browser has no connections available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be cancelled by a timeout; the script will run even if it arrives after the timeout period. - */ - timeout?: number; - /** - * Set this to true if you wish to use the traditional style of param serialization. - */ - traditional?: boolean; - /** - * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers. - */ - type?: string; - /** - * A string containing the URL to which the request is sent. - */ - url?: string; - /** - * A username to be used with XMLHttpRequest in response to an HTTP access authentication request. - */ - username?: string; - /** - * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory. - */ - xhr?: any; - /** - * An object of fieldName-fieldValue pairs to set on the native XHR object. For example, you can use it to set withCredentials to true for cross-domain requests if needed. In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+ should you require the use of it. (version added: 1.5.1) - */ - xhrFields?: { [key: string]: any; }; -} - -/** - * Interface for the jqXHR object - */ -interface JQueryXHR extends XMLHttpRequest, JQueryPromise { - /** - * The .overrideMimeType() method may be used in the beforeSend() callback function, for example, to modify the response content-type header. As of jQuery 1.5.1, the jqXHR object also contains the overrideMimeType() method (it was available in jQuery 1.4.x, as well, but was temporarily removed in jQuery 1.5). - */ - overrideMimeType(mimeType: string): any; - /** - * Cancel the request. - * - * @param statusText A string passed as the textStatus parameter for the done callback. Default value: "canceled" - */ - abort(statusText?: string): void; - /** - * Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details. - */ - then(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise; - /** - * Property containing the parsed response if the response Content-Type is json - */ - responseJSON?: any; - /** - * A function to be called if the request fails. - */ - error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void; -} - -/** - * Interface for the JQuery callback - */ -interface JQueryCallback { - /** - * Add a callback or a collection of callbacks to a callback list. - * - * @param callbacks A function, or array of functions, that are to be added to the callback list. - */ - add(callbacks: Function): JQueryCallback; - /** - * Add a callback or a collection of callbacks to a callback list. - * - * @param callbacks A function, or array of functions, that are to be added to the callback list. - */ - add(callbacks: Function[]): JQueryCallback; - - /** - * Disable a callback list from doing anything more. - */ - disable(): JQueryCallback; - - /** - * Determine if the callbacks list has been disabled. - */ - disabled(): boolean; - - /** - * Remove all of the callbacks from a list. - */ - empty(): JQueryCallback; - - /** - * Call all of the callbacks with the given arguments - * - * @param arguments The argument or list of arguments to pass back to the callback list. - */ - fire(...arguments: any[]): JQueryCallback; - - /** - * Determine if the callbacks have already been called at least once. - */ - fired(): boolean; - - /** - * Call all callbacks in a list with the given context and arguments. - * - * @param context A reference to the context in which the callbacks in the list should be fired. - * @param arguments An argument, or array of arguments, to pass to the callbacks in the list. - */ - fireWith(context?: any, args?: any[]): JQueryCallback; - - /** - * Determine whether a supplied callback is in a list - * - * @param callback The callback to search for. - */ - has(callback: Function): boolean; - - /** - * Lock a callback list in its current state. - */ - lock(): JQueryCallback; - - /** - * Determine if the callbacks list has been locked. - */ - locked(): boolean; - - /** - * Remove a callback or a collection of callbacks from a callback list. - * - * @param callbacks A function, or array of functions, that are to be removed from the callback list. - */ - remove(callbacks: Function): JQueryCallback; - /** - * Remove a callback or a collection of callbacks from a callback list. - * - * @param callbacks A function, or array of functions, that are to be removed from the callback list. - */ - remove(callbacks: Function[]): JQueryCallback; -} - -/** - * Allows jQuery Promises to interop with non-jQuery promises - */ -interface JQueryGenericPromise { - /** - * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress. - * - * @param doneFilter A function that is called when the Deferred is resolved. - * @param failFilter An optional function that is called when the Deferred is rejected. - */ - then(doneFilter: (value?: T, ...values: any[]) => U|JQueryPromise, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise; - - /** - * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress. - * - * @param doneFilter A function that is called when the Deferred is resolved. - * @param failFilter An optional function that is called when the Deferred is rejected. - */ - then(doneFilter: (value?: T, ...values: any[]) => void, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise; -} - -/** - * Interface for the JQuery promise/deferred callbacks - */ -interface JQueryPromiseCallback { - (value?: T, ...args: any[]): void; -} - -interface JQueryPromiseOperator { - (callback1: JQueryPromiseCallback|JQueryPromiseCallback[], ...callbacksN: Array|JQueryPromiseCallback[]>): JQueryPromise; -} - -/** - * Interface for the JQuery promise, part of callbacks - */ -interface JQueryPromise extends JQueryGenericPromise { - /** - * Determine the current state of a Deferred object. - */ - state(): string; - /** - * Add handlers to be called when the Deferred object is either resolved or rejected. - * - * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected. - * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected. - */ - always(alwaysCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...alwaysCallbacksN: Array|JQueryPromiseCallback[]>): JQueryPromise; - /** - * Add handlers to be called when the Deferred object is resolved. - * - * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved. - * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved. - */ - done(doneCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...doneCallbackN: Array|JQueryPromiseCallback[]>): JQueryPromise; - /** - * Add handlers to be called when the Deferred object is rejected. - * - * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected. - * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected. - */ - fail(failCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...failCallbacksN: Array|JQueryPromiseCallback[]>): JQueryPromise; - /** - * Add handlers to be called when the Deferred object generates progress notifications. - * - * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications. - */ - progress(progressCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...progressCallbackN: Array|JQueryPromiseCallback[]>): JQueryPromise; - - // Deprecated - given no typings - pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise; -} - -/** - * Interface for the JQuery deferred, part of callbacks - */ -interface JQueryDeferred extends JQueryGenericPromise { - /** - * Determine the current state of a Deferred object. - */ - state(): string; - /** - * Add handlers to be called when the Deferred object is either resolved or rejected. - * - * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected. - * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected. - */ - always(alwaysCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...alwaysCallbacksN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - /** - * Add handlers to be called when the Deferred object is resolved. - * - * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved. - * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved. - */ - done(doneCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...doneCallbackN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - /** - * Add handlers to be called when the Deferred object is rejected. - * - * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected. - * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected. - */ - fail(failCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...failCallbacksN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - /** - * Add handlers to be called when the Deferred object generates progress notifications. - * - * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications. - */ - progress(progressCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...progressCallbackN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - - /** - * Call the progressCallbacks on a Deferred object with the given args. - * - * @param args Optional arguments that are passed to the progressCallbacks. - */ - notify(value?: any, ...args: any[]): JQueryDeferred; - - /** - * Call the progressCallbacks on a Deferred object with the given context and args. - * - * @param context Context passed to the progressCallbacks as the this object. - * @param args Optional arguments that are passed to the progressCallbacks. - */ - notifyWith(context: any, value?: any[]): JQueryDeferred; - - /** - * Reject a Deferred object and call any failCallbacks with the given args. - * - * @param args Optional arguments that are passed to the failCallbacks. - */ - reject(value?: any, ...args: any[]): JQueryDeferred; - /** - * Reject a Deferred object and call any failCallbacks with the given context and args. - * - * @param context Context passed to the failCallbacks as the this object. - * @param args An optional array of arguments that are passed to the failCallbacks. - */ - rejectWith(context: any, value?: any[]): JQueryDeferred; - - /** - * Resolve a Deferred object and call any doneCallbacks with the given args. - * - * @param value First argument passed to doneCallbacks. - * @param args Optional subsequent arguments that are passed to the doneCallbacks. - */ - resolve(value?: T, ...args: any[]): JQueryDeferred; - - /** - * Resolve a Deferred object and call any doneCallbacks with the given context and args. - * - * @param context Context passed to the doneCallbacks as the this object. - * @param args An optional array of arguments that are passed to the doneCallbacks. - */ - resolveWith(context: any, value?: T[]): JQueryDeferred; - - /** - * Return a Deferred's Promise object. - * - * @param target Object onto which the promise methods have to be attached - */ - promise(target?: any): JQueryPromise; - - // Deprecated - given no typings - pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise; -} - -/** - * Interface of the JQuery extension of the W3C event object - */ -interface BaseJQueryEventObject extends Event { - data: any; - delegateTarget: Element; - isDefaultPrevented(): boolean; - isImmediatePropagationStopped(): boolean; - isPropagationStopped(): boolean; - namespace: string; - originalEvent: Event; - preventDefault(): any; - relatedTarget: Element; - result: any; - stopImmediatePropagation(): void; - stopPropagation(): void; - target: Element; - pageX: number; - pageY: number; - which: number; - metaKey: boolean; -} - -interface JQueryInputEventObject extends BaseJQueryEventObject { - altKey: boolean; - ctrlKey: boolean; - metaKey: boolean; - shiftKey: boolean; -} - -interface JQueryMouseEventObject extends JQueryInputEventObject { - button: number; - clientX: number; - clientY: number; - offsetX: number; - offsetY: number; - pageX: number; - pageY: number; - screenX: number; - screenY: number; -} - -interface JQueryKeyEventObject extends JQueryInputEventObject { - char: any; - charCode: number; - key: any; - keyCode: number; -} - -interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject{ -} - -/* - Collection of properties of the current browser -*/ - -interface JQuerySupport { - ajax?: boolean; - boxModel?: boolean; - changeBubbles?: boolean; - checkClone?: boolean; - checkOn?: boolean; - cors?: boolean; - cssFloat?: boolean; - hrefNormalized?: boolean; - htmlSerialize?: boolean; - leadingWhitespace?: boolean; - noCloneChecked?: boolean; - noCloneEvent?: boolean; - opacity?: boolean; - optDisabled?: boolean; - optSelected?: boolean; - scriptEval? (): boolean; - style?: boolean; - submitBubbles?: boolean; - tbody?: boolean; -} - -interface JQueryParam { - /** - * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - * - * @param obj An array or object to serialize. - */ - (obj: any): string; - - /** - * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - * - * @param obj An array or object to serialize. - * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization. - */ - (obj: any, traditional: boolean): string; -} - -/** - * The interface used to construct jQuery events (with $.Event). It is - * defined separately instead of inline in JQueryStatic to allow - * overriding the construction function with specific strings - * returning specific event objects. - */ -interface JQueryEventConstructor { - (name: string, eventProperties?: any): JQueryEventObject; - new (name: string, eventProperties?: any): JQueryEventObject; -} - -/** - * The interface used to specify coordinates. - */ -interface JQueryCoordinates { - left: number; - top: number; -} - -/** - * Elements in the array returned by serializeArray() - */ -interface JQuerySerializeArrayElement { - name: string; - value: string; -} - -interface JQueryAnimationOptions { - /** - * A string or number determining how long the animation will run. - */ - duration?: any; - /** - * A string indicating which easing function to use for the transition. - */ - easing?: string; - /** - * A function to call once the animation is complete. - */ - complete?: Function; - /** - * A function to be called for each animated property of each animated element. This function provides an opportunity to modify the Tween object to change the value of the property before it is set. - */ - step?: (now: number, tween: any) => any; - /** - * A function to be called after each step of the animation, only once per animated element regardless of the number of animated properties. (version added: 1.8) - */ - progress?: (animation: JQueryPromise, progress: number, remainingMs: number) => any; - /** - * A function to call when the animation begins. (version added: 1.8) - */ - start?: (animation: JQueryPromise) => any; - /** - * A function to be called when the animation completes (its Promise object is resolved). (version added: 1.8) - */ - done?: (animation: JQueryPromise, jumpedToEnd: boolean) => any; - /** - * A function to be called when the animation fails to complete (its Promise object is rejected). (version added: 1.8) - */ - fail?: (animation: JQueryPromise, jumpedToEnd: boolean) => any; - /** - * A function to be called when the animation completes or stops without completing (its Promise object is either resolved or rejected). (version added: 1.8) - */ - always?: (animation: JQueryPromise, jumpedToEnd: boolean) => any; - /** - * A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string. When a custom queue name is used the animation does not automatically start; you must call .dequeue("queuename") to start it. - */ - queue?: any; - /** - * A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions. (version added: 1.4) - */ - specialEasing?: Object; -} - -interface JQueryEasingFunction { - ( percent: number ): number; -} - -interface JQueryEasingFunctions { - [ name: string ]: JQueryEasingFunction; - linear: JQueryEasingFunction; - swing: JQueryEasingFunction; -} - -/** - * Static members of jQuery (those on $ and jQuery themselves) - */ -interface JQueryStatic { - - /** - * Perform an asynchronous HTTP (Ajax) request. - * - * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup(). - */ - ajax(settings: JQueryAjaxSettings): JQueryXHR; - /** - * Perform an asynchronous HTTP (Ajax) request. - * - * @param url A string containing the URL to which the request is sent. - * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup(). - */ - ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR; - - /** - * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax(). - * - * @param dataTypes An optional string containing one or more space-separated dataTypes - * @param handler A handler to set default values for future Ajax requests. - */ - ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void; - /** - * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax(). - * - * @param handler A handler to set default values for future Ajax requests. - */ - ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void; - - ajaxSettings: JQueryAjaxSettings; - - /** - * Set default values for future Ajax requests. Its use is not recommended. - * - * @param options A set of key/value pairs that configure the default Ajax request. All options are optional. - */ - ajaxSetup(options: JQueryAjaxSettings): void; - - /** - * Load data from the server using a HTTP GET request. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html). - */ - get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP GET request. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param success A callback function that is executed if the request succeeds. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html). - */ - get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP GET request. - * - * @param settings The JQueryAjaxSettings to be used for the request - */ - get(settings : JQueryAjaxSettings): JQueryXHR; - /** - * Load JSON-encoded data from the server using a GET HTTP request. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. - */ - getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR; - /** - * Load JSON-encoded data from the server using a GET HTTP request. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param success A callback function that is executed if the request succeeds. - */ - getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR; - /** - * Load a JavaScript file from the server using a GET HTTP request, then execute it. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. - */ - getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR; - - /** - * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - */ - param: JQueryParam; - - /** - * Load data from the server using a HTTP POST request. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html). - */ - post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP POST request. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html). - */ - post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP POST request. - * - * @param settings The JQueryAjaxSettings to be used for the request - */ - post(settings : JQueryAjaxSettings): JQueryXHR; - /** - * A multi-purpose callbacks list object that provides a powerful way to manage callback lists. - * - * @param flags An optional list of space-separated flags that change how the callback list behaves. - */ - Callbacks(flags?: string): JQueryCallback; - - /** - * Holds or releases the execution of jQuery's ready event. - * - * @param hold Indicates whether the ready hold is being requested or released - */ - holdReady(hold: boolean): void; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param selector A string containing a selector expression - * @param context A DOM Element, Document, or jQuery to use as context - */ - (selector: string, context?: Element|JQuery): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param element A DOM element to wrap in a jQuery object. - */ - (element: Element): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object. - */ - (elementArray: Element[]): JQuery; - - /** - * Binds a function to be executed when the DOM has finished loading. - * - * @param callback A function to execute after the DOM is ready. - */ - (callback: (jQueryAlias?: JQueryStatic) => any): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param object A plain object to wrap in a jQuery object. - */ - (object: {}): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param object An existing jQuery object to clone. - */ - (object: JQuery): JQuery; - - /** - * Specify a function to execute when the DOM is fully loaded. - */ - (): JQuery; - - /** - * Creates DOM elements on the fly from the provided string of raw HTML. - * - * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML. - * @param ownerDocument A document in which the new elements will be created. - */ - (html: string, ownerDocument?: Document): JQuery; - - /** - * Creates DOM elements on the fly from the provided string of raw HTML. - * - * @param html A string defining a single, standalone, HTML element (e.g.
      or
      ). - * @param attributes An object of attributes, events, and methods to call on the newly-created element. - */ - (html: string, attributes: Object): JQuery; - - /** - * Relinquish jQuery's control of the $ variable. - * - * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself). - */ - noConflict(removeAll?: boolean): JQueryStatic; - - /** - * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events. - * - * @param deferreds One or more Deferred objects, or plain JavaScript objects. - */ - when(...deferreds: Array/* as JQueryDeferred */>): JQueryPromise; - - /** - * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties. - */ - cssHooks: { [key: string]: any; }; - cssNumber: any; - - /** - * Store arbitrary data associated with the specified element. Returns the value that was set. - * - * @param element The DOM element to associate with the data. - * @param key A string naming the piece of data to set. - * @param value The new data value. - */ - data(element: Element, key: string, value: T): T; - /** - * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element. - * - * @param element The DOM element to associate with the data. - * @param key A string naming the piece of data to set. - */ - data(element: Element, key: string): any; - /** - * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element. - * - * @param element The DOM element to associate with the data. - */ - data(element: Element): any; - - /** - * Execute the next function on the queue for the matched element. - * - * @param element A DOM element from which to remove and execute a queued function. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - dequeue(element: Element, queueName?: string): void; - - /** - * Determine whether an element has any jQuery data associated with it. - * - * @param element A DOM element to be checked for data. - */ - hasData(element: Element): boolean; - - /** - * Show the queue of functions to be executed on the matched element. - * - * @param element A DOM element to inspect for an attached queue. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - queue(element: Element, queueName?: string): any[]; - /** - * Manipulate the queue of functions to be executed on the matched element. - * - * @param element A DOM element where the array of queued functions is attached. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param newQueue An array of functions to replace the current queue contents. - */ - queue(element: Element, queueName: string, newQueue: Function[]): JQuery; - /** - * Manipulate the queue of functions to be executed on the matched element. - * - * @param element A DOM element on which to add a queued function. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param callback The new function to add to the queue. - */ - queue(element: Element, queueName: string, callback: Function): JQuery; - - /** - * Remove a previously-stored piece of data. - * - * @param element A DOM element from which to remove data. - * @param name A string naming the piece of data to remove. - */ - removeData(element: Element, name?: string): JQuery; - - /** - * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function. - * - * @param beforeStart A function that is called just before the constructor returns. - */ - Deferred(beforeStart?: (deferred: JQueryDeferred) => any): JQueryDeferred; - - /** - * Effects - */ - - easing: JQueryEasingFunctions; - - fx: { - tick: () => void; - /** - * The rate (in milliseconds) at which animations fire. - */ - interval: number; - stop: () => void; - speeds: { slow: number; fast: number; }; - /** - * Globally disable all animations. - */ - off: boolean; - step: any; - }; - - /** - * Takes a function and returns a new one that will always have a particular context. - * - * @param fnction The function whose context will be changed. - * @param context The object to which the context (this) of the function should be set. - * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument. - */ - proxy(fnction: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any; - /** - * Takes a function and returns a new one that will always have a particular context. - * - * @param context The object to which the context (this) of the function should be set. - * @param name The name of the function whose context will be changed (should be a property of the context object). - * @param additionalArguments Any number of arguments to be passed to the function named in the name argument. - */ - proxy(context: Object, name: string, ...additionalArguments: any[]): any; - - Event: JQueryEventConstructor; - - /** - * Takes a string and throws an exception containing it. - * - * @param message The message to send out. - */ - error(message: any): JQuery; - - expr: any; - fn: any; //TODO: Decide how we want to type this - - isReady: boolean; - - // Properties - support: JQuerySupport; - - /** - * Check to see if a DOM element is a descendant of another DOM element. - * - * @param container The DOM element that may contain the other element. - * @param contained The DOM element that may be contained by (a descendant of) the other element. - */ - contains(container: Element, contained: Element): boolean; - - /** - * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties. - * - * @param collection The object or array to iterate over. - * @param callback The function that will be executed on every object. - */ - each( - collection: T[], - callback: (indexInArray: number, valueOfElement: T) => any - ): any; - - /** - * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties. - * - * @param collection The object or array to iterate over. - * @param callback The function that will be executed on every object. - */ - each( - collection: any, - callback: (indexInArray: any, valueOfElement: any) => any - ): any; - - /** - * Merge the contents of two or more objects together into the first object. - * - * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument. - * @param object1 An object containing additional properties to merge in. - * @param objectN Additional objects containing properties to merge in. - */ - extend(target: any, object1?: any, ...objectN: any[]): any; - /** - * Merge the contents of two or more objects together into the first object. - * - * @param deep If true, the merge becomes recursive (aka. deep copy). - * @param target The object to extend. It will receive the new properties. - * @param object1 An object containing additional properties to merge in. - * @param objectN Additional objects containing properties to merge in. - */ - extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any; - - /** - * Execute some JavaScript code globally. - * - * @param code The JavaScript code to execute. - */ - globalEval(code: string): any; - - /** - * Finds the elements of an array which satisfy a filter function. The original array is not affected. - * - * @param array The array to search through. - * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value. this will be the global window object. - * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false. - */ - grep(array: T[], func: (elementOfArray: T, indexInArray: number) => boolean, invert?: boolean): T[]; - - /** - * Search for a specified value within an array and return its index (or -1 if not found). - * - * @param value The value to search for. - * @param array An array through which to search. - * @param fromIndex he index of the array at which to begin the search. The default is 0, which will search the whole array. - */ - inArray(value: T, array: T[], fromIndex?: number): number; - - /** - * Determine whether the argument is an array. - * - * @param obj Object to test whether or not it is an array. - */ - isArray(obj: any): boolean; - /** - * Check to see if an object is empty (contains no enumerable properties). - * - * @param obj The object that will be checked to see if it's empty. - */ - isEmptyObject(obj: any): boolean; - /** - * Determine if the argument passed is a Javascript function object. - * - * @param obj Object to test whether or not it is a function. - */ - isFunction(obj: any): boolean; - /** - * Determines whether its argument is a number. - * - * @param obj The value to be tested. - */ - isNumeric(value: any): boolean; - /** - * Check to see if an object is a plain object (created using "{}" or "new Object"). - * - * @param obj The object that will be checked to see if it's a plain object. - */ - isPlainObject(obj: any): boolean; - /** - * Determine whether the argument is a window. - * - * @param obj Object to test whether or not it is a window. - */ - isWindow(obj: any): boolean; - /** - * Check to see if a DOM node is within an XML document (or is an XML document). - * - * @param node he DOM node that will be checked to see if it's in an XML document. - */ - isXMLDoc(node: Node): boolean; - - /** - * Convert an array-like object into a true JavaScript array. - * - * @param obj Any object to turn into a native Array. - */ - makeArray(obj: any): any[]; - - /** - * Translate all items in an array or object to new array of items. - * - * @param array The Array to translate. - * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object. - */ - map(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[]; - /** - * Translate all items in an array or object to new array of items. - * - * @param arrayOrObject The Array or Object to translate. - * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object. - */ - map(arrayOrObject: any, callback: (value: any, indexOrKey: any) => any): any; - - /** - * Merge the contents of two arrays together into the first array. - * - * @param first The first array to merge, the elements of second added. - * @param second The second array to merge into the first, unaltered. - */ - merge(first: T[], second: T[]): T[]; - - /** - * An empty function. - */ - noop(): any; - - /** - * Return a number representing the current time. - */ - now(): number; - - /** - * Takes a well-formed JSON string and returns the resulting JavaScript object. - * - * @param json The JSON string to parse. - */ - parseJSON(json: string): any; - - /** - * Parses a string into an XML document. - * - * @param data a well-formed XML string to be parsed - */ - parseXML(data: string): XMLDocument; - - /** - * Remove the whitespace from the beginning and end of a string. - * - * @param str Remove the whitespace from the beginning and end of a string. - */ - trim(str: string): string; - - /** - * Determine the internal JavaScript [[Class]] of an object. - * - * @param obj Object to get the internal JavaScript [[Class]] of. - */ - type(obj: any): string; - - /** - * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers. - * - * @param array The Array of DOM elements. - */ - unique(array: Element[]): Element[]; - - /** - * Parses a string into an array of DOM nodes. - * - * @param data HTML string to be parsed - * @param context DOM element to serve as the context in which the HTML fragment will be created - * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string - */ - parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[]; - - /** - * Parses a string into an array of DOM nodes. - * - * @param data HTML string to be parsed - * @param context DOM element to serve as the context in which the HTML fragment will be created - * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string - */ - parseHTML(data: string, context?: Document, keepScripts?: boolean): any[]; -} - -/** - * The jQuery instance members - */ -interface JQuery { - /** - * Register a handler to be called when Ajax requests complete. This is an AjaxEvent. - * - * @param handler The function to be invoked. - */ - ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): JQuery; - /** - * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): JQuery; - /** - * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): JQuery; - /** - * Register a handler to be called when the first Ajax request begins. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxStart(handler: () => any): JQuery; - /** - * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxStop(handler: () => any): JQuery; - /** - * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): JQuery; - - /** - * Load data from the server and place the returned HTML into the matched element. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param complete A callback function that is executed when the request completes. - */ - load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): JQuery; - - /** - * Encode a set of form elements as a string for submission. - */ - serialize(): string; - /** - * Encode a set of form elements as an array of names and values. - */ - serializeArray(): JQuerySerializeArrayElement[]; - - /** - * Adds the specified class(es) to each of the set of matched elements. - * - * @param className One or more space-separated classes to be added to the class attribute of each matched element. - */ - addClass(className: string): JQuery; - /** - * Adds the specified class(es) to each of the set of matched elements. - * - * @param function A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set. - */ - addClass(func: (index: number, className: string) => string): JQuery; - - /** - * Add the previous set of elements on the stack to the current set, optionally filtered by a selector. - */ - addBack(selector?: string): JQuery; - - /** - * Get the value of an attribute for the first element in the set of matched elements. - * - * @param attributeName The name of the attribute to get. - */ - attr(attributeName: string): string; - /** - * Set one or more attributes for the set of matched elements. - * - * @param attributeName The name of the attribute to set. - * @param value A value to set for the attribute. - */ - attr(attributeName: string, value: string|number): JQuery; - /** - * Set one or more attributes for the set of matched elements. - * - * @param attributeName The name of the attribute to set. - * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments. - */ - attr(attributeName: string, func: (index: number, attr: string) => string|number): JQuery; - /** - * Set one or more attributes for the set of matched elements. - * - * @param attributes An object of attribute-value pairs to set. - */ - attr(attributes: Object): JQuery; - - /** - * Determine whether any of the matched elements are assigned the given class. - * - * @param className The class name to search for. - */ - hasClass(className: string): boolean; - - /** - * Get the HTML contents of the first element in the set of matched elements. - */ - html(): string; - /** - * Set the HTML contents of each element in the set of matched elements. - * - * @param htmlString A string of HTML to set as the content of each matched element. - */ - html(htmlString: string): JQuery; - /** - * Set the HTML contents of each element in the set of matched elements. - * - * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set. - */ - html(func: (index: number, oldhtml: string) => string): JQuery; - /** - * Set the HTML contents of each element in the set of matched elements. - * - * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set. - */ - - /** - * Get the value of a property for the first element in the set of matched elements. - * - * @param propertyName The name of the property to get. - */ - prop(propertyName: string): any; - /** - * Set one or more properties for the set of matched elements. - * - * @param propertyName The name of the property to set. - * @param value A value to set for the property. - */ - prop(propertyName: string, value: string|number|boolean): JQuery; - /** - * Set one or more properties for the set of matched elements. - * - * @param properties An object of property-value pairs to set. - */ - prop(properties: Object): JQuery; - /** - * Set one or more properties for the set of matched elements. - * - * @param propertyName The name of the property to set. - * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element. - */ - prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): JQuery; - - /** - * Remove an attribute from each element in the set of matched elements. - * - * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes. - */ - removeAttr(attributeName: string): JQuery; - - /** - * Remove a single class, multiple classes, or all classes from each element in the set of matched elements. - * - * @param className One or more space-separated classes to be removed from the class attribute of each matched element. - */ - removeClass(className?: string): JQuery; - /** - * Remove a single class, multiple classes, or all classes from each element in the set of matched elements. - * - * @param function A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments. - */ - removeClass(func: (index: number, className: string) => string): JQuery; - - /** - * Remove a property for the set of matched elements. - * - * @param propertyName The name of the property to remove. - */ - removeProp(propertyName: string): JQuery; - - /** - * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - * - * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set. - * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed. - */ - toggleClass(className: string, swtch?: boolean): JQuery; - /** - * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - * - * @param swtch A boolean value to determine whether the class should be added or removed. - */ - toggleClass(swtch?: boolean): JQuery; - /** - * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - * - * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments. - * @param swtch A boolean value to determine whether the class should be added or removed. - */ - toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): JQuery; - - /** - * Get the current value of the first element in the set of matched elements. - */ - val(): any; - /** - * Set the value of each element in the set of matched elements. - * - * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked. - */ - val(value: string|string[]|number): JQuery; - /** - * Set the value of each element in the set of matched elements. - * - * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments. - */ - val(func: (index: number, value: string) => string): JQuery; - - - /** - * Get the value of style properties for the first element in the set of matched elements. - * - * @param propertyName A CSS property. - */ - css(propertyName: string): string; - /** - * Set one or more CSS properties for the set of matched elements. - * - * @param propertyName A CSS property name. - * @param value A value to set for the property. - */ - css(propertyName: string, value: string|number): JQuery; - /** - * Set one or more CSS properties for the set of matched elements. - * - * @param propertyName A CSS property name. - * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments. - */ - css(propertyName: string, value: (index: number, value: string) => string|number): JQuery; - /** - * Set one or more CSS properties for the set of matched elements. - * - * @param properties An object of property-value pairs to set. - */ - css(properties: Object): JQuery; - - /** - * Get the current computed height for the first element in the set of matched elements. - */ - height(): number; - /** - * Set the CSS height of every matched element. - * - * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string). - */ - height(value: number|string): JQuery; - /** - * Set the CSS height of every matched element. - * - * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set. - */ - height(func: (index: number, height: number) => number|string): JQuery; - - /** - * Get the current computed height for the first element in the set of matched elements, including padding but not border. - */ - innerHeight(): number; - - /** - * Sets the inner height on elements in the set of matched elements, including padding but not border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - innerHeight(height: number|string): JQuery; - - /** - * Get the current computed width for the first element in the set of matched elements, including padding but not border. - */ - innerWidth(): number; - - /** - * Sets the inner width on elements in the set of matched elements, including padding but not border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - innerWidth(width: number|string): JQuery; - - /** - * Get the current coordinates of the first element in the set of matched elements, relative to the document. - */ - offset(): JQueryCoordinates; - /** - * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements. - * - * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements. - */ - offset(coordinates: JQueryCoordinates): JQuery; - /** - * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements. - * - * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties. - */ - offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery; - - /** - * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements. - * - * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation. - */ - outerHeight(includeMargin?: boolean): number; - - /** - * Sets the outer height on elements in the set of matched elements, including padding and border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - outerHeight(height: number|string): JQuery; - - /** - * Get the current computed width for the first element in the set of matched elements, including padding and border. - * - * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation. - */ - outerWidth(includeMargin?: boolean): number; - - /** - * Sets the outer width on elements in the set of matched elements, including padding and border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - outerWidth(width: number|string): JQuery; - - /** - * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent. - */ - position(): JQueryCoordinates; - - /** - * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element. - */ - scrollLeft(): number; - /** - * Set the current horizontal position of the scroll bar for each of the set of matched elements. - * - * @param value An integer indicating the new position to set the scroll bar to. - */ - scrollLeft(value: number): JQuery; - - /** - * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element. - */ - scrollTop(): number; - /** - * Set the current vertical position of the scroll bar for each of the set of matched elements. - * - * @param value An integer indicating the new position to set the scroll bar to. - */ - scrollTop(value: number): JQuery; - - /** - * Get the current computed width for the first element in the set of matched elements. - */ - width(): number; - /** - * Set the CSS width of each element in the set of matched elements. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - width(value: number|string): JQuery; - /** - * Set the CSS width of each element in the set of matched elements. - * - * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set. - */ - width(func: (index: number, width: number) => number|string): JQuery; - - /** - * Remove from the queue all items that have not yet been run. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - clearQueue(queueName?: string): JQuery; - - /** - * Store arbitrary data associated with the matched elements. - * - * @param key A string naming the piece of data to set. - * @param value The new data value; it can be any Javascript type including Array or Object. - */ - data(key: string, value: any): JQuery; - /** - * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute. - * - * @param key Name of the data stored. - */ - data(key: string): any; - /** - * Store arbitrary data associated with the matched elements. - * - * @param obj An object of key-value pairs of data to update. - */ - data(obj: { [key: string]: any; }): JQuery; - /** - * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute. - */ - data(): any; - - /** - * Execute the next function on the queue for the matched elements. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - dequeue(queueName?: string): JQuery; - - /** - * Remove a previously-stored piece of data. - * - * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete. - */ - removeData(name: string): JQuery; - /** - * Remove a previously-stored piece of data. - * - * @param list An array of strings naming the pieces of data to delete. - */ - removeData(list: string[]): JQuery; - /** - * Remove all previously-stored piece of data. - */ - removeData(): JQuery; - - /** - * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished. - * - * @param type The type of queue that needs to be observed. (default: fx) - * @param target Object onto which the promise methods have to be attached - */ - promise(type?: string, target?: Object): JQueryPromise; - - /** - * Perform a custom animation of a set of CSS properties. - * - * @param properties An object of CSS properties and values that the animation will move toward. - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - animate(properties: Object, duration?: string|number, complete?: Function): JQuery; - /** - * Perform a custom animation of a set of CSS properties. - * - * @param properties An object of CSS properties and values that the animation will move toward. - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. (default: swing) - * @param complete A function to call once the animation is complete. - */ - animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): JQuery; - /** - * Perform a custom animation of a set of CSS properties. - * - * @param properties An object of CSS properties and values that the animation will move toward. - * @param options A map of additional options to pass to the method. - */ - animate(properties: Object, options: JQueryAnimationOptions): JQuery; - - /** - * Set a timer to delay execution of subsequent items in the queue. - * - * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - delay(duration: number, queueName?: string): JQuery; - - /** - * Display the matched elements by fading them to opaque. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - fadeIn(duration?: number|string, complete?: Function): JQuery; - /** - * Display the matched elements by fading them to opaque. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeIn(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display the matched elements by fading them to opaque. - * - * @param options A map of additional options to pass to the method. - */ - fadeIn(options: JQueryAnimationOptions): JQuery; - - /** - * Hide the matched elements by fading them to transparent. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - fadeOut(duration?: number|string, complete?: Function): JQuery; - /** - * Hide the matched elements by fading them to transparent. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeOut(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Hide the matched elements by fading them to transparent. - * - * @param options A map of additional options to pass to the method. - */ - fadeOut(options: JQueryAnimationOptions): JQuery; - - /** - * Adjust the opacity of the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param opacity A number between 0 and 1 denoting the target opacity. - * @param complete A function to call once the animation is complete. - */ - fadeTo(duration: string|number, opacity: number, complete?: Function): JQuery; - /** - * Adjust the opacity of the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param opacity A number between 0 and 1 denoting the target opacity. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): JQuery; - - /** - * Display or hide the matched elements by animating their opacity. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - fadeToggle(duration?: number|string, complete?: Function): JQuery; - /** - * Display or hide the matched elements by animating their opacity. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeToggle(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display or hide the matched elements by animating their opacity. - * - * @param options A map of additional options to pass to the method. - */ - fadeToggle(options: JQueryAnimationOptions): JQuery; - - /** - * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements. - * - * @param queue The name of the queue in which to stop animations. - */ - finish(queue?: string): JQuery; - - /** - * Hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - hide(duration?: number|string, complete?: Function): JQuery; - /** - * Hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - hide(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Hide the matched elements. - * - * @param options A map of additional options to pass to the method. - */ - hide(options: JQueryAnimationOptions): JQuery; - - /** - * Display the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - show(duration?: number|string, complete?: Function): JQuery; - /** - * Display the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - show(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display the matched elements. - * - * @param options A map of additional options to pass to the method. - */ - show(options: JQueryAnimationOptions): JQuery; - - /** - * Display the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - slideDown(duration?: number|string, complete?: Function): JQuery; - /** - * Display the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - slideDown(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display the matched elements with a sliding motion. - * - * @param options A map of additional options to pass to the method. - */ - slideDown(options: JQueryAnimationOptions): JQuery; - - /** - * Display or hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - slideToggle(duration?: number|string, complete?: Function): JQuery; - /** - * Display or hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - slideToggle(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display or hide the matched elements with a sliding motion. - * - * @param options A map of additional options to pass to the method. - */ - slideToggle(options: JQueryAnimationOptions): JQuery; - - /** - * Hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - slideUp(duration?: number|string, complete?: Function): JQuery; - /** - * Hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - slideUp(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Hide the matched elements with a sliding motion. - * - * @param options A map of additional options to pass to the method. - */ - slideUp(options: JQueryAnimationOptions): JQuery; - - /** - * Stop the currently-running animation on the matched elements. - * - * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false. - * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false. - */ - stop(clearQueue?: boolean, jumpToEnd?: boolean): JQuery; - /** - * Stop the currently-running animation on the matched elements. - * - * @param queue The name of the queue in which to stop animations. - * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false. - * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false. - */ - stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): JQuery; - - /** - * Display or hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - toggle(duration?: number|string, complete?: Function): JQuery; - /** - * Display or hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - toggle(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display or hide the matched elements. - * - * @param options A map of additional options to pass to the method. - */ - toggle(options: JQueryAnimationOptions): JQuery; - /** - * Display or hide the matched elements. - * - * @param showOrHide A Boolean indicating whether to show or hide the elements. - */ - toggle(showOrHide: boolean): JQuery; - - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param handler A function to execute each time the event is triggered. - */ - bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param eventData An object containing data that will be passed to the event handler. - * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true. - */ - bind(eventType: string, eventData: any, preventBubble: boolean): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true. - */ - bind(eventType: string, preventBubble: boolean): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param events An object containing one or more DOM event types and functions to execute for them. - */ - bind(events: any): JQuery; - - /** - * Trigger the "blur" event on an element - */ - blur(): JQuery; - /** - * Bind an event handler to the "blur" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - blur(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "blur" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "change" event on an element. - */ - change(): JQuery; - /** - * Bind an event handler to the "change" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - change(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "change" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "click" event on an element. - */ - click(): JQuery; - /** - * Bind an event handler to the "click" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - */ - click(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "click" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "dblclick" event on an element. - */ - dblclick(): JQuery; - /** - * Bind an event handler to the "dblclick" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "dblclick" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "focus" event on an element. - */ - focus(): JQuery; - /** - * Bind an event handler to the "focus" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - focus(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "focus" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "focusin" event on an element. - */ - focusin(): JQuery; - /** - * Bind an event handler to the "focusin" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - focusin(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "focusin" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "focusout" event on an element. - */ - focusout(): JQuery; - /** - * Bind an event handler to the "focusout" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - focusout(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "focusout" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements. - * - * @param handlerIn A function to execute when the mouse pointer enters the element. - * @param handlerOut A function to execute when the mouse pointer leaves the element. - */ - hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements. - * - * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element. - */ - hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "keydown" event on an element. - */ - keydown(): JQuery; - /** - * Bind an event handler to the "keydown" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - keydown(handler: (eventObject: JQueryKeyEventObject) => any): JQuery; - /** - * Bind an event handler to the "keydown" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery; - - /** - * Trigger the "keypress" event on an element. - */ - keypress(): JQuery; - /** - * Bind an event handler to the "keypress" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - keypress(handler: (eventObject: JQueryKeyEventObject) => any): JQuery; - /** - * Bind an event handler to the "keypress" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery; - - /** - * Trigger the "keyup" event on an element. - */ - keyup(): JQuery; - /** - * Bind an event handler to the "keyup" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - keyup(handler: (eventObject: JQueryKeyEventObject) => any): JQuery; - /** - * Bind an event handler to the "keyup" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery; - - /** - * Bind an event handler to the "load" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - load(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "load" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "mousedown" event on an element. - */ - mousedown(): JQuery; - /** - * Bind an event handler to the "mousedown" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mousedown(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mousedown" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseenter" event on an element. - */ - mouseenter(): JQuery; - /** - * Bind an event handler to be fired when the mouse enters an element. - * - * @param handler A function to execute when the event is triggered. - */ - mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to be fired when the mouse enters an element. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseleave" event on an element. - */ - mouseleave(): JQuery; - /** - * Bind an event handler to be fired when the mouse leaves an element. - * - * @param handler A function to execute when the event is triggered. - */ - mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to be fired when the mouse leaves an element. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mousemove" event on an element. - */ - mousemove(): JQuery; - /** - * Bind an event handler to the "mousemove" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mousemove(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mousemove" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseout" event on an element. - */ - mouseout(): JQuery; - /** - * Bind an event handler to the "mouseout" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mouseout(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mouseout" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseover" event on an element. - */ - mouseover(): JQuery; - /** - * Bind an event handler to the "mouseover" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mouseover(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mouseover" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseup" event on an element. - */ - mouseup(): JQuery; - /** - * Bind an event handler to the "mouseup" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mouseup(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mouseup" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Remove an event handler. - */ - off(): JQuery; - /** - * Remove an event handler. - * - * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin". - * @param selector A selector which should match the one originally passed to .on() when attaching event handlers. - * @param handler A handler function previously attached for the event(s), or the special value false. - */ - off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove an event handler. - * - * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin". - * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on(). - */ - off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery; - /** - * Remove an event handler. - * - * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin". - * @param handler A handler function previously attached for the event(s), or the special value false. - */ - off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove an event handler. - * - * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s). - * @param selector A selector which should match the one originally passed to .on() when attaching event handlers. - */ - off(events: { [key: string]: any; }, selector?: string): JQuery; - - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax). - */ - on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param data Data to be passed to the handler in event.data when an event is triggered. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - on(events: string, data : any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event is triggered. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - on(events: { [key: string]: any; }, selector?: string, data?: any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - on(events: { [key: string]: any; }, data?: any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names. - * @param handler A function to execute at the time the event is triggered. - */ - one(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names. - * @param data An object containing data that will be passed to the event handler. - * @param handler A function to execute at the time the event is triggered. - */ - one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event is triggered. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - one(events: { [key: string]: any; }, selector?: string, data?: any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - one(events: { [key: string]: any; }, data?: any): JQuery; - - - /** - * Specify a function to execute when the DOM is fully loaded. - * - * @param handler A function to execute after the DOM is ready. - */ - ready(handler: (jQueryAlias?: JQueryStatic) => any): JQuery; - - /** - * Trigger the "resize" event on an element. - */ - resize(): JQuery; - /** - * Bind an event handler to the "resize" JavaScript event. - * - * @param handler A function to execute each time the event is triggered. - */ - resize(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "resize" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "scroll" event on an element. - */ - scroll(): JQuery; - /** - * Bind an event handler to the "scroll" JavaScript event. - * - * @param handler A function to execute each time the event is triggered. - */ - scroll(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "scroll" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "select" event on an element. - */ - select(): JQuery; - /** - * Bind an event handler to the "select" JavaScript event. - * - * @param handler A function to execute each time the event is triggered. - */ - select(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "select" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "submit" event on an element. - */ - submit(): JQuery; - /** - * Bind an event handler to the "submit" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - submit(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "submit" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Execute all handlers and behaviors attached to the matched elements for the given event type. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param extraParameters Additional parameters to pass along to the event handler. - */ - trigger(eventType: string, extraParameters?: any[]|Object): JQuery; - /** - * Execute all handlers and behaviors attached to the matched elements for the given event type. - * - * @param event A jQuery.Event object. - * @param extraParameters Additional parameters to pass along to the event handler. - */ - trigger(event: JQueryEventObject, extraParameters?: any[]|Object): JQuery; - - /** - * Execute all handlers attached to an element for an event. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param extraParameters An array of additional parameters to pass along to the event handler. - */ - triggerHandler(eventType: string, ...extraParameters: any[]): Object; - - /** - * Execute all handlers attached to an element for an event. - * - * @param event A jQuery.Event object. - * @param extraParameters An array of additional parameters to pass along to the event handler. - */ - triggerHandler(event: JQueryEventObject, ...extraParameters: any[]): Object; - - /** - * Remove a previously-attached event handler from the elements. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param handler The function that is to be no longer executed. - */ - unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove a previously-attached event handler from the elements. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ). - */ - unbind(eventType: string, fls: boolean): JQuery; - /** - * Remove a previously-attached event handler from the elements. - * - * @param evt A JavaScript event object as passed to an event handler. - */ - unbind(evt: any): JQuery; - - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - */ - undelegate(): JQuery; - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - * - * @param selector A selector which will be used to filter the event results. - * @param eventType A string containing a JavaScript event type, such as "click" or "keydown" - * @param handler A function to execute at the time the event is triggered. - */ - undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - * - * @param selector A selector which will be used to filter the event results. - * @param events An object of one or more event types and previously bound functions to unbind from them. - */ - undelegate(selector: string, events: Object): JQuery; - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - * - * @param namespace A string containing a namespace to unbind all events from. - */ - undelegate(namespace: string): JQuery; - - /** - * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8) - * - * @param handler A function to execute when the event is triggered. - */ - unload(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8) - * - * @param eventData A plain object of data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10) - */ - context: Element; - - jquery: string; - - /** - * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8) - * - * @param handler A function to execute when the event is triggered. - */ - error(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8) - * - * @param eventData A plain object of data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Add a collection of DOM elements onto the jQuery stack. - * - * @param elements An array of elements to push onto the stack and make into a new jQuery object. - */ - pushStack(elements: any[]): JQuery; - /** - * Add a collection of DOM elements onto the jQuery stack. - * - * @param elements An array of elements to push onto the stack and make into a new jQuery object. - * @param name The name of a jQuery method that generated the array of elements. - * @param arguments The arguments that were passed in to the jQuery method (for serialization). - */ - pushStack(elements: any[], name: string, arguments: any[]): JQuery; - - /** - * Insert content, specified by the parameter, after each element in the set of matched elements. - * - * param content1 HTML string, DOM element, array of elements, or jQuery object to insert after each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements. - */ - after(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, after each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - after(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Insert content, specified by the parameter, to the end of each element in the set of matched elements. - * - * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements. - */ - append(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, to the end of each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set. - */ - append(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Insert every element in the set of matched elements to the end of the target. - * - * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter. - */ - appendTo(target: JQuery|any[]|Element|string): JQuery; - - /** - * Insert content, specified by the parameter, before each element in the set of matched elements. - * - * param content1 HTML string, DOM element, array of elements, or jQuery object to insert before each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements. - */ - before(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, before each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - before(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Create a deep copy of the set of matched elements. - * - * param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false. - * param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false). - */ - clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): JQuery; - - /** - * Remove the set of matched elements from the DOM. - * - * param selector A selector expression that filters the set of matched elements to be removed. - */ - detach(selector?: string): JQuery; - - /** - * Remove all child nodes of the set of matched elements from the DOM. - */ - empty(): JQuery; - - /** - * Insert every element in the set of matched elements after the target. - * - * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter. - */ - insertAfter(target: JQuery|any[]|Element|Text|string): JQuery; - - /** - * Insert every element in the set of matched elements before the target. - * - * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter. - */ - insertBefore(target: JQuery|any[]|Element|Text|string): JQuery; - - /** - * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements. - * - * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements. - */ - prepend(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set. - */ - prepend(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Insert every element in the set of matched elements to the beginning of the target. - * - * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter. - */ - prependTo(target: JQuery|any[]|Element|string): JQuery; - - /** - * Remove the set of matched elements from the DOM. - * - * @param selector A selector expression that filters the set of matched elements to be removed. - */ - remove(selector?: string): JQuery; - - /** - * Replace each target element with the set of matched elements. - * - * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace. - */ - replaceAll(target: JQuery|any[]|Element|string): JQuery; - - /** - * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed. - * - * param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object. - */ - replaceWith(newContent: JQuery|any[]|Element|Text|string): JQuery; - /** - * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed. - * - * param func A function that returns content with which to replace the set of matched elements. - */ - replaceWith(func: () => Element|JQuery): JQuery; - - /** - * Get the combined text contents of each element in the set of matched elements, including their descendants. - */ - text(): string; - /** - * Set the content of each element in the set of matched elements to the specified text. - * - * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation. - */ - text(text: string|number|boolean): JQuery; - /** - * Set the content of each element in the set of matched elements to the specified text. - * - * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments. - */ - text(func: (index: number, text: string) => string): JQuery; - - /** - * Retrieve all the elements contained in the jQuery set, as an array. - */ - toArray(): any[]; - - /** - * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place. - */ - unwrap(): JQuery; - - /** - * Wrap an HTML structure around each element in the set of matched elements. - * - * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements. - */ - wrap(wrappingElement: JQuery|Element|string): JQuery; - /** - * Wrap an HTML structure around each element in the set of matched elements. - * - * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - wrap(func: (index: number) => string|JQuery): JQuery; - - /** - * Wrap an HTML structure around all elements in the set of matched elements. - * - * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements. - */ - wrapAll(wrappingElement: JQuery|Element|string): JQuery; - wrapAll(func: (index: number) => string): JQuery; - - /** - * Wrap an HTML structure around the content of each element in the set of matched elements. - * - * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements. - */ - wrapInner(wrappingElement: JQuery|Element|string): JQuery; - /** - * Wrap an HTML structure around the content of each element in the set of matched elements. - * - * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - wrapInner(func: (index: number) => string): JQuery; - - /** - * Iterate over a jQuery object, executing a function for each matched element. - * - * @param func A function to execute for each matched element. - */ - each(func: (index: number, elem: Element) => any): JQuery; - - /** - * Retrieve one of the elements matched by the jQuery object. - * - * @param index A zero-based integer indicating which element to retrieve. - */ - get(index: number): HTMLElement; - /** - * Retrieve the elements matched by the jQuery object. - */ - get(): any[]; - - /** - * Search for a given element from among the matched elements. - */ - index(): number; - /** - * Search for a given element from among the matched elements. - * - * @param selector A selector representing a jQuery collection in which to look for an element. - */ - index(selector: string|JQuery|Element): number; - - /** - * The number of elements in the jQuery object. - */ - length: number; - /** - * A selector representing selector passed to jQuery(), if any, when creating the original set. - * version deprecated: 1.7, removed: 1.9 - */ - selector: string; - [index: string]: any; - [index: number]: HTMLElement; - - /** - * Add elements to the set of matched elements. - * - * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements. - * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method. - */ - add(selector: string, context?: Element): JQuery; - /** - * Add elements to the set of matched elements. - * - * @param elements One or more elements to add to the set of matched elements. - */ - add(...elements: Element[]): JQuery; - /** - * Add elements to the set of matched elements. - * - * @param html An HTML fragment to add to the set of matched elements. - */ - add(html: string): JQuery; - /** - * Add elements to the set of matched elements. - * - * @param obj An existing jQuery object to add to the set of matched elements. - */ - add(obj: JQuery): JQuery; - - /** - * Get the children of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - children(selector?: string): JQuery; - - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param selector A string containing a selector expression to match elements against. - */ - closest(selector: string): JQuery; - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param selector A string containing a selector expression to match elements against. - * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead. - */ - closest(selector: string, context?: Element): JQuery; - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param obj A jQuery object to match elements against. - */ - closest(obj: JQuery): JQuery; - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param element An element to match elements against. - */ - closest(element: Element): JQuery; - - /** - * Get an array of all the elements and selectors matched against the current element up through the DOM tree. - * - * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object). - * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead. - */ - closest(selectors: any, context?: Element): any[]; - - /** - * Get the children of each element in the set of matched elements, including text and comment nodes. - */ - contents(): JQuery; - - /** - * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state. - */ - end(): JQuery; - - /** - * Reduce the set of matched elements to the one at the specified index. - * - * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set. - * - */ - eq(index: number): JQuery; - - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param selector A string containing a selector expression to match the current set of elements against. - */ - filter(selector: string): JQuery; - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param func A function used as a test for each element in the set. this is the current DOM element. - */ - filter(func: (index: number, element: Element) => any): JQuery; - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param element An element to match the current set of elements against. - */ - filter(element: Element): JQuery; - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param obj An existing jQuery object to match the current set of elements against. - */ - filter(obj: JQuery): JQuery; - - /** - * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - * - * @param selector A string containing a selector expression to match elements against. - */ - find(selector: string): JQuery; - /** - * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - * - * @param element An element to match elements against. - */ - find(element: Element): JQuery; - /** - * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - * - * @param obj A jQuery object to match elements against. - */ - find(obj: JQuery): JQuery; - - /** - * Reduce the set of matched elements to the first in the set. - */ - first(): JQuery; - - /** - * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element. - * - * @param selector A string containing a selector expression to match elements against. - */ - has(selector: string): JQuery; - /** - * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element. - * - * @param contained A DOM element to match elements against. - */ - has(contained: Element): JQuery; - - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param selector A string containing a selector expression to match elements against. - */ - is(selector: string): boolean; - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element. - */ - is(func: (index: number, element: Element) => boolean): boolean; - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param obj An existing jQuery object to match the current set of elements against. - */ - is(obj: JQuery): boolean; - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param elements One or more elements to match the current set of elements against. - */ - is(elements: any): boolean; - - /** - * Reduce the set of matched elements to the final one in the set. - */ - last(): JQuery; - - /** - * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values. - * - * @param callback A function object that will be invoked for each element in the current set. - */ - map(callback: (index: number, domElement: Element) => any): JQuery; - - /** - * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - next(selector?: string): JQuery; - - /** - * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - nextAll(selector?: string): JQuery; - - /** - * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - * - * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - nextUntil(selector?: string, filter?: string): JQuery; - /** - * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - * - * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - nextUntil(element?: Element, filter?: string): JQuery; - /** - * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - * - * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - nextUntil(obj?: JQuery, filter?: string): JQuery; - - /** - * Remove elements from the set of matched elements. - * - * @param selector A string containing a selector expression to match elements against. - */ - not(selector: string): JQuery; - /** - * Remove elements from the set of matched elements. - * - * @param func A function used as a test for each element in the set. this is the current DOM element. - */ - not(func: (index: number, element: Element) => boolean): JQuery; - /** - * Remove elements from the set of matched elements. - * - * @param elements One or more DOM elements to remove from the matched set. - */ - not(elements: Element|Element[]): JQuery; - /** - * Remove elements from the set of matched elements. - * - * @param obj An existing jQuery object to match the current set of elements against. - */ - not(obj: JQuery): JQuery; - - /** - * Get the closest ancestor element that is positioned. - */ - offsetParent(): JQuery; - - /** - * Get the parent of each element in the current set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - parent(selector?: string): JQuery; - - /** - * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - parents(selector?: string): JQuery; - - /** - * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements. - * @param filter A string containing a selector expression to match elements against. - */ - parentsUntil(selector?: string, filter?: string): JQuery; - /** - * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements. - * @param filter A string containing a selector expression to match elements against. - */ - parentsUntil(element?: Element, filter?: string): JQuery; - /** - * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements. - * @param filter A string containing a selector expression to match elements against. - */ - parentsUntil(obj?: JQuery, filter?: string): JQuery; - - /** - * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - prev(selector?: string): JQuery; - - /** - * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - prevAll(selector?: string): JQuery; - - /** - * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - prevUntil(selector?: string, filter?: string): JQuery; - /** - * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - prevUntil(element?: Element, filter?: string): JQuery; - /** - * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - prevUntil(obj?: JQuery, filter?: string): JQuery; - - /** - * Get the siblings of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - siblings(selector?: string): JQuery; - - /** - * Reduce the set of matched elements to a subset specified by a range of indices. - * - * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set. - * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set. - */ - slice(start: number, end?: number): JQuery; - - /** - * Show the queue of functions to be executed on the matched elements. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - queue(queueName?: string): any[]; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param newQueue An array of functions to replace the current queue contents. - */ - queue(newQueue: Function[]): JQuery; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param callback The new function to add to the queue, with a function to call that will dequeue the next item. - */ - queue(callback: Function): JQuery; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param newQueue An array of functions to replace the current queue contents. - */ - queue(queueName: string, newQueue: Function[]): JQuery; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param callback The new function to add to the queue, with a function to call that will dequeue the next item. - */ - queue(queueName: string, callback: Function): JQuery; -} -declare module "jquery" { - export = $; -} -declare var jQuery: JQueryStatic; -declare var $: JQueryStatic; \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/typings.json b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/typings.json deleted file mode 100644 index 0af7c54b42..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/globals/jquery/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/4cdfbe96b666eec5e1defbb519a62abf04e96764/jquery/jquery.d.ts", - "raw": "registry:dt/jquery#1.10.0+20160417213236", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/4cdfbe96b666eec5e1defbb519a62abf04e96764/jquery/jquery.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/index.d.ts b/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/index.d.ts deleted file mode 100644 index 7b1af70fde..0000000000 --- a/public/docs/_examples/upgrade-phonecat-1-typescript/ts/typings-ng1/index.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -/// -/// -/// -/// -/// -/// diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/README.md b/public/docs/_examples/upgrade-phonecat-2-hybrid/README.md index 31fd100e68..4f8e4928af 100644 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/README.md +++ b/public/docs/_examples/upgrade-phonecat-2-hybrid/README.md @@ -14,9 +14,6 @@ The following changes from vanilla Phonecat are applied: in index.html and karma.conf.ng1.js. * E2E tests have been moved to the parent directory, where `run-e2e-tests` can discover and run them along with all the other examples. -* Angular 1 typings (from DefinitelyTyped) are added to typings-ng1 so that - TypeScript can recognize Angular 1 code. (typings.json comes from boilerplate - so we can't add them there). * Most of the phone JSON and image data removed in the interest of keeping repo weight down. Keeping enough to retain testability of the app. diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/e2e-spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-2-hybrid/e2e-spec.ts.disabled index c55560f3a3..0e27367ec8 100644 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/e2e-spec.ts.disabled +++ b/public/docs/_examples/upgrade-phonecat-2-hybrid/e2e-spec.ts.disabled @@ -1,5 +1,6 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; // Angular E2E Testing Guide: // https://docs.angularjs.org/guide/e2e-testing @@ -27,11 +28,11 @@ describe('PhoneCat Application', function() { expect(phoneList.count()).toBe(20); - sendKeys(query, 'nexus'); + query.sendKeys('nexus'); expect(phoneList.count()).toBe(1); query.clear(); - sendKeys(query, 'motorola'); + query.sendKeys('motorola'); expect(phoneList.count()).toBe(8); }); @@ -47,7 +48,7 @@ describe('PhoneCat Application', function() { }); } - sendKeys(queryField, 'tablet'); // Let's narrow the dataset to make the assertions shorter + queryField.sendKeys('tablet'); // Let's narrow the dataset to make the assertions shorter expect(getNames()).toEqual([ 'Motorola XOOM\u2122 with Wi-Fi', @@ -64,7 +65,7 @@ describe('PhoneCat Application', function() { it('should render phone specific links', function() { let query = element(by.css('input')); - sendKeys(query, 'nexus'); + query.sendKeys('nexus'); element.all(by.css('.phones li a')).first().click(); browser.refresh(); // Not sure why this is needed but it is. The route change works fine. diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/index.d.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/index.d.ts deleted file mode 100644 index c720d9293a..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/index.d.ts +++ /dev/null @@ -1,294 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f0b2681b481397d0c03557ac2ac4d70c1c61c464/angularjs/angular-animate.d.ts -declare module "angular-animate" { - var _: string; - export = _; -} - -/** - * ngAnimate module (angular-animate.js) - */ -declare namespace angular.animate { - interface IAnimateFactory { - (...args: any[]): IAnimateCallbackObject; - } - - interface IAnimateCallbackObject { - eventFn?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - setClass?: (element: IAugmentedJQuery, addedClasses: string, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any; - addClass?: (element: IAugmentedJQuery, addedClasses: string, doneFunction: Function, options: IAnimationOptions) => any; - removeClass?: (element: IAugmentedJQuery, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any; - enter?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - leave?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - move?: (element: IAugmentedJQuery, doneFunction: Function, options: IAnimationOptions) => any; - animate?: (element: IAugmentedJQuery, fromStyles: string, toStyles: string, doneFunction: Function, options: IAnimationOptions) => any; - } - - interface IAnimationPromise extends IPromise {} - - /** - * AnimateService - * see http://docs.angularjs.org/api/ngAnimate/service/$animate - */ - interface IAnimateService { - /** - * Sets up an event listener to fire whenever the animation event has fired on the given element or among any of its children. - * - * @param event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...) - * @param container the container element that will capture each of the animation events that are fired on itself as well as among its children - * @param callback the callback function that will be fired when the listener is triggered - */ - on(event: string, container: JQuery, callback: Function): void; - - /** - * Deregisters an event listener based on the event which has been associated with the provided element. - * - * @param event the animation event (e.g. enter, leave, move, addClass, removeClass, etc...) - * @param container the container element the event listener was placed on - * @param callback the callback function that was registered as the listener - */ - off(event: string, container?: JQuery, callback?: Function): void; - - /** - * Associates the provided element with a host parent element to allow the element to be animated even if it exists outside of the DOM structure of the Angular application. - * - * @param element the external element that will be pinned - * @param parentElement the host parent element that will be associated with the external element - */ - pin(element: JQuery, parentElement: JQuery): void; - - /** - * Globally enables / disables animations. - * - * @param element If provided then the element will be used to represent the enable/disable operation. - * @param value If provided then set the animation on or off. - * @returns current animation state - */ - enabled(element: JQuery, value?: boolean): boolean; - enabled(value: boolean): boolean; - - /** - * Cancels the provided animation. - */ - cancel(animationPromise: IAnimationPromise): void; - - /** - * Performs an inline animation on the element. - * - * @param element the element that will be the focus of the animation - * @param from a collection of CSS styles that will be applied to the element at the start of the animation - * @param to a collection of CSS styles that the element will animate towards - * @param className an optional CSS class that will be added to the element for the duration of the animation (the default class is 'ng-inline-animate') - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - animate(element: JQuery, from: any, to: any, className?: string, options?: IAnimationOptions): IAnimationPromise; - - /** - * Appends the element to the parentElement element that resides in the document and then runs the enter animation. - * - * @param element the element that will be the focus of the enter animation - * @param parentElement the parent element of the element that will be the focus of the enter animation - * @param afterElement the sibling element (which is the previous element) of the element that will be the focus of the enter animation - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - enter(element: JQuery, parentElement: JQuery, afterElement?: JQuery, options?: IAnimationOptions): IAnimationPromise; - - /** - * Runs the leave animation operation and, upon completion, removes the element from the DOM. - * - * @param element the element that will be the focus of the leave animation - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - leave(element: JQuery, options?: IAnimationOptions): IAnimationPromise; - - /** - * Fires the move DOM operation. Just before the animation starts, the animate service will either append - * it into the parentElement container or add the element directly after the afterElement element if present. - * Then the move animation will be run. - * - * @param element the element that will be the focus of the move animation - * @param parentElement the parent element of the element that will be the focus of the move animation - * @param afterElement the sibling element (which is the previous element) of the element that will be the focus of the move animation - * @returns the animation callback promise - */ - move(element: JQuery, parentElement: JQuery, afterElement?: JQuery): IAnimationPromise; - - /** - * Triggers a custom animation event based off the className variable and then attaches the className - * value to the element as a CSS class. - * - * @param element the element that will be animated - * @param className the CSS class that will be added to the element and then animated - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - addClass(element: JQuery, className: string, options?: IAnimationOptions): IAnimationPromise; - - /** - * Triggers a custom animation event based off the className variable and then removes the CSS class - * provided by the className value from the element. - * - * @param element the element that will be animated - * @param className the CSS class that will be animated and then removed from the element - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - removeClass(element: JQuery, className: string, options?: IAnimationOptions): IAnimationPromise; - - /** - * Adds and/or removes the given CSS classes to and from the element. Once complete, the done() callback - * will be fired (if provided). - * - * @param element the element which will have its CSS classes changed removed from it - * @param add the CSS classes which will be added to the element - * @param remove the CSS class which will be removed from the element CSS classes have been set on the element - * @param options an optional collection of styles that will be picked up by the CSS transition/animation - * @returns the animation callback promise - */ - setClass(element: JQuery, add: string, remove: string, options?: IAnimationOptions): IAnimationPromise; - } - - /** - * AnimateProvider - * see http://docs.angularjs.org/api/ngAnimate/provider/$animateProvider - */ - interface IAnimateProvider { - /** - * Registers a new injectable animation factory function. - * - * @param name The name of the animation. - * @param factory The factory function that will be executed to return the animation object. - */ - register(name: string, factory: IAnimateFactory): void; - - /** - * Gets and/or sets the CSS class expression that is checked when performing an animation. - * - * @param expression The className expression which will be checked against all animations. - * @returns The current CSS className expression value. If null then there is no expression value. - */ - classNameFilter(expression?: RegExp): RegExp; - } - - /** - * Angular Animation Options - * see https://docs.angularjs.org/api/ngAnimate/#applying-directive-specific-styles-to-an-animation - */ - interface IAnimationOptions { - /** - * The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition. - */ - to?: Object; - - /** - * The starting CSS styles (a key/value object) that will be applied at the start of the animation. - */ - from?: Object; - - /** - * The DOM event (e.g. enter, leave, move). When used, a generated CSS class of ng-EVENT and - * ng-EVENT-active will be applied to the element during the animation. Multiple events can be provided when - * spaces are used as a separator. (Note that this will not perform any DOM operation.) - */ - event?: string; - - /** - * The CSS easing value that will be applied to the transition or keyframe animation (or both). - */ - easing?: string; - - /** - * The raw CSS transition style that will be used (e.g. 1s linear all). - */ - transition?: string; - - /** - * The raw CSS keyframe animation style that will be used (e.g. 1s my_animation linear). - */ - keyframe?: string; - - /** - * A space separated list of CSS classes that will be added to the element and spread across the animation. - */ - addClass?: string; - - /** - * A space separated list of CSS classes that will be removed from the element and spread across - * the animation. - */ - removeClass?: string; - - /** - * A number value representing the total duration of the transition and/or keyframe (note that a value - * of 1 is 1000ms). If a value of 0 is provided then the animation will be skipped entirely. - */ - duration?: number; - - /** - * A number value representing the total delay of the transition and/or keyframe (note that a value of - * 1 is 1000ms). If a value of true is used then whatever delay value is detected from the CSS classes will be - * mirrored on the elements styles (e.g. by setting delay true then the style value of the element will be - * transition-delay: DETECTED_VALUE). Using true is useful when you want the CSS classes and inline styles to - * all share the same CSS delay value. - */ - delay?: number; - - /** - * A numeric time value representing the delay between successively animated elements (Click here to - * learn how CSS-based staggering works in ngAnimate.) - */ - stagger?: number; - - /** - * The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item - * in the stagger; therefore when a stagger option value of 0.1 is used then there will be a stagger delay of 600ms) - * applyClassesEarly - Whether or not the classes being added or removed will be used when detecting the animation. - * This is set by $animate when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. - * (Note that this will prevent any transitions from occuring on the classes being added and removed.) - */ - staggerIndex?: number; - } - - interface IAnimateCssRunner { - /** - * Starts the animation - * - * @returns The animation runner with a done function for supplying a callback. - */ - start(): IAnimateCssRunnerStart; - - /** - * Ends (aborts) the animation - */ - end(): void; - } - - interface IAnimateCssRunnerStart extends IPromise { - /** - * Allows you to add done callbacks to the running animation - * - * @param callbackFn: the callback function to be run - */ - done(callbackFn: (animationFinished: boolean) => void): void; - } - - /** - * AnimateCssService - * see http://docs.angularjs.org/api/ngAnimate/service/$animateCss - */ - interface IAnimateCssService { - (element: JQuery, animateCssOptions: IAnimationOptions): IAnimateCssRunner; - } -} - -declare module angular { - interface IModule { - animation(name: string, animationFactory: angular.animate.IAnimateFactory): IModule; - animation(name: string, inlineAnnotatedFunction: any[]): IModule; - animation(object: Object): IModule; - } - -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/typings.json b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/typings.json deleted file mode 100644 index ea2467c89a..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-animate/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f0b2681b481397d0c03557ac2ac4d70c1c61c464/angularjs/angular-animate.d.ts", - "raw": "registry:dt/angular-animate#1.5.0+20160407085121", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f0b2681b481397d0c03557ac2ac4d70c1c61c464/angularjs/angular-animate.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/index.d.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/index.d.ts deleted file mode 100644 index fd6e92534b..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/index.d.ts +++ /dev/null @@ -1,339 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5b7257019ae959533341a715b339d2562bbf9b85/angularjs/angular-mocks.d.ts -declare module "angular-mocks/ngMock" { - var _: string; - export = _; -} - -declare module "angular-mocks/ngMockE2E" { - var _: string; - export = _; -} - -declare module "angular-mocks/ngAnimateMock" { - var _: string; - export = _; -} - -/////////////////////////////////////////////////////////////////////////////// -// ngMock module (angular-mocks.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular { - - /////////////////////////////////////////////////////////////////////////// - // AngularStatic - // We reopen it to add the MockStatic definition - /////////////////////////////////////////////////////////////////////////// - interface IAngularStatic { - mock: IMockStatic; - } - - // see https://docs.angularjs.org/api/ngMock/function/angular.mock.inject - interface IInjectStatic { - (...fns: Function[]): any; - (...inlineAnnotatedConstructor: any[]): any; // this overload is undocumented, but works - strictDi(val?: boolean): void; - } - - interface IMockStatic { - // see https://docs.angularjs.org/api/ngMock/function/angular.mock.dump - dump(obj: any): string; - - inject: IInjectStatic - - // see https://docs.angularjs.org/api/ngMock/function/angular.mock.module - module: { - (...modules: any[]): any; - sharedInjector(): void; - } - - // see https://docs.angularjs.org/api/ngMock/type/angular.mock.TzDate - TzDate(offset: number, timestamp: number): Date; - TzDate(offset: number, timestamp: string): Date; - } - - /////////////////////////////////////////////////////////////////////////// - // ExceptionHandlerService - // see https://docs.angularjs.org/api/ngMock/service/$exceptionHandler - // see https://docs.angularjs.org/api/ngMock/provider/$exceptionHandlerProvider - /////////////////////////////////////////////////////////////////////////// - interface IExceptionHandlerProvider extends IServiceProvider { - mode(mode: string): void; - } - - /////////////////////////////////////////////////////////////////////////// - // TimeoutService - // see https://docs.angularjs.org/api/ngMock/service/$timeout - // Augments the original service - /////////////////////////////////////////////////////////////////////////// - interface ITimeoutService { - flush(delay?: number): void; - flushNext(expectedDelay?: number): void; - verifyNoPendingTasks(): void; - } - - /////////////////////////////////////////////////////////////////////////// - // IntervalService - // see https://docs.angularjs.org/api/ngMock/service/$interval - // Augments the original service - /////////////////////////////////////////////////////////////////////////// - interface IIntervalService { - flush(millis?: number): number; - } - - /////////////////////////////////////////////////////////////////////////// - // LogService - // see https://docs.angularjs.org/api/ngMock/service/$log - // Augments the original service - /////////////////////////////////////////////////////////////////////////// - interface ILogService { - assertEmpty(): void; - reset(): void; - } - - interface ILogCall { - logs: string[]; - } - - /////////////////////////////////////////////////////////////////////////// - // ControllerService mock - // see https://docs.angularjs.org/api/ngMock/service/$controller - // This interface extends http://docs.angularjs.org/api/ng.$controller - /////////////////////////////////////////////////////////////////////////// - interface IControllerService { - // Although the documentation doesn't state this, locals are optional - (controllerConstructor: new (...args: any[]) => T, locals?: any, bindings?: any): T; - (controllerConstructor: Function, locals?: any, bindings?: any): T; - (controllerName: string, locals?: any, bindings?: any): T; - } - - /////////////////////////////////////////////////////////////////////////// - // ComponentControllerService - // see https://docs.angularjs.org/api/ngMock/service/$componentController - /////////////////////////////////////////////////////////////////////////// - interface IComponentControllerService { - // TBinding is an interface exposed by a component as per John Papa's style guide - // https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#accessible-members-up-top - (componentName: string, locals: { $scope: IScope, [key: string]: any }, bindings?: TBinding, ident?: string): T; - } - - - /////////////////////////////////////////////////////////////////////////// - // HttpBackendService - // see https://docs.angularjs.org/api/ngMock/service/$httpBackend - /////////////////////////////////////////////////////////////////////////// - interface IHttpBackendService { - /** - * Flushes all pending requests using the trained responses. - * @param count Number of responses to flush (in the order they arrived). If undefined, all pending requests will be flushed. - */ - flush(count?: number): void; - - /** - * Resets all request expectations, but preserves all backend definitions. - */ - resetExpectations(): void; - - /** - * Verifies that all of the requests defined via the expect api were made. If any of the requests were not made, verifyNoOutstandingExpectation throws an exception. - */ - verifyNoOutstandingExpectation(): void; - - /** - * Verifies that there are no outstanding requests that need to be flushed. - */ - verifyNoOutstandingRequest(): void; - - /** - * Creates a new request expectation. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param method HTTP method. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expect(method: string, url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)) :mock.IRequestHandler; - - /** - * Creates a new request expectation for DELETE requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url is as expected. - * @param headers HTTP headers object to be compared with the HTTP headers in the request. - */ - expectDELETE(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for GET requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object to be compared with the HTTP headers in the request. - */ - expectGET(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for HEAD requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object to be compared with the HTTP headers in the request. - */ - expectHEAD(url: string | RegExp | ((url: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for JSONP requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - */ - expectJSONP(url: string | RegExp | ((url: string) => boolean)): mock.IRequestHandler; - - /** - * Creates a new request expectation for PATCH requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expectPATCH(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for POST requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expectPOST(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new request expectation for PUT requests. - * Throws a preformatted error if expectation(s) don't match supplied string, regular expression, object, or if function returns false. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - expectPUT(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object): mock.IRequestHandler; - - /** - * Creates a new backend definition. - * Returns an object with respond method that controls how a matched request is handled. - * @param method HTTP method. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - when(method: string, url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for DELETE requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenDELETE(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for GET requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenGET(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for HEAD requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenHEAD(url: string | RegExp | ((url: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for JSONP requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenJSONP(url: string | RegExp | ((url: string) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for PATCH requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenPATCH(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for POST requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenPOST(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - - /** - * Creates a new backend definition for PUT requests. - * Returns an object with respond method that controls how a matched request is handled. - * @param url HTTP url string, regular expression or function that receives a url and returns true if the url matches the current expctation. - * @param data HTTP request body string, json object, regular expression or function that receives the data and returns true if the data matches the current expectation. - * @param headers HTTP headers object or function that receives the headers and returns true if the headers match the current expectation. - */ - whenPUT(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean)): mock.IRequestHandler; - } - - export module mock { - // returned interface by the the mocked HttpBackendService expect/when methods - interface IRequestHandler { - - /** - * Controls the response for a matched request using a function to construct the response. - * Returns the RequestHandler object for possible overrides. - * @param func Function that receives the request HTTP method, url, data, and headers and returns an array containing response status (number), data, headers, and status text. - */ - respond(func: ((method: string, url: string, data: string | Object, headers: Object) => [number, string | Object, Object, string])): IRequestHandler; - - /** - * Controls the response for a matched request using supplied static data to construct the response. - * Returns the RequestHandler object for possible overrides. - * @param status HTTP status code to add to the response. - * @param data Data to add to the response. - * @param headers Headers object to add to the response. - * @param responseText Response text to add to the response. - */ - respond(status: number, data: string | Object, headers?: Object, responseText?: string): IRequestHandler; - - /** - * Controls the response for a matched request using the HTTP status code 200 and supplied static data to construct the response. - * Returns the RequestHandler object for possible overrides. - * @param data Data to add to the response. - * @param headers Headers object to add to the response. - * @param responseText Response text to add to the response. - */ - respond(data: string | Object, headers?: Object, responseText?: string): IRequestHandler; - - // Available when ngMockE2E is loaded - /** - * Any request matching a backend definition or expectation with passThrough handler will be passed through to the real backend (an XHR request will be made to the server.) - */ - passThrough(): IRequestHandler; - } - - } - -} - -/////////////////////////////////////////////////////////////////////////////// -// functions attached to global object (window) -/////////////////////////////////////////////////////////////////////////////// -//Use `angular.mock.module` instead of `module`, as `module` conflicts with commonjs. -//declare var module: (...modules: any[]) => any; -declare var inject: angular.IInjectStatic; \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/typings.json b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/typings.json deleted file mode 100644 index 4e51b0e278..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-mocks/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5b7257019ae959533341a715b339d2562bbf9b85/angularjs/angular-mocks.d.ts", - "raw": "registry:dt/angular-mocks#1.3.0+20160425155016", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5b7257019ae959533341a715b339d2562bbf9b85/angularjs/angular-mocks.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/index.d.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/index.d.ts deleted file mode 100644 index 3735f9430c..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/index.d.ts +++ /dev/null @@ -1,191 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/e684481e0cd360db62fd6213ca7248245315e8a2/angularjs/angular-resource.d.ts -declare module 'angular-resource' { - var _: string; - export = _; -} - -/////////////////////////////////////////////////////////////////////////////// -// ngResource module (angular-resource.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular.resource { - - /** - * Currently supported options for the $resource factory options argument. - */ - interface IResourceOptions { - /** - * If true then the trailing slashes from any calculated URL will be stripped (defaults to true) - */ - stripTrailingSlashes?: boolean; - /** - * If true, the request made by a "non-instance" call will be cancelled (if not already completed) by calling - * $cancelRequest() on the call's return value. This can be overwritten per action. (Defaults to false.) - */ - cancellable?: boolean; - } - - - /////////////////////////////////////////////////////////////////////////// - // ResourceService - // see http://docs.angularjs.org/api/ngResource.$resource - // Most part of the following definitions were achieved by analyzing the - // actual implementation, since the documentation doesn't seem to cover - // that deeply. - /////////////////////////////////////////////////////////////////////////// - interface IResourceService { - (url: string, paramDefaults?: any, - /** example: {update: { method: 'PUT' }, delete: deleteDescriptor } - where deleteDescriptor : IActionDescriptor */ - actions?: any, options?: IResourceOptions): IResourceClass>; - (url: string, paramDefaults?: any, - /** example: {update: { method: 'PUT' }, delete: deleteDescriptor } - where deleteDescriptor : IActionDescriptor */ - actions?: any, options?: IResourceOptions): U; - (url: string, paramDefaults?: any, - /** example: {update: { method: 'PUT' }, delete: deleteDescriptor } - where deleteDescriptor : IActionDescriptor */ - actions?: any, options?: IResourceOptions): IResourceClass; - } - - // Just a reference to facilitate describing new actions - interface IActionDescriptor { - method: string; - params?: any; - url?: string; - isArray?: boolean; - transformRequest?: angular.IHttpRequestTransformer | angular.IHttpRequestTransformer[]; - transformResponse?: angular.IHttpResponseTransformer | angular.IHttpResponseTransformer[]; - headers?: any; - cache?: boolean | angular.ICacheObject; - /** - * Note: In contrast to $http.config, promises are not supported in $resource, because the same value - * would be used for multiple requests. If you are looking for a way to cancel requests, you should - * use the cancellable option. - */ - timeout?: number - cancellable?: boolean; - withCredentials?: boolean; - responseType?: string; - interceptor?: IHttpInterceptor; - } - - // Allow specify more resource methods - // No need to add duplicates for all four overloads. - interface IResourceMethod { - (): T; - (params: Object): T; - (success: Function, error?: Function): T; - (params: Object, success: Function, error?: Function): T; - (params: Object, data: Object, success?: Function, error?: Function): T; - } - - // Allow specify resource moethod which returns the array - // No need to add duplicates for all four overloads. - interface IResourceArrayMethod { - (): IResourceArray; - (params: Object): IResourceArray; - (success: Function, error?: Function): IResourceArray; - (params: Object, success: Function, error?: Function): IResourceArray; - (params: Object, data: Object, success?: Function, error?: Function): IResourceArray; - } - - // Baseclass for everyresource with default actions. - // If you define your new actions for the resource, you will need - // to extend this interface and typecast the ResourceClass to it. - // - // In case of passing the first argument as anything but a function, - // it's gonna be considered data if the action method is POST, PUT or - // PATCH (in other words, methods with body). Otherwise, it's going - // to be considered as parameters to the request. - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L461-L465 - // - // Only those methods with an HTTP body do have 'data' as first parameter: - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L463 - // More specifically, those methods are POST, PUT and PATCH: - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L432 - // - // Also, static calls always return the IResource (or IResourceArray) retrieved - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L549 - interface IResourceClass { - new(dataOrParams? : any) : T; - get: IResourceMethod; - - query: IResourceArrayMethod; - - save: IResourceMethod; - - remove: IResourceMethod; - - delete: IResourceMethod; - } - - // Instance calls always return the the promise of the request which retrieved the object - // https://github.com/angular/angular.js/blob/v1.2.0/src/ngResource/resource.js#L538-L546 - interface IResource { - $get(): angular.IPromise; - $get(params?: Object, success?: Function, error?: Function): angular.IPromise; - $get(success: Function, error?: Function): angular.IPromise; - - $query(): angular.IPromise>; - $query(params?: Object, success?: Function, error?: Function): angular.IPromise>; - $query(success: Function, error?: Function): angular.IPromise>; - - $save(): angular.IPromise; - $save(params?: Object, success?: Function, error?: Function): angular.IPromise; - $save(success: Function, error?: Function): angular.IPromise; - - $remove(): angular.IPromise; - $remove(params?: Object, success?: Function, error?: Function): angular.IPromise; - $remove(success: Function, error?: Function): angular.IPromise; - - $delete(): angular.IPromise; - $delete(params?: Object, success?: Function, error?: Function): angular.IPromise; - $delete(success: Function, error?: Function): angular.IPromise; - - $cancelRequest(): void; - - /** the promise of the original server interaction that created this instance. **/ - $promise : angular.IPromise; - $resolved : boolean; - toJSON(): T; - } - - /** - * Really just a regular Array object with $promise and $resolve attached to it - */ - interface IResourceArray extends Array> { - /** the promise of the original server interaction that created this collection. **/ - $promise : angular.IPromise>; - $resolved : boolean; - } - - /** when creating a resource factory via IModule.factory */ - interface IResourceServiceFactoryFunction { - ($resource: angular.resource.IResourceService): IResourceClass; - >($resource: angular.resource.IResourceService): U; - } - - // IResourceServiceProvider used to configure global settings - interface IResourceServiceProvider extends angular.IServiceProvider { - - defaults: IResourceOptions; - } - -} - -/** extensions to base ng based on using angular-resource */ -declare namespace angular { - - interface IModule { - /** creating a resource service factory */ - factory(name: string, resourceServiceFactoryFunction: angular.resource.IResourceServiceFactoryFunction): IModule; - } -} - -interface Array -{ - /** the promise of the original server interaction that created this collection. **/ - $promise : angular.IPromise>; - $resolved : boolean; -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/typings.json b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/typings.json deleted file mode 100644 index b60eafd673..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-resource/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/e684481e0cd360db62fd6213ca7248245315e8a2/angularjs/angular-resource.d.ts", - "raw": "registry:dt/angular-resource#1.5.0+20160412142209", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/e684481e0cd360db62fd6213ca7248245315e8a2/angularjs/angular-resource.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/index.d.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/index.d.ts deleted file mode 100644 index 5fad393d0a..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/index.d.ts +++ /dev/null @@ -1,154 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/angularjs/angular-route.d.ts -declare module "angular-route" { - var _: string; - export = _; -} - -/////////////////////////////////////////////////////////////////////////////// -// ngRoute module (angular-route.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular.route { - - /////////////////////////////////////////////////////////////////////////// - // RouteParamsService - // see http://docs.angularjs.org/api/ngRoute.$routeParams - /////////////////////////////////////////////////////////////////////////// - interface IRouteParamsService { - [key: string]: any; - } - - /////////////////////////////////////////////////////////////////////////// - // RouteService - // see http://docs.angularjs.org/api/ngRoute.$route - // see http://docs.angularjs.org/api/ngRoute.$routeProvider - /////////////////////////////////////////////////////////////////////////// - interface IRouteService { - reload(): void; - routes: any; - - // May not always be available. For instance, current will not be available - // to a controller that was not initialized as a result of a route maching. - current?: ICurrentRoute; - - /** - * Causes $route service to update the current URL, replacing current route parameters with those specified in newParams. - * Provided property names that match the route's path segment definitions will be interpolated into the - * location's path, while remaining properties will be treated as query params. - * - * @param newParams Object. mapping of URL parameter names to values - */ - updateParams(newParams:{[key:string]:string}): void; - - } - - type InlineAnnotatedFunction = Function|Array - - /** - * see http://docs.angularjs.org/api/ngRoute/provider/$routeProvider#when for API documentation - */ - interface IRoute { - /** - * {(string|function()=} - * Controller fn that should be associated with newly created scope or the name of a registered controller if passed as a string. - */ - controller?: string|InlineAnnotatedFunction; - /** - * A controller alias name. If present the controller will be published to scope under the controllerAs name. - */ - controllerAs?: string; - /** - * Undocumented? - */ - name?: string; - /** - * {string=|function()=} - * Html template as a string or a function that returns an html template as a string which should be used by ngView or ngInclude directives. This property takes precedence over templateUrl. - * - * If template is a function, it will be called with the following parameters: - * - * {Array.} - route parameters extracted from the current $location.path() by applying the current route - */ - template?: string|{($routeParams?: angular.route.IRouteParamsService) : string;} - /** - * {string=|function()=} - * Path or function that returns a path to an html template that should be used by ngView. - * - * If templateUrl is a function, it will be called with the following parameters: - * - * {Array.} - route parameters extracted from the current $location.path() by applying the current route - */ - templateUrl?: string|{ ($routeParams?: angular.route.IRouteParamsService): string; } - /** - * {Object.=} - An optional map of dependencies which should be injected into the controller. If any of these dependencies are promises, the router will wait for them all to be resolved or one to be rejected before the controller is instantiated. If all the promises are resolved successfully, the values of the resolved promises are injected and $routeChangeSuccess event is fired. If any of the promises are rejected the $routeChangeError event is fired. The map object is: - * - * - key - {string}: a name of a dependency to be injected into the controller. - * - factory - {string|function}: If string then it is an alias for a service. Otherwise if function, then it is injected and the return value is treated as the dependency. If the result is a promise, it is resolved before its value is injected into the controller. Be aware that ngRoute.$routeParams will still refer to the previous route within these resolve functions. Use $route.current.params to access the new route parameters, instead. - */ - resolve?: {[key: string]: any}; - /** - * {(string|function())=} - * Value to update $location path with and trigger route redirection. - * - * If redirectTo is a function, it will be called with the following parameters: - * - * - {Object.} - route parameters extracted from the current $location.path() by applying the current route templateUrl. - * - {string} - current $location.path() - * - {Object} - current $location.search() - * - The custom redirectTo function is expected to return a string which will be used to update $location.path() and $location.search(). - */ - redirectTo?: string|{($routeParams?: angular.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) : string}; - /** - * Reload route when only $location.search() or $location.hash() changes. - * - * This option defaults to true. If the option is set to false and url in the browser changes, then $routeUpdate event is broadcasted on the root scope. - */ - reloadOnSearch?: boolean; - /** - * Match routes without being case sensitive - * - * This option defaults to false. If the option is set to true, then the particular route can be matched without being case sensitive - */ - caseInsensitiveMatch?: boolean; - } - - // see http://docs.angularjs.org/api/ng.$route#current - interface ICurrentRoute extends IRoute { - locals: { - [index: string]: any; - $scope: IScope; - $template: string; - }; - - params: any; - } - - interface IRouteProvider extends IServiceProvider { - /** - * Match routes without being case sensitive - * - * This option defaults to false. If the option is set to true, then the particular route can be matched without being case sensitive - */ - caseInsensitiveMatch?: boolean; - /** - * Sets route definition that will be used on route change when no other route definition is matched. - * - * @params Mapping information to be assigned to $route.current. - */ - otherwise(params: IRoute): IRouteProvider; - /** - * Adds a new route definition to the $route service. - * - * @param path Route path (matched against $location.path). If $location.path contains redundant trailing slash or is missing one, the route will still match and the $location.path will be updated to add or drop the trailing slash to exactly match the route definition. - * - * - path can contain named groups starting with a colon: e.g. :name. All characters up to the next slash are matched and stored in $routeParams under the given name when the route matches. - * - path can contain named groups starting with a colon and ending with a star: e.g.:name*. All characters are eagerly stored in $routeParams under the given name when the route matches. - * - path can contain optional named groups with a question mark: e.g.:name?. - * - * For example, routes like /color/:color/largecode/:largecode*\/edit will match /color/brown/largecode/code/with/slashes/edit and extract: color: brown and largecode: code/with/slashes. - * - * @param route Mapping information to be assigned to $route.current on route match. - */ - when(path: string, route: IRoute): IRouteProvider; - } -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/typings.json b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/typings.json deleted file mode 100644 index 4c4677f34f..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular-route/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/angularjs/angular-route.d.ts", - "raw": "registry:dt/angular-route#1.3.0+20160317120654", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/angularjs/angular-route.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/index.d.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/index.d.ts deleted file mode 100644 index dfde81e26b..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/index.d.ts +++ /dev/null @@ -1,1953 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/b76dd8a7f95b71696982befbb7589940d27e940b/angularjs/angular.d.ts -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; -} - -/////////////////////////////////////////////////////////////////////////////// -// ng module (angular.js) -/////////////////////////////////////////////////////////////////////////////// -declare namespace angular { - - // not directly implemented, but ensures that constructed class implements $get - interface IServiceProviderClass { - new (...args: any[]): IServiceProvider; - } - - interface IServiceProviderFactory { - (...args: any[]): IServiceProvider; - } - - // All service providers extend this interface - interface IServiceProvider { - $get: any; - } - - interface IAngularBootstrapConfig { - strictDi?: boolean; - debugInfoEnabled?: boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // AngularStatic - // see http://docs.angularjs.org/api - /////////////////////////////////////////////////////////////////////////// - interface IAngularStatic { - bind(context: any, fn: Function, ...args: any[]): Function; - - /** - * Use this function to manually start up angular application. - * - * @param element DOM element which is the root of angular application. - * @param modules An array of modules to load into the application. - * Each item in the array should be the name of a predefined module or a (DI annotated) - * function that will be invoked by the injector as a config block. - * @param config an object for defining configuration options for the application. The following keys are supported: - * - `strictDi`: disable automatic function annotation for the application. This is meant to assist in finding bugs which break minified code. - */ - bootstrap(element: string|Element|JQuery|Document, modules?: (string|Function|any[])[], config?: IAngularBootstrapConfig): auto.IInjectorService; - - /** - * Creates a deep copy of source, which should be an object or an array. - * - * - If no destination is supplied, a copy of the object or array is created. - * - If a destination is provided, all of its elements (for array) or properties (for objects) are deleted and then all elements/properties from the source are copied to it. - * - If source is not an object or array (inc. null and undefined), source is returned. - * - If source is identical to 'destination' an exception will be thrown. - * - * @param source The source that will be used to make a copy. Can be any type, including primitives, null, and undefined. - * @param destination Destination into which the source is copied. If provided, must be of the same type as source. - */ - copy(source: T, destination?: T): T; - - /** - * Wraps a raw DOM element or HTML string as a jQuery element. - * - * If jQuery is available, angular.element is an alias for the jQuery function. If jQuery is not available, angular.element delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite." - */ - element: IAugmentedJQueryStatic; - equals(value1: any, value2: any): boolean; - extend(destination: any, ...sources: any[]): any; - - /** - * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional. - * - * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method. - * - * @param obj Object to iterate over. - * @param iterator Iterator function. - * @param context Object to become context (this) for the iterator function. - */ - forEach(obj: T[], iterator: (value: T, key: number) => any, context?: any): any; - /** - * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional. - * - * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method. - * - * @param obj Object to iterate over. - * @param iterator Iterator function. - * @param context Object to become context (this) for the iterator function. - */ - forEach(obj: { [index: string]: T; }, iterator: (value: T, key: string) => any, context?: any): any; - /** - * Invokes the iterator function once for each item in obj collection, which can be either an object or an array. The iterator function is invoked with iterator(value, key), where value is the value of an object property or an array element and key is the object property key or array element index. Specifying a context for the function is optional. - * - * It is worth noting that .forEach does not iterate over inherited properties because it filters using the hasOwnProperty method. - * - * @param obj Object to iterate over. - * @param iterator Iterator function. - * @param context Object to become context (this) for the iterator function. - */ - forEach(obj: any, iterator: (value: any, key: any) => any, context?: any): any; - - fromJson(json: string): any; - identity(arg?: T): T; - injector(modules?: any[], strictDi?: boolean): auto.IInjectorService; - isArray(value: any): boolean; - isDate(value: any): boolean; - isDefined(value: any): boolean; - isElement(value: any): boolean; - isFunction(value: any): boolean; - isNumber(value: any): boolean; - isObject(value: any): boolean; - isString(value: any): boolean; - isUndefined(value: any): boolean; - lowercase(str: string): string; - - /** - * Deeply extends the destination object dst by copying own enumerable properties from the src object(s) to dst. You can specify multiple src objects. If you want to preserve original objects, you can do so by passing an empty object as the target: var object = angular.merge({}, object1, object2). - * - * Unlike extend(), merge() recursively descends into object properties of source objects, performing a deep copy. - * - * @param dst Destination object. - * @param src Source object(s). - */ - merge(dst: any, ...src: any[]): any; - - /** - * The angular.module is a global place for creating, registering and retrieving Angular modules. All modules (angular core or 3rd party) that should be available to an application must be registered using this mechanism. - * - * When passed two or more arguments, a new module is created. If passed only one argument, an existing module (the name passed as the first argument to module) is retrieved. - * - * @param name The name of the module to create or retrieve. - * @param requires The names of modules this module depends on. If specified then new module is being created. If unspecified then the module is being retrieved for further configuration. - * @param configFn Optional configuration function for the module. - */ - module( - name: string, - requires?: string[], - configFn?: Function): IModule; - - noop(...args: any[]): void; - reloadWithDebugInfo(): void; - toJson(obj: any, pretty?: boolean): string; - uppercase(str: string): string; - version: { - full: string; - major: number; - minor: number; - dot: number; - codeName: string; - }; - - /** - * If window.name contains prefix NG_DEFER_BOOTSTRAP! when angular.bootstrap is called, the bootstrap process will be paused until angular.resumeBootstrap() is called. - * @param extraModules An optional array of modules that should be added to the original list of modules that the app was about to be bootstrapped with. - */ - resumeBootstrap?(extraModules?: string[]): ng.auto.IInjectorService; - } - - /////////////////////////////////////////////////////////////////////////// - // Module - // see http://docs.angularjs.org/api/angular.Module - /////////////////////////////////////////////////////////////////////////// - interface IModule { - /** - * Use this method to register a component. - * - * @param name The name of the component. - * @param options A definition object passed into the component. - */ - component(name: string, options: IComponentOptions): IModule; - /** - * Use this method to register work which needs to be performed on module loading. - * - * @param configFn Execute this function on module load. Useful for service configuration. - */ - config(configFn: Function): IModule; - /** - * Use this method to register work which needs to be performed on module loading. - * - * @param inlineAnnotatedFunction Execute this function on module load. Useful for service configuration. - */ - config(inlineAnnotatedFunction: any[]): IModule; - config(object: Object): IModule; - /** - * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator. - * - * @param name The name of the constant. - * @param value The constant value. - */ - constant(name: string, value: T): IModule; - constant(object: Object): IModule; - /** - * The $controller service is used by Angular to create new controllers. - * - * This provider allows controller registration via the register method. - * - * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors. - * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation). - */ - controller(name: string, controllerConstructor: Function): IModule; - /** - * The $controller service is used by Angular to create new controllers. - * - * This provider allows controller registration via the register method. - * - * @param name Controller name, or an object map of controllers where the keys are the names and the values are the constructors. - * @param controllerConstructor Controller constructor fn (optionally decorated with DI annotations in the array notation). - */ - controller(name: string, inlineAnnotatedConstructor: any[]): IModule; - controller(object: Object): IModule; - /** - * Register a new directive with the compiler. - * - * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind) - * @param directiveFactory An injectable directive factory function. - */ - directive(name: string, directiveFactory: IDirectiveFactory): IModule; - /** - * Register a new directive with the compiler. - * - * @param name Name of the directive in camel-case (i.e. ngBind which will match as ng-bind) - * @param directiveFactory An injectable directive factory function. - */ - directive(name: string, inlineAnnotatedFunction: any[]): IModule; - directive(object: Object): IModule; - /** - * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider. - * - * @param name The name of the instance. - * @param $getFn The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}). - */ - factory(name: string, $getFn: Function): IModule; - /** - * Register a service factory, which will be called to return the service instance. This is short for registering a service where its provider consists of only a $get property, which is the given service factory function. You should use $provide.factory(getFn) if you do not need to configure your service in a provider. - * - * @param name The name of the instance. - * @param inlineAnnotatedFunction The $getFn for the instance creation. Internally this is a short hand for $provide.provider(name, {$get: $getFn}). - */ - factory(name: string, inlineAnnotatedFunction: any[]): IModule; - factory(object: Object): IModule; - filter(name: string, filterFactoryFunction: Function): IModule; - filter(name: string, inlineAnnotatedFunction: any[]): IModule; - filter(object: Object): IModule; - provider(name: string, serviceProviderFactory: IServiceProviderFactory): IModule; - provider(name: string, serviceProviderConstructor: IServiceProviderClass): IModule; - provider(name: string, inlineAnnotatedConstructor: any[]): IModule; - provider(name: string, providerObject: IServiceProvider): IModule; - provider(object: Object): IModule; - /** - * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests. - */ - run(initializationFunction: Function): IModule; - /** - * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests. - */ - run(inlineAnnotatedFunction: any[]): IModule; - /** - * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function. - * - * @param name The name of the instance. - * @param serviceConstructor An injectable class (constructor function) that will be instantiated. - */ - service(name: string, serviceConstructor: Function): IModule; - /** - * Register a service constructor, which will be invoked with new to create the service instance. This is short for registering a service where its provider's $get property is a factory function that returns an instance instantiated by the injector from the service constructor function. - * - * @param name The name of the instance. - * @param inlineAnnotatedConstructor An injectable class (constructor function) that will be instantiated. - */ - service(name: string, inlineAnnotatedConstructor: any[]): IModule; - service(object: Object): IModule; - /** - * Register a value service with the $injector, such as a string, a number, an array, an object or a function. This is short for registering a service where its provider's $get property is a factory function that takes no arguments and returns the value service. - - Value services are similar to constant services, except that they cannot be injected into a module configuration function (see config) but they can be overridden by an Angular decorator. - * - * @param name The name of the instance. - * @param value The value. - */ - value(name: string, value: T): IModule; - value(object: Object): IModule; - - /** - * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service. - * @param name The name of the service to decorate - * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to. - */ - decorator(name:string, decoratorConstructor: Function): IModule; - decorator(name:string, inlineAnnotatedConstructor: any[]): IModule; - - // Properties - name: string; - requires: string[]; - } - - /////////////////////////////////////////////////////////////////////////// - // Attributes - // see http://docs.angularjs.org/api/ng.$compile.directive.Attributes - /////////////////////////////////////////////////////////////////////////// - interface IAttributes { - /** - * this is necessary to be able to access the scoped attributes. it's not very elegant - * because you have to use attrs['foo'] instead of attrs.foo but I don't know of a better way - * this should really be limited to return string but it creates this problem: http://stackoverflow.com/q/17201854/165656 - */ - [name: string]: any; - - /** - * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with x- or data-) to its normalized, camelCase form. - * - * Also there is special case for Moz prefix starting with upper case letter. - * - * For further information check out the guide on @see https://docs.angularjs.org/guide/directive#matching-directives - */ - $normalize(name: string): string; - - /** - * Adds the CSS class value specified by the classVal parameter to the - * element. If animations are enabled then an animation will be triggered - * for the class addition. - */ - $addClass(classVal: string): void; - - /** - * Removes the CSS class value specified by the classVal parameter from the - * element. If animations are enabled then an animation will be triggered for - * the class removal. - */ - $removeClass(classVal: string): void; - - /** - * Adds and removes the appropriate CSS class values to the element based on the difference between - * the new and old CSS class values (specified as newClasses and oldClasses). - */ - $updateClass(newClasses: string, oldClasses: string): void; - - /** - * Set DOM element attribute value. - */ - $set(key: string, value: any): void; - - /** - * Observes an interpolated attribute. - * The observer function will be invoked once during the next $digest - * following compilation. The observer is then invoked whenever the - * interpolated value changes. - */ - $observe(name: string, fn: (value?: T) => any): Function; - - /** - * A map of DOM element attribute names to the normalized name. This is needed - * to do reverse lookup from normalized name back to actual name. - */ - $attr: Object; - } - - /** - * form.FormController - type in module ng - * see https://docs.angularjs.org/api/ng/type/form.FormController - */ - interface IFormController { - - /** - * Indexer which should return ng.INgModelController for most properties but cannot because of "All named properties must be assignable to string indexer type" constraint - see https://github.com/Microsoft/TypeScript/issues/272 - */ - [name: string]: any; - - $pristine: boolean; - $dirty: boolean; - $valid: boolean; - $invalid: boolean; - $submitted: boolean; - $error: any; - $pending: any; - $addControl(control: INgModelController | IFormController): void; - $removeControl(control: INgModelController | IFormController): void; - $setValidity(validationErrorKey: string, isValid: boolean, control: INgModelController | IFormController): void; - $setDirty(): void; - $setPristine(): void; - $commitViewValue(): void; - $rollbackViewValue(): void; - $setSubmitted(): void; - $setUntouched(): void; - } - - /////////////////////////////////////////////////////////////////////////// - // NgModelController - // see http://docs.angularjs.org/api/ng.directive:ngModel.NgModelController - /////////////////////////////////////////////////////////////////////////// - interface INgModelController { - $render(): void; - $setValidity(validationErrorKey: string, isValid: boolean): void; - // Documentation states viewValue and modelValue to be a string but other - // types do work and it's common to use them. - $setViewValue(value: any, trigger?: string): void; - $setPristine(): void; - $setDirty(): void; - $validate(): void; - $setTouched(): void; - $setUntouched(): void; - $rollbackViewValue(): void; - $commitViewValue(): void; - $isEmpty(value: any): boolean; - - $viewValue: any; - - $modelValue: any; - - $parsers: IModelParser[]; - $formatters: IModelFormatter[]; - $viewChangeListeners: IModelViewChangeListener[]; - $error: any; - $name: string; - - $touched: boolean; - $untouched: boolean; - - $validators: IModelValidators; - $asyncValidators: IAsyncModelValidators; - - $pending: any; - $pristine: boolean; - $dirty: boolean; - $valid: boolean; - $invalid: boolean; - } - - //Allows tuning how model updates are done. - //https://docs.angularjs.org/api/ng/directive/ngModelOptions - interface INgModelOptions { - updateOn?: string; - debounce?: any; - allowInvalid?: boolean; - getterSetter?: boolean; - timezone?: string; - } - - interface IModelValidators { - /** - * viewValue is any because it can be an object that is called in the view like $viewValue.name:$viewValue.subName - */ - [index: string]: (modelValue: any, viewValue: any) => boolean; - } - - interface IAsyncModelValidators { - [index: string]: (modelValue: any, viewValue: any) => IPromise; - } - - interface IModelParser { - (value: any): any; - } - - interface IModelFormatter { - (value: any): any; - } - - interface IModelViewChangeListener { - (): void; - } - - /** - * $rootScope - $rootScopeProvider - service in module ng - * see https://docs.angularjs.org/api/ng/type/$rootScope.Scope and https://docs.angularjs.org/api/ng/service/$rootScope - */ - interface IRootScopeService { - [index: string]: any; - - $apply(): any; - $apply(exp: string): any; - $apply(exp: (scope: IScope) => any): any; - - $applyAsync(): any; - $applyAsync(exp: string): any; - $applyAsync(exp: (scope: IScope) => any): any; - - /** - * Dispatches an event name downwards to all child scopes (and their children) notifying the registered $rootScope.Scope listeners. - * - * The event life cycle starts at the scope on which $broadcast was called. All listeners listening for name event on this scope get notified. Afterwards, the event propagates to all direct and indirect scopes of the current scope and calls all registered listeners along the way. The event cannot be canceled. - * - * Any exception emitted from the listeners will be passed onto the $exceptionHandler service. - * - * @param name Event name to broadcast. - * @param args Optional one or more arguments which will be passed onto the event listeners. - */ - $broadcast(name: string, ...args: any[]): IAngularEvent; - $destroy(): void; - $digest(): void; - /** - * Dispatches an event name upwards through the scope hierarchy notifying the registered $rootScope.Scope listeners. - * - * The event life cycle starts at the scope on which $emit was called. All listeners listening for name event on this scope get notified. Afterwards, the event traverses upwards toward the root scope and calls all registered listeners along the way. The event will stop propagating if one of the listeners cancels it. - * - * Any exception emitted from the listeners will be passed onto the $exceptionHandler service. - * - * @param name Event name to emit. - * @param args Optional one or more arguments which will be passed onto the event listeners. - */ - $emit(name: string, ...args: any[]): IAngularEvent; - - $eval(): any; - $eval(expression: string, locals?: Object): any; - $eval(expression: (scope: IScope) => any, locals?: Object): any; - - $evalAsync(): void; - $evalAsync(expression: string): void; - $evalAsync(expression: (scope: IScope) => any): void; - - // Defaults to false by the implementation checking strategy - $new(isolate?: boolean, parent?: IScope): IScope; - - /** - * Listens on events of a given type. See $emit for discussion of event life cycle. - * - * The event listener function format is: function(event, args...). - * - * @param name Event name to listen on. - * @param listener Function to call when the event is emitted. - */ - $on(name: string, listener: (event: IAngularEvent, ...args: any[]) => any): () => void; - - $watch(watchExpression: string, listener?: string, objectEquality?: boolean): () => void; - $watch(watchExpression: string, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void; - $watch(watchExpression: (scope: IScope) => any, listener?: string, objectEquality?: boolean): () => void; - $watch(watchExpression: (scope: IScope) => T, listener?: (newValue: T, oldValue: T, scope: IScope) => any, objectEquality?: boolean): () => void; - - $watchCollection(watchExpression: string, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void; - $watchCollection(watchExpression: (scope: IScope) => T, listener: (newValue: T, oldValue: T, scope: IScope) => any): () => void; - - $watchGroup(watchExpressions: any[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void; - $watchGroup(watchExpressions: { (scope: IScope): any }[], listener: (newValue: any, oldValue: any, scope: IScope) => any): () => void; - - $parent: IScope; - $root: IRootScopeService; - $id: number; - - // Hidden members - $$isolateBindings: any; - $$phase: any; - } - - interface IScope extends IRootScopeService { } - - /** - * $scope for ngRepeat directive. - * see https://docs.angularjs.org/api/ng/directive/ngRepeat - */ - interface IRepeatScope extends IScope { - - /** - * iterator offset of the repeated element (0..length-1). - */ - $index: number; - - /** - * true if the repeated element is first in the iterator. - */ - $first: boolean; - - /** - * true if the repeated element is between the first and last in the iterator. - */ - $middle: boolean; - - /** - * true if the repeated element is last in the iterator. - */ - $last: boolean; - - /** - * true if the iterator position $index is even (otherwise false). - */ - $even: boolean; - - /** - * true if the iterator position $index is odd (otherwise false). - */ - $odd: boolean; - - } - - interface IAngularEvent { - /** - * the scope on which the event was $emit-ed or $broadcast-ed. - */ - targetScope: IScope; - /** - * the scope that is currently handling the event. Once the event propagates through the scope hierarchy, this property is set to null. - */ - currentScope: IScope; - /** - * name of the event. - */ - name: string; - /** - * calling stopPropagation function will cancel further event propagation (available only for events that were $emit-ed). - */ - stopPropagation?: Function; - /** - * calling preventDefault sets defaultPrevented flag to true. - */ - preventDefault: Function; - /** - * true if preventDefault was called. - */ - defaultPrevented: boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // WindowService - // see http://docs.angularjs.org/api/ng.$window - /////////////////////////////////////////////////////////////////////////// - interface IWindowService extends Window { - [key: string]: any; - } - - /////////////////////////////////////////////////////////////////////////// - // TimeoutService - // see http://docs.angularjs.org/api/ng.$timeout - /////////////////////////////////////////////////////////////////////////// - interface ITimeoutService { - (delay?: number, invokeApply?: boolean): IPromise; - (fn: (...args: any[]) => T, delay?: number, invokeApply?: boolean, ...args: any[]): IPromise; - cancel(promise?: IPromise): boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // IntervalService - // see http://docs.angularjs.org/api/ng.$interval - /////////////////////////////////////////////////////////////////////////// - interface IIntervalService { - (func: Function, delay: number, count?: number, invokeApply?: boolean, ...args: any[]): IPromise; - cancel(promise: IPromise): boolean; - } - - /** - * $filter - $filterProvider - service in module ng - * - * Filters are used for formatting data displayed to the user. - * - * see https://docs.angularjs.org/api/ng/service/$filter - */ - interface IFilterService { - (name: 'filter'): IFilterFilter; - (name: 'currency'): IFilterCurrency; - (name: 'number'): IFilterNumber; - (name: 'date'): IFilterDate; - (name: 'json'): IFilterJson; - (name: 'lowercase'): IFilterLowercase; - (name: 'uppercase'): IFilterUppercase; - (name: 'limitTo'): IFilterLimitTo; - (name: 'orderBy'): IFilterOrderBy; - /** - * Usage: - * $filter(name); - * - * @param name Name of the filter function to retrieve - */ - (name: string): T; - } - - interface IFilterFilter { - (array: T[], expression: string | IFilterFilterPatternObject | IFilterFilterPredicateFunc, comparator?: IFilterFilterComparatorFunc|boolean): T[]; - } - - interface IFilterFilterPatternObject { - [name: string]: any; - } - - interface IFilterFilterPredicateFunc { - (value: T, index: number, array: T[]): boolean; - } - - interface IFilterFilterComparatorFunc { - (actual: T, expected: T): boolean; - } - - interface IFilterCurrency { - /** - * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default symbol for current locale is used. - * @param amount Input to filter. - * @param symbol Currency symbol or identifier to be displayed. - * @param fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale - * @return Formatted number - */ - (amount: number, symbol?: string, fractionSize?: number): string; - } - - interface IFilterNumber { - /** - * Formats a number as text. - * @param number Number to format. - * @param fractionSize Number of decimal places to round the number to. If this is not provided then the fraction size is computed from the current locale's number formatting pattern. In the case of the default locale, it will be 3. - * @return Number rounded to decimalPlaces and places a “,” after each third digit. - */ - (value: number|string, fractionSize?: number|string): string; - } - - interface IFilterDate { - /** - * Formats date to a string based on the requested format. - * - * @param date Date to format either as Date object, milliseconds (string or number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is specified in the string input, the time is considered to be in the local timezone. - * @param format Formatting rules (see Description). If not specified, mediumDate is used. - * @param timezone Timezone to be used for formatting. It understands UTC/GMT and the continental US time zone abbreviations, but for general use, use a time zone offset, for example, '+0430' (4 hours, 30 minutes east of the Greenwich meridian) If not specified, the timezone of the browser will be used. - * @return Formatted string or the input if input is not recognized as date/millis. - */ - (date: Date | number | string, format?: string, timezone?: string): string; - } - - interface IFilterJson { - /** - * Allows you to convert a JavaScript object into JSON string. - * @param object Any JavaScript object (including arrays and primitive types) to filter. - * @param spacing The number of spaces to use per indentation, defaults to 2. - * @return JSON string. - */ - (object: any, spacing?: number): string; - } - - interface IFilterLowercase { - /** - * Converts string to lowercase. - */ - (value: string): string; - } - - interface IFilterUppercase { - /** - * Converts string to uppercase. - */ - (value: string): string; - } - - interface IFilterLimitTo { - /** - * Creates a new array containing only a specified number of elements. The elements are taken from either the beginning or the end of the source array, string or number, as specified by the value and sign (positive or negative) of limit. - * @param input Source array to be limited. - * @param limit The length of the returned array. If the limit number is positive, limit number of items from the beginning of the source array/string are copied. If the number is negative, limit number of items from the end of the source array are copied. The limit will be trimmed if it exceeds array.length. If limit is undefined, the input will be returned unchanged. - * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0. - * @return A new sub-array of length limit or less if input array had less than limit elements. - */ - (input: T[], limit: string|number, begin?: string|number): T[]; - /** - * Creates a new string containing only a specified number of elements. The elements are taken from either the beginning or the end of the source string or number, as specified by the value and sign (positive or negative) of limit. If a number is used as input, it is converted to a string. - * @param input Source string or number to be limited. - * @param limit The length of the returned string. If the limit number is positive, limit number of items from the beginning of the source string are copied. If the number is negative, limit number of items from the end of the source string are copied. The limit will be trimmed if it exceeds input.length. If limit is undefined, the input will be returned unchanged. - * @param begin Index at which to begin limitation. As a negative index, begin indicates an offset from the end of input. Defaults to 0. - * @return A new substring of length limit or less if input had less than limit elements. - */ - (input: string|number, limit: string|number, begin?: string|number): string; - } - - interface IFilterOrderBy { - /** - * Orders a specified array by the expression predicate. It is ordered alphabetically for strings and numerically for numbers. Note: if you notice numbers are not being sorted as expected, make sure they are actually being saved as numbers and not strings. - * @param array The array to sort. - * @param expression A predicate to be used by the comparator to determine the order of elements. - * @param reverse Reverse the order of the array. - * @return Reverse the order of the array. - */ - (array: T[], expression: string|((value: T) => any)|(((value: T) => any)|string)[], reverse?: boolean): T[]; - } - - /** - * $filterProvider - $filter - provider in module ng - * - * Filters are just functions which transform input to an output. However filters need to be Dependency Injected. To achieve this a filter definition consists of a factory function which is annotated with dependencies and is responsible for creating a filter function. - * - * see https://docs.angularjs.org/api/ng/provider/$filterProvider - */ - interface IFilterProvider extends IServiceProvider { - /** - * register(name); - * - * @param name Name of the filter function, or an object map of filters where the keys are the filter names and the values are the filter factories. Note: Filter names must be valid angular Expressions identifiers, such as uppercase or orderBy. Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace your filters, then you can use capitalization (myappSubsectionFilterx) or underscores (myapp_subsection_filterx). - */ - register(name: string | {}): IServiceProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // LocaleService - // see http://docs.angularjs.org/api/ng.$locale - /////////////////////////////////////////////////////////////////////////// - interface ILocaleService { - id: string; - - // These are not documented - // Check angular's i18n files for exemples - NUMBER_FORMATS: ILocaleNumberFormatDescriptor; - DATETIME_FORMATS: ILocaleDateTimeFormatDescriptor; - pluralCat: (num: any) => string; - } - - interface ILocaleNumberFormatDescriptor { - DECIMAL_SEP: string; - GROUP_SEP: string; - PATTERNS: ILocaleNumberPatternDescriptor[]; - CURRENCY_SYM: string; - } - - interface ILocaleNumberPatternDescriptor { - minInt: number; - minFrac: number; - maxFrac: number; - posPre: string; - posSuf: string; - negPre: string; - negSuf: string; - gSize: number; - lgSize: number; - } - - interface ILocaleDateTimeFormatDescriptor { - MONTH: string[]; - SHORTMONTH: string[]; - DAY: string[]; - SHORTDAY: string[]; - AMPMS: string[]; - medium: string; - short: string; - fullDate: string; - longDate: string; - mediumDate: string; - shortDate: string; - mediumTime: string; - shortTime: string; - } - - /////////////////////////////////////////////////////////////////////////// - // LogService - // see http://docs.angularjs.org/api/ng.$log - // see http://docs.angularjs.org/api/ng.$logProvider - /////////////////////////////////////////////////////////////////////////// - interface ILogService { - debug: ILogCall; - error: ILogCall; - info: ILogCall; - log: ILogCall; - warn: ILogCall; - } - - interface ILogProvider extends IServiceProvider { - debugEnabled(): boolean; - debugEnabled(enabled: boolean): ILogProvider; - } - - // We define this as separate interface so we can reopen it later for - // the ngMock module. - interface ILogCall { - (...args: any[]): void; - } - - /////////////////////////////////////////////////////////////////////////// - // ParseService - // see http://docs.angularjs.org/api/ng.$parse - // see http://docs.angularjs.org/api/ng.$parseProvider - /////////////////////////////////////////////////////////////////////////// - interface IParseService { - (expression: string): ICompiledExpression; - } - - interface IParseProvider { - logPromiseWarnings(): boolean; - logPromiseWarnings(value: boolean): IParseProvider; - - unwrapPromises(): boolean; - unwrapPromises(value: boolean): IParseProvider; - } - - interface ICompiledExpression { - (context: any, locals?: any): any; - - literal: boolean; - constant: boolean; - - // If value is not provided, undefined is gonna be used since the implementation - // does not check the parameter. Let's force a value for consistency. If consumer - // whants to undefine it, pass the undefined value explicitly. - assign(context: any, value: any): any; - } - - /** - * $location - $locationProvider - service in module ng - * see https://docs.angularjs.org/api/ng/service/$location - */ - interface ILocationService { - absUrl(): string; - hash(): string; - hash(newHash: string): ILocationService; - host(): string; - - /** - * Return path of current url - */ - path(): string; - - /** - * Change path when called with parameter and return $location. - * Note: Path should always begin with forward slash (/), this method will add the forward slash if it is missing. - * - * @param path New path - */ - path(path: string): ILocationService; - - port(): number; - protocol(): string; - replace(): ILocationService; - - /** - * Return search part (as object) of current url - */ - search(): any; - - /** - * Change search part when called with parameter and return $location. - * - * @param search When called with a single argument the method acts as a setter, setting the search component of $location to the specified value. - * - * If the argument is a hash object containing an array of values, these values will be encoded as duplicate search parameters in the url. - */ - search(search: any): ILocationService; - - /** - * Change search part when called with parameter and return $location. - * - * @param search New search params - * @param paramValue If search is a string or a Number, then paramValue will override only a single search property. If paramValue is null, the property specified via the first argument will be deleted. If paramValue is an array, it will override the property of the search component of $location specified via the first argument. If paramValue is true, the property specified via the first argument will be added with no value nor trailing equal sign. - */ - search(search: string, paramValue: string|number|string[]|boolean): ILocationService; - - state(): any; - state(state: any): ILocationService; - url(): string; - url(url: string): ILocationService; - } - - interface ILocationProvider extends IServiceProvider { - hashPrefix(): string; - hashPrefix(prefix: string): ILocationProvider; - html5Mode(): boolean; - - // Documentation states that parameter is string, but - // implementation tests it as boolean, which makes more sense - // since this is a toggler - html5Mode(active: boolean): ILocationProvider; - html5Mode(mode: { enabled?: boolean; requireBase?: boolean; rewriteLinks?: boolean; }): ILocationProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // DocumentService - // see http://docs.angularjs.org/api/ng.$document - /////////////////////////////////////////////////////////////////////////// - interface IDocumentService extends IAugmentedJQuery {} - - /////////////////////////////////////////////////////////////////////////// - // ExceptionHandlerService - // see http://docs.angularjs.org/api/ng.$exceptionHandler - /////////////////////////////////////////////////////////////////////////// - interface IExceptionHandlerService { - (exception: Error, cause?: string): void; - } - - /////////////////////////////////////////////////////////////////////////// - // RootElementService - // see http://docs.angularjs.org/api/ng.$rootElement - /////////////////////////////////////////////////////////////////////////// - interface IRootElementService extends JQuery {} - - interface IQResolveReject { - (): void; - (value: T): void; - } - /** - * $q - service in module ng - * A promise/deferred implementation inspired by Kris Kowal's Q. - * See http://docs.angularjs.org/api/ng/service/$q - */ - interface IQService { - new (resolver: (resolve: IQResolveReject) => any): IPromise; - new (resolver: (resolve: IQResolveReject, reject: IQResolveReject) => any): IPromise; - (resolver: (resolve: IQResolveReject) => any): IPromise; - (resolver: (resolve: IQResolveReject, reject: IQResolveReject) => any): IPromise; - - /** - * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved. - * - * Returns a single promise that will be resolved with an array of values, each value corresponding to the promise at the same index in the promises array. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value. - * - * @param promises An array of promises. - */ - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise, T8 | IPromise, T9 | IPromise, T10 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise, T8 | IPromise, T9 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise, T8 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7, T8]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise, T7 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6, T7]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise, T6 | IPromise]): IPromise<[T1, T2, T3, T4, T5, T6]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise , T5 | IPromise]): IPromise<[T1, T2, T3, T4, T5]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise, T4 | IPromise ]): IPromise<[T1, T2, T3, T4]>; - all(values: [T1 | IPromise, T2 | IPromise, T3 | IPromise]): IPromise<[T1, T2, T3]>; - all(values: [T1 | IPromise, T2 | IPromise]): IPromise<[T1, T2]>; - all(promises: IPromise[]): IPromise; - /** - * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved. - * - * Returns a single promise that will be resolved with a hash of values, each value corresponding to the promise at the same key in the promises hash. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value. - * - * @param promises A hash of promises. - */ - all(promises: { [id: string]: IPromise; }): IPromise<{ [id: string]: any; }>; - all(promises: { [id: string]: IPromise; }): IPromise; - /** - * Creates a Deferred object which represents a task which will finish in the future. - */ - defer(): IDeferred; - /** - * Creates a promise that is resolved as rejected with the specified reason. This api should be used to forward rejection in a chain of promises. If you are dealing with the last promise in a promise chain, you don't need to worry about it. - * - * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of reject as the throw keyword in JavaScript. This also means that if you "catch" an error via a promise error callback and you want to forward the error to the promise derived from the current promise, you have to "rethrow" the error by returning a rejection constructed via reject. - * - * @param reason Constant, message, exception or an object representing the rejection reason. - */ - reject(reason?: any): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - * - * @param value Value or a promise - */ - resolve(value: IPromise|T): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - */ - resolve(): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - * - * @param value Value or a promise - */ - when(value: IPromise|T): IPromise; - /** - * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted. - */ - when(): IPromise; - } - - interface IPromise { - /** - * Regardless of when the promise was or will be resolved or rejected, then calls one of the success or error callbacks asynchronously as soon as the result is available. The callbacks are called with a single argument: the result or rejection reason. Additionally, the notify callback may be called zero or more times to provide a progress indication, before the promise is resolved or rejected. - * The successCallBack may return IPromise for when a $q.reject() needs to be returned - * This method returns a new promise which is resolved or rejected via the return value of the successCallback, errorCallback. It also notifies via the return value of the notifyCallback method. The promise can not be resolved or rejected from the notifyCallback method. - */ - then(successCallback: (promiseValue: T) => IPromise|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise; - - /** - * Shorthand for promise.then(null, errorCallback) - */ - catch(onRejected: (reason: any) => IPromise|TResult): IPromise; - - /** - * Allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful to release resources or do some clean-up that needs to be done whether the promise was rejected or resolved. See the full specification for more information. - * - * Because finally is a reserved word in JavaScript and reserved keywords are not supported as property names by ES3, you'll need to invoke the method like promise['finally'](callback) to make your code IE8 and Android 2.x compatible. - */ - finally(finallyCallback: () => any): IPromise; - } - - interface IDeferred { - resolve(value?: T|IPromise): void; - reject(reason?: any): void; - notify(state?: any): void; - promise: IPromise; - } - - /////////////////////////////////////////////////////////////////////////// - // AnchorScrollService - // see http://docs.angularjs.org/api/ng.$anchorScroll - /////////////////////////////////////////////////////////////////////////// - interface IAnchorScrollService { - (): void; - (hash: string): void; - yOffset: any; - } - - interface IAnchorScrollProvider extends IServiceProvider { - disableAutoScrolling(): void; - } - - /** - * $cacheFactory - service in module ng - * - * Factory that constructs Cache objects and gives access to them. - * - * see https://docs.angularjs.org/api/ng/service/$cacheFactory - */ - interface ICacheFactoryService { - /** - * Factory that constructs Cache objects and gives access to them. - * - * @param cacheId Name or id of the newly created cache. - * @param optionsMap Options object that specifies the cache behavior. Properties: - * - * capacity — turns the cache into LRU cache. - */ - (cacheId: string, optionsMap?: { capacity?: number; }): ICacheObject; - - /** - * Get information about all the caches that have been created. - * @returns key-value map of cacheId to the result of calling cache#info - */ - info(): any; - - /** - * Get access to a cache object by the cacheId used when it was created. - * - * @param cacheId Name or id of a cache to access. - */ - get(cacheId: string): ICacheObject; - } - - /** - * $cacheFactory.Cache - type in module ng - * - * A cache object used to store and retrieve data, primarily used by $http and the script directive to cache templates and other data. - * - * see https://docs.angularjs.org/api/ng/type/$cacheFactory.Cache - */ - interface ICacheObject { - /** - * Retrieve information regarding a particular Cache. - */ - info(): { - /** - * the id of the cache instance - */ - id: string; - - /** - * the number of entries kept in the cache instance - */ - size: number; - - //...: any additional properties from the options object when creating the cache. - }; - - /** - * Inserts a named entry into the Cache object to be retrieved later, and incrementing the size of the cache if the key was not already present in the cache. If behaving like an LRU cache, it will also remove stale entries from the set. - * - * It will not insert undefined values into the cache. - * - * @param key the key under which the cached data is stored. - * @param value the value to store alongside the key. If it is undefined, the key will not be stored. - */ - put(key: string, value?: T): T; - - /** - * Retrieves named data stored in the Cache object. - * - * @param key the key of the data to be retrieved - */ - get(key: string): T; - - /** - * Removes an entry from the Cache object. - * - * @param key the key of the entry to be removed - */ - remove(key: string): void; - - /** - * Clears the cache object of any entries. - */ - removeAll(): void; - - /** - * Destroys the Cache object entirely, removing it from the $cacheFactory set. - */ - destroy(): void; - } - - /////////////////////////////////////////////////////////////////////////// - // CompileService - // see http://docs.angularjs.org/api/ng.$compile - // see http://docs.angularjs.org/api/ng.$compileProvider - /////////////////////////////////////////////////////////////////////////// - interface ICompileService { - (element: string, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction; - (element: Element, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction; - (element: JQuery, transclude?: ITranscludeFunction, maxPriority?: number): ITemplateLinkingFunction; - } - - interface ICompileProvider extends IServiceProvider { - directive(name: string, directiveFactory: Function): ICompileProvider; - directive(directivesMap: Object, directiveFactory: Function): ICompileProvider; - directive(name: string, inlineAnnotatedFunction: any[]): ICompileProvider; - directive(directivesMap: Object, inlineAnnotatedFunction: any[]): ICompileProvider; - - // Undocumented, but it is there... - directive(directivesMap: any): ICompileProvider; - - component(name: string, options: IComponentOptions): ICompileProvider; - - aHrefSanitizationWhitelist(): RegExp; - aHrefSanitizationWhitelist(regexp: RegExp): ICompileProvider; - - imgSrcSanitizationWhitelist(): RegExp; - imgSrcSanitizationWhitelist(regexp: RegExp): ICompileProvider; - - debugInfoEnabled(enabled?: boolean): any; - } - - interface ICloneAttachFunction { - // Let's hint but not force cloneAttachFn's signature - (clonedElement?: JQuery, scope?: IScope): any; - } - - // This corresponds to the "publicLinkFn" returned by $compile. - interface ITemplateLinkingFunction { - (scope: IScope, cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery; - } - - // This corresponds to $transclude (and also the transclude function passed to link). - interface ITranscludeFunction { - // If the scope is provided, then the cloneAttachFn must be as well. - (scope: IScope, cloneAttachFn: ICloneAttachFunction): IAugmentedJQuery; - // If one argument is provided, then it's assumed to be the cloneAttachFn. - (cloneAttachFn?: ICloneAttachFunction): IAugmentedJQuery; - } - - /////////////////////////////////////////////////////////////////////////// - // ControllerService - // see http://docs.angularjs.org/api/ng.$controller - // see http://docs.angularjs.org/api/ng.$controllerProvider - /////////////////////////////////////////////////////////////////////////// - interface IControllerService { - // Although the documentation doesn't state this, locals are optional - (controllerConstructor: new (...args: any[]) => T, locals?: any, later?: boolean, ident?: string): T; - (controllerConstructor: Function, locals?: any, later?: boolean, ident?: string): T; - (controllerName: string, locals?: any, later?: boolean, ident?: string): T; - } - - interface IControllerProvider extends IServiceProvider { - register(name: string, controllerConstructor: Function): void; - register(name: string, dependencyAnnotatedConstructor: any[]): void; - allowGlobals(): void; - } - - /** - * xhrFactory - * Replace or decorate this service to create your own custom XMLHttpRequest objects. - * see https://docs.angularjs.org/api/ng/service/$xhrFactory - */ - interface IXhrFactory { - (method: string, url: string): T; - } - - /** - * HttpService - * see http://docs.angularjs.org/api/ng/service/$http - */ - interface IHttpService { - /** - * Object describing the request to be made and how it should be processed. - */ - (config: IRequestConfig): IHttpPromise; - - /** - * Shortcut method to perform GET request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - get(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform DELETE request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - delete(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform HEAD request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - head(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform JSONP request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param config Optional configuration object - */ - jsonp(url: string, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform POST request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param data Request content - * @param config Optional configuration object - */ - post(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform PUT request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param data Request content - * @param config Optional configuration object - */ - put(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Shortcut method to perform PATCH request. - * - * @param url Relative or absolute URL specifying the destination of the request - * @param data Request content - * @param config Optional configuration object - */ - patch(url: string, data: any, config?: IRequestShortcutConfig): IHttpPromise; - - /** - * Runtime equivalent of the $httpProvider.defaults property. Allows configuration of default headers, withCredentials as well as request and response transformations. - */ - defaults: IHttpProviderDefaults; - - /** - * Array of config objects for currently pending requests. This is primarily meant to be used for debugging purposes. - */ - pendingRequests: IRequestConfig[]; - } - - /** - * Object describing the request to be made and how it should be processed. - * see http://docs.angularjs.org/api/ng/service/$http#usage - */ - interface IRequestShortcutConfig extends IHttpProviderDefaults { - /** - * {Object.} - * Map of strings or objects which will be turned to ?key1=value1&key2=value2 after the url. If the value is not a string, it will be JSONified. - */ - params?: any; - - /** - * {string|Object} - * Data to be sent as the request message data. - */ - data?: any; - - /** - * Timeout in milliseconds, or promise that should abort the request when resolved. - */ - timeout?: number|IPromise; - - /** - * See [XMLHttpRequest.responseType]https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype - */ - responseType?: string; - } - - /** - * Object describing the request to be made and how it should be processed. - * see http://docs.angularjs.org/api/ng/service/$http#usage - */ - interface IRequestConfig extends IRequestShortcutConfig { - /** - * HTTP method (e.g. 'GET', 'POST', etc) - */ - method: string; - /** - * Absolute or relative URL of the resource that is being requested. - */ - url: string; - } - - interface IHttpHeadersGetter { - (): { [name: string]: string; }; - (headerName: string): string; - } - - interface IHttpPromiseCallback { - (data: T, status: number, headers: IHttpHeadersGetter, config: IRequestConfig): void; - } - - interface IHttpPromiseCallbackArg { - data?: T; - status?: number; - headers?: IHttpHeadersGetter; - config?: IRequestConfig; - statusText?: string; - } - - interface IHttpPromise extends IPromise> { - /** - * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead. - * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error. - * @deprecated - */ - success?(callback: IHttpPromiseCallback): IHttpPromise; - /** - * The $http legacy promise methods success and error have been deprecated. Use the standard then method instead. - * If $httpProvider.useLegacyPromiseExtensions is set to false then these methods will throw $http/legacy error. - * @deprecated - */ - error?(callback: IHttpPromiseCallback): IHttpPromise; - } - - // See the jsdoc for transformData() at https://github.com/angular/angular.js/blob/master/src/ng/http.js#L228 - interface IHttpRequestTransformer { - (data: any, headersGetter: IHttpHeadersGetter): any; - } - - // The definition of fields are the same as IHttpPromiseCallbackArg - interface IHttpResponseTransformer { - (data: any, headersGetter: IHttpHeadersGetter, status: number): any; - } - - type HttpHeaderType = {[requestType: string]:string|((config:IRequestConfig) => string)}; - - interface IHttpRequestConfigHeaders { - [requestType: string]: any; - common?: any; - get?: any; - post?: any; - put?: any; - patch?: any; - } - - /** - * Object that controls the defaults for $http provider. Not all fields of IRequestShortcutConfig can be configured - * via defaults and the docs do not say which. The following is based on the inspection of the source code. - * https://docs.angularjs.org/api/ng/service/$http#defaults - * https://docs.angularjs.org/api/ng/service/$http#usage - * https://docs.angularjs.org/api/ng/provider/$httpProvider The properties section - */ - interface IHttpProviderDefaults { - /** - * {boolean|Cache} - * If true, a default $http cache will be used to cache the GET request, otherwise if a cache instance built with $cacheFactory, this cache will be used for caching. - */ - cache?: any; - - /** - * Transform function or an array of such functions. The transform function takes the http request body and - * headers and returns its transformed (typically serialized) version. - * @see {@link https://docs.angularjs.org/api/ng/service/$http#transforming-requests-and-responses} - */ - transformRequest?: IHttpRequestTransformer |IHttpRequestTransformer[]; - - /** - * Transform function or an array of such functions. The transform function takes the http response body and - * headers and returns its transformed (typically deserialized) version. - */ - transformResponse?: IHttpResponseTransformer | IHttpResponseTransformer[]; - - /** - * Map of strings or functions which return strings representing HTTP headers to send to the server. If the - * return value of a function is null, the header will not be sent. - * The key of the map is the request verb in lower case. The "common" key applies to all requests. - * @see {@link https://docs.angularjs.org/api/ng/service/$http#setting-http-headers} - */ - headers?: IHttpRequestConfigHeaders; - - /** Name of HTTP header to populate with the XSRF token. */ - xsrfHeaderName?: string; - - /** Name of cookie containing the XSRF token. */ - xsrfCookieName?: string; - - /** - * whether to to set the withCredentials flag on the XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5 for more information. - */ - withCredentials?: boolean; - - /** - * A function used to the prepare string representation of request parameters (specified as an object). If - * specified as string, it is interpreted as a function registered with the $injector. Defaults to - * $httpParamSerializer. - */ - paramSerializer?: string | ((obj: any) => string); - } - - interface IHttpInterceptor { - request?: (config: IRequestConfig) => IRequestConfig|IPromise; - requestError?: (rejection: any) => any; - response?: (response: IHttpPromiseCallbackArg) => IPromise>|IHttpPromiseCallbackArg; - responseError?: (rejection: any) => any; - } - - interface IHttpInterceptorFactory { - (...args: any[]): IHttpInterceptor; - } - - interface IHttpProvider extends IServiceProvider { - defaults: IHttpProviderDefaults; - - /** - * Register service factories (names or implementations) for interceptors which are called before and after - * each request. - */ - interceptors: (string|IHttpInterceptorFactory|(string|IHttpInterceptorFactory)[])[]; - useApplyAsync(): boolean; - useApplyAsync(value: boolean): IHttpProvider; - - /** - * - * @param {boolean=} value If true, `$http` will return a normal promise without the `success` and `error` methods. - * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining. - * otherwise, returns the current configured value. - */ - useLegacyPromiseExtensions(value:boolean) : boolean | IHttpProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // HttpBackendService - // see http://docs.angularjs.org/api/ng.$httpBackend - // You should never need to use this service directly. - /////////////////////////////////////////////////////////////////////////// - interface IHttpBackendService { - // XXX Perhaps define callback signature in the future - (method: string, url: string, post?: any, callback?: Function, headers?: any, timeout?: number, withCredentials?: boolean): void; - } - - /////////////////////////////////////////////////////////////////////////// - // InterpolateService - // see http://docs.angularjs.org/api/ng.$interpolate - // see http://docs.angularjs.org/api/ng.$interpolateProvider - /////////////////////////////////////////////////////////////////////////// - interface IInterpolateService { - (text: string, mustHaveExpression?: boolean, trustedContext?: string, allOrNothing?: boolean): IInterpolationFunction; - endSymbol(): string; - startSymbol(): string; - } - - interface IInterpolationFunction { - (context: any): string; - } - - interface IInterpolateProvider extends IServiceProvider { - startSymbol(): string; - startSymbol(value: string): IInterpolateProvider; - endSymbol(): string; - endSymbol(value: string): IInterpolateProvider; - } - - /////////////////////////////////////////////////////////////////////////// - // TemplateCacheService - // see http://docs.angularjs.org/api/ng.$templateCache - /////////////////////////////////////////////////////////////////////////// - interface ITemplateCacheService extends ICacheObject {} - - /////////////////////////////////////////////////////////////////////////// - // SCEService - // see http://docs.angularjs.org/api/ng.$sce - /////////////////////////////////////////////////////////////////////////// - interface ISCEService { - getTrusted(type: string, mayBeTrusted: any): any; - getTrustedCss(value: any): any; - getTrustedHtml(value: any): any; - getTrustedJs(value: any): any; - getTrustedResourceUrl(value: any): any; - getTrustedUrl(value: any): any; - parse(type: string, expression: string): (context: any, locals: any) => any; - parseAsCss(expression: string): (context: any, locals: any) => any; - parseAsHtml(expression: string): (context: any, locals: any) => any; - parseAsJs(expression: string): (context: any, locals: any) => any; - parseAsResourceUrl(expression: string): (context: any, locals: any) => any; - parseAsUrl(expression: string): (context: any, locals: any) => any; - trustAs(type: string, value: any): any; - trustAsHtml(value: any): any; - trustAsJs(value: any): any; - trustAsResourceUrl(value: any): any; - trustAsUrl(value: any): any; - isEnabled(): boolean; - } - - /////////////////////////////////////////////////////////////////////////// - // SCEProvider - // see http://docs.angularjs.org/api/ng.$sceProvider - /////////////////////////////////////////////////////////////////////////// - interface ISCEProvider extends IServiceProvider { - enabled(value: boolean): void; - } - - /////////////////////////////////////////////////////////////////////////// - // SCEDelegateService - // see http://docs.angularjs.org/api/ng.$sceDelegate - /////////////////////////////////////////////////////////////////////////// - interface ISCEDelegateService { - getTrusted(type: string, mayBeTrusted: any): any; - trustAs(type: string, value: any): any; - valueOf(value: any): any; - } - - - /////////////////////////////////////////////////////////////////////////// - // SCEDelegateProvider - // see http://docs.angularjs.org/api/ng.$sceDelegateProvider - /////////////////////////////////////////////////////////////////////////// - interface ISCEDelegateProvider extends IServiceProvider { - resourceUrlBlacklist(blacklist: any[]): void; - resourceUrlWhitelist(whitelist: any[]): void; - resourceUrlBlacklist(): any[]; - resourceUrlWhitelist(): any[]; - } - - /** - * $templateRequest service - * see http://docs.angularjs.org/api/ng/service/$templateRequest - */ - interface ITemplateRequestService { - /** - * Downloads a template using $http and, upon success, stores the - * contents inside of $templateCache. - * - * If the HTTP request fails or the response data of the HTTP request is - * empty then a $compile error will be thrown (unless - * {ignoreRequestError} is set to true). - * - * @param tpl The template URL. - * @param ignoreRequestError Whether or not to ignore the exception - * when the request fails or the template is - * empty. - * - * @return A promise whose value is the template content. - */ - (tpl: string, ignoreRequestError?: boolean): IPromise; - /** - * total amount of pending template requests being downloaded. - * @type {number} - */ - totalPendingRequests: number; - } - - /////////////////////////////////////////////////////////////////////////// - // Component - // see http://angularjs.blogspot.com.br/2015/11/angularjs-15-beta2-and-14-releases.html - // and http://toddmotto.com/exploring-the-angular-1-5-component-method/ - /////////////////////////////////////////////////////////////////////////// - /** - * Runtime representation a type that a Component or other object is instances of. - * - * An example of a `Type` is `MyCustomComponent` class, which in JavaScript is be represented by - * the `MyCustomComponent` constructor function. - */ - interface Type extends Function { - } - - /** - * `RouteDefinition` defines a route within a {@link RouteConfig} decorator. - * - * Supported keys: - * - `path` or `aux` (requires exactly one of these) - * - `component`, `loader`, `redirectTo` (requires exactly one of these) - * - `name` or `as` (optional) (requires exactly one of these) - * - `data` (optional) - * - * See also {@link Route}, {@link AsyncRoute}, {@link AuxRoute}, and {@link Redirect}. - */ - interface RouteDefinition { - path?: string; - aux?: string; - component?: Type | ComponentDefinition | string; - loader?: Function; - redirectTo?: any[]; - as?: string; - name?: string; - data?: any; - useAsDefault?: boolean; - } - - /** - * Represents either a component type (`type` is `component`) or a loader function - * (`type` is `loader`). - * - * See also {@link RouteDefinition}. - */ - interface ComponentDefinition { - type: string; - loader?: Function; - component?: Type; - } - - /** - * Component definition object (a simplified directive definition object) - */ - interface IComponentOptions { - /** - * Controller constructor function that should be associated with newly created scope or the name of a registered - * controller if passed as a string. Empty function by default. - * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) - */ - controller?: string | Function | (string | Function)[]; - /** - * An identifier name for a reference to the controller. If present, the controller will be published to scope under - * the controllerAs name. If not present, this will default to be the same as the component name. - * @default "$ctrl" - */ - controllerAs?: string; - /** - * html template as a string or a function that returns an html template as a string which should be used as the - * contents of this component. Empty string by default. - * If template is a function, then it is injected with the following locals: - * $element - Current element - * $attrs - Current attributes object for the element - * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) - */ - template?: string | Function | (string | Function)[]; - /** - * path or function that returns a path to an html template that should be used as the contents of this component. - * If templateUrl is a function, then it is injected with the following locals: - * $element - Current element - * $attrs - Current attributes object for the element - * Use the array form to define dependencies (necessary if strictDi is enabled and you require dependency injection) - */ - templateUrl?: string | Function | (string | Function)[]; - /** - * Define DOM attribute binding to component properties. Component properties are always bound to the component - * controller and not to the scope. - */ - bindings?: {[binding: string]: string}; - /** - * Whether transclusion is enabled. Enabled by default. - */ - transclude?: boolean | string | {[slot: string]: string}; - require?: string | string[] | {[controller: string]: string}; - } - - interface IComponentTemplateFn { - ( $element?: IAugmentedJQuery, $attrs?: IAttributes ): string; - } - - /////////////////////////////////////////////////////////////////////////// - // Directive - // see http://docs.angularjs.org/api/ng.$compileProvider#directive - // and http://docs.angularjs.org/guide/directive - /////////////////////////////////////////////////////////////////////////// - - interface IDirectiveFactory { - (...args: any[]): IDirective; - } - - interface IDirectiveLinkFn { - ( - scope: IScope, - instanceElement: IAugmentedJQuery, - instanceAttributes: IAttributes, - controller: {}, - transclude: ITranscludeFunction - ): void; - } - - interface IDirectivePrePost { - pre?: IDirectiveLinkFn; - post?: IDirectiveLinkFn; - } - - interface IDirectiveCompileFn { - ( - templateElement: IAugmentedJQuery, - templateAttributes: IAttributes, - /** - * @deprecated - * Note: The transclude function that is passed to the compile function is deprecated, - * as it e.g. does not know about the right outer scope. Please use the transclude function - * that is passed to the link function instead. - */ - transclude: ITranscludeFunction - ): IDirectivePrePost; - } - - interface IDirective { - compile?: IDirectiveCompileFn; - controller?: any; - controllerAs?: string; - /** - * @deprecated - * Deprecation warning: although bindings for non-ES6 class controllers are currently bound to this before - * the controller constructor is called, this use is now deprecated. Please place initialization code that - * relies upon bindings inside a $onInit method on the controller, instead. - */ - bindToController?: boolean | Object; - link?: IDirectiveLinkFn | IDirectivePrePost; - multiElement?: boolean; - name?: string; - priority?: number; - /** - * @deprecated - */ - replace?: boolean; - require?: string | string[] | {[controller: string]: string}; - restrict?: string; - scope?: boolean | Object; - template?: string | Function; - templateNamespace?: string; - templateUrl?: string | Function; - terminal?: boolean; - transclude?: boolean | string | {[slot: string]: string}; - } - - /** - * angular.element - * when calling angular.element, angular returns a jQuery object, - * augmented with additional methods like e.g. scope. - * see: http://docs.angularjs.org/api/angular.element - */ - interface IAugmentedJQueryStatic extends JQueryStatic { - (selector: string, context?: any): IAugmentedJQuery; - (element: Element): IAugmentedJQuery; - (object: {}): IAugmentedJQuery; - (elementArray: Element[]): IAugmentedJQuery; - (object: JQuery): IAugmentedJQuery; - (func: Function): IAugmentedJQuery; - (array: any[]): IAugmentedJQuery; - (): IAugmentedJQuery; - } - - interface IAugmentedJQuery extends JQuery { - // TODO: events, how to define? - //$destroy - - find(selector: string): IAugmentedJQuery; - find(element: any): IAugmentedJQuery; - find(obj: JQuery): IAugmentedJQuery; - controller(): any; - controller(name: string): any; - injector(): any; - scope(): IScope; - - /** - * Overload for custom scope interfaces - */ - scope(): T; - isolateScope(): IScope; - - inheritedData(key: string, value: any): JQuery; - inheritedData(obj: { [key: string]: any; }): JQuery; - inheritedData(key?: string): any; - } - - /////////////////////////////////////////////////////////////////////////// - // AUTO module (angular.js) - /////////////////////////////////////////////////////////////////////////// - export module auto { - - /////////////////////////////////////////////////////////////////////// - // InjectorService - // see http://docs.angularjs.org/api/AUTO.$injector - /////////////////////////////////////////////////////////////////////// - interface IInjectorService { - annotate(fn: Function, strictDi?: boolean): string[]; - annotate(inlineAnnotatedFunction: any[]): string[]; - get(name: string, caller?: string): T; - get(name: '$anchorScroll'): IAnchorScrollService - get(name: '$cacheFactory'): ICacheFactoryService - get(name: '$compile'): ICompileService - get(name: '$controller'): IControllerService - get(name: '$document'): IDocumentService - get(name: '$exceptionHandler'): IExceptionHandlerService - get(name: '$filter'): IFilterService - get(name: '$http'): IHttpService - get(name: '$httpBackend'): IHttpBackendService - get(name: '$httpParamSerializer'): IHttpParamSerializer - get(name: '$httpParamSerializerJQLike'): IHttpParamSerializer - get(name: '$interpolate'): IInterpolateService - get(name: '$interval'): IIntervalService - get(name: '$locale'): ILocaleService - get(name: '$location'): ILocationService - get(name: '$log'): ILogService - get(name: '$parse'): IParseService - get(name: '$q'): IQService - get(name: '$rootElement'): IRootElementService - get(name: '$rootScope'): IRootScopeService - get(name: '$sce'): ISCEService - get(name: '$sceDelegate'): ISCEDelegateService - get(name: '$templateCache'): ITemplateCacheService - get(name: '$templateRequest'): ITemplateRequestService - get(name: '$timeout'): ITimeoutService - get(name: '$window'): IWindowService - get(name: '$xhrFactory'): IXhrFactory - has(name: string): boolean; - instantiate(typeConstructor: Function, locals?: any): T; - invoke(inlineAnnotatedFunction: any[]): any; - invoke(func: Function, context?: any, locals?: any): any; - strictDi: boolean; - } - - /////////////////////////////////////////////////////////////////////// - // ProvideService - // see http://docs.angularjs.org/api/AUTO.$provide - /////////////////////////////////////////////////////////////////////// - interface IProvideService { - // Documentation says it returns the registered instance, but actual - // implementation does not return anything. - // constant(name: string, value: any): any; - /** - * Register a constant service, such as a string, a number, an array, an object or a function, with the $injector. Unlike value it can be injected into a module configuration function (see config) and it cannot be overridden by an Angular decorator. - * - * @param name The name of the constant. - * @param value The constant value. - */ - constant(name: string, value: any): void; - - /** - * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service. - * - * @param name The name of the service to decorate. - * @param decorator This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: - * - * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to. - */ - decorator(name: string, decorator: Function): void; - /** - * Register a service decorator with the $injector. A service decorator intercepts the creation of a service, allowing it to override or modify the behaviour of the service. The object returned by the decorator may be the original service, or a new service object which replaces or wraps and delegates to the original service. - * - * @param name The name of the service to decorate. - * @param inlineAnnotatedFunction This function will be invoked when the service needs to be instantiated and should return the decorated service instance. The function is called using the injector.invoke method and is therefore fully injectable. Local injection arguments: - * - * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to. - */ - decorator(name: string, inlineAnnotatedFunction: any[]): void; - factory(name: string, serviceFactoryFunction: Function): IServiceProvider; - factory(name: string, inlineAnnotatedFunction: any[]): IServiceProvider; - provider(name: string, provider: IServiceProvider): IServiceProvider; - provider(name: string, serviceProviderConstructor: Function): IServiceProvider; - service(name: string, constructor: Function): IServiceProvider; - service(name: string, inlineAnnotatedFunction: any[]): IServiceProvider; - value(name: string, value: any): IServiceProvider; - } - - } - - /** - * $http params serializer that converts objects to strings - * see https://docs.angularjs.org/api/ng/service/$httpParamSerializer - */ - interface IHttpParamSerializer { - (obj: Object): string; - } -} \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/typings.json b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/typings.json deleted file mode 100644 index c974311fa7..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/angular/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/b76dd8a7f95b71696982befbb7589940d27e940b/angularjs/angular.d.ts", - "raw": "registry:dt/angular#1.5.0+20160517064839", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/b76dd8a7f95b71696982befbb7589940d27e940b/angularjs/angular.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/index.d.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/index.d.ts deleted file mode 100644 index b4208b3b82..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/index.d.ts +++ /dev/null @@ -1,3199 +0,0 @@ -// Generated by typings -// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/4cdfbe96b666eec5e1defbb519a62abf04e96764/jquery/jquery.d.ts -interface JQueryAjaxSettings { - /** - * The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. - */ - accepts?: any; - /** - * By default, all requests are sent asynchronously (i.e. this is set to true by default). If you need synchronous requests, set this option to false. Cross-domain requests and dataType: "jsonp" requests do not support synchronous operation. Note that synchronous requests may temporarily lock the browser, disabling any actions while the request is active. As of jQuery 1.8, the use of async: false with jqXHR ($.Deferred) is deprecated; you must use the success/error/complete callback options instead of the corresponding methods of the jqXHR object such as jqXHR.done() or the deprecated jqXHR.success(). - */ - async?: boolean; - /** - * A pre-request callback function that can be used to modify the jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object before it is sent. Use this to set custom headers, etc. The jqXHR and settings objects are passed as arguments. This is an Ajax Event. Returning false in the beforeSend function will cancel the request. As of jQuery 1.5, the beforeSend option will be called regardless of the type of request. - */ - beforeSend? (jqXHR: JQueryXHR, settings: JQueryAjaxSettings): any; - /** - * If set to false, it will force requested pages not to be cached by the browser. Note: Setting cache to false will only work correctly with HEAD and GET requests. It works by appending "_={timestamp}" to the GET parameters. The parameter is not needed for other types of requests, except in IE8 when a POST is made to a URL that has already been requested by a GET. - */ - cache?: boolean; - /** - * A function to be called when the request finishes (after success and error callbacks are executed). The function gets passed two arguments: The jqXHR (in jQuery 1.4.x, XMLHTTPRequest) object and a string categorizing the status of the request ("success", "notmodified", "error", "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event. - */ - complete? (jqXHR: JQueryXHR, textStatus: string): any; - /** - * An object of string/regular-expression pairs that determine how jQuery will parse the response, given its content type. (version added: 1.5) - */ - contents?: { [key: string]: any; }; - //According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false" - // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742 - /** - * When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding. - */ - contentType?: any; - /** - * This object will be made the context of all Ajax-related callbacks. By default, the context is an object that represents the ajax settings used in the call ($.ajaxSettings merged with the settings passed to $.ajax). - */ - context?: any; - /** - * An object containing dataType-to-dataType converters. Each converter's value is a function that returns the transformed value of the response. (version added: 1.5) - */ - converters?: { [key: string]: any; }; - /** - * If you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true. This allows, for example, server-side redirection to another domain. (version added: 1.5) - */ - crossDomain?: boolean; - /** - * Data to be sent to the server. It is converted to a query string, if not already a string. It's appended to the url for GET-requests. See processData option to prevent this automatic processing. Object must be Key/Value pairs. If value is an Array, jQuery serializes multiple values with same key based on the value of the traditional setting (described below). - */ - data?: any; - /** - * A function to be used to handle the raw response data of XMLHttpRequest.This is a pre-filtering function to sanitize the response. You should return the sanitized data. The function accepts two arguments: The raw data returned from the server and the 'dataType' parameter. - */ - dataFilter? (data: any, ty: any): any; - /** - * The type of data that you're expecting back from the server. If none is specified, jQuery will try to infer it based on the MIME type of the response (an XML MIME type will yield XML, in 1.4 JSON will yield a JavaScript object, in 1.4 script will execute the script, and anything else will be returned as a string). - */ - dataType?: string; - /** - * A function to be called if the request fails. The function receives three arguments: The jqXHR (in jQuery 1.4.x, XMLHttpRequest) object, a string describing the type of error that occurred and an optional exception object, if one occurred. Possible values for the second argument (besides null) are "timeout", "error", "abort", and "parsererror". When an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, such as "Not Found" or "Internal Server Error." As of jQuery 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note: This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event. - */ - error? (jqXHR: JQueryXHR, textStatus: string, errorThrown: string): any; - /** - * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to control various Ajax Events. - */ - global?: boolean; - /** - * An object of additional header key/value pairs to send along with requests using the XMLHttpRequest transport. The header X-Requested-With: XMLHttpRequest is always added, but its default XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from within the beforeSend function. (version added: 1.5) - */ - headers?: { [key: string]: any; }; - /** - * Allow the request to be successful only if the response has changed since the last request. This is done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery 1.4 this technique also checks the 'etag' specified by the server to catch unmodified data. - */ - ifModified?: boolean; - /** - * Allow the current environment to be recognized as "local," (e.g. the filesystem), even if jQuery does not recognize it as such by default. The following protocols are currently recognized as local: file, *-extension, and widget. If the isLocal setting needs modification, it is recommended to do so once in the $.ajaxSetup() method. (version added: 1.5.1) - */ - isLocal?: boolean; - /** - * Override the callback function name in a jsonp request. This value will be used instead of 'callback' in the 'callback=?' part of the query string in the url. So {jsonp:'onJSONPLoad'} would result in 'onJSONPLoad=?' passed to the server. As of jQuery 1.5, setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation. In this case, you should also explicitly set the jsonpCallback setting. For example, { jsonp: false, jsonpCallback: "callbackName" } - */ - jsonp?: any; - /** - * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function. - */ - jsonpCallback?: any; - /** - * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0) - */ - method?: string; - /** - * A mime type to override the XHR mime type. (version added: 1.5.1) - */ - mimeType?: string; - /** - * A password to be used with XMLHttpRequest in response to an HTTP access authentication request. - */ - password?: string; - /** - * By default, data passed in to the data option as an object (technically, anything other than a string) will be processed and transformed into a query string, fitting to the default content-type "application/x-www-form-urlencoded". If you want to send a DOMDocument, or other non-processed data, set this option to false. - */ - processData?: boolean; - /** - * Only applies when the "script" transport is used (e.g., cross-domain requests with "jsonp" or "script" dataType and "GET" type). Sets the charset attribute on the script tag used in the request. Used when the character set on the local page is not the same as the one on the remote script. - */ - scriptCharset?: string; - /** - * An object of numeric HTTP codes and functions to be called when the response has the corresponding code. f the request is successful, the status code functions take the same parameters as the success callback; if it results in an error (including 3xx redirect), they take the same parameters as the error callback. (version added: 1.5) - */ - statusCode?: { [key: string]: any; }; - /** - * A function to be called if the request succeeds. The function gets passed three arguments: The data returned from the server, formatted according to the dataType parameter; a string describing the status; and the jqXHR (in jQuery 1.4.x, XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each function will be called in turn. This is an Ajax Event. - */ - success? (data: any, textStatus: string, jqXHR: JQueryXHR): any; - /** - * Set a timeout (in milliseconds) for the request. This will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the $.ajax call is made; if several other requests are in progress and the browser has no connections available, it is possible for a request to time out before it can be sent. In jQuery 1.4.x and below, the XMLHttpRequest object will be in an invalid state if the request times out; accessing any object members may throw an exception. In Firefox 3.0+ only, script and JSONP requests cannot be cancelled by a timeout; the script will run even if it arrives after the timeout period. - */ - timeout?: number; - /** - * Set this to true if you wish to use the traditional style of param serialization. - */ - traditional?: boolean; - /** - * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers. - */ - type?: string; - /** - * A string containing the URL to which the request is sent. - */ - url?: string; - /** - * A username to be used with XMLHttpRequest in response to an HTTP access authentication request. - */ - username?: string; - /** - * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE), the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or enhancements to the factory. - */ - xhr?: any; - /** - * An object of fieldName-fieldValue pairs to set on the native XHR object. For example, you can use it to set withCredentials to true for cross-domain requests if needed. In jQuery 1.5, the withCredentials property was not propagated to the native XHR and thus CORS requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+ should you require the use of it. (version added: 1.5.1) - */ - xhrFields?: { [key: string]: any; }; -} - -/** - * Interface for the jqXHR object - */ -interface JQueryXHR extends XMLHttpRequest, JQueryPromise { - /** - * The .overrideMimeType() method may be used in the beforeSend() callback function, for example, to modify the response content-type header. As of jQuery 1.5.1, the jqXHR object also contains the overrideMimeType() method (it was available in jQuery 1.4.x, as well, but was temporarily removed in jQuery 1.5). - */ - overrideMimeType(mimeType: string): any; - /** - * Cancel the request. - * - * @param statusText A string passed as the textStatus parameter for the done callback. Default value: "canceled" - */ - abort(statusText?: string): void; - /** - * Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details. - */ - then(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise; - /** - * Property containing the parsed response if the response Content-Type is json - */ - responseJSON?: any; - /** - * A function to be called if the request fails. - */ - error(xhr: JQueryXHR, textStatus: string, errorThrown: string): void; -} - -/** - * Interface for the JQuery callback - */ -interface JQueryCallback { - /** - * Add a callback or a collection of callbacks to a callback list. - * - * @param callbacks A function, or array of functions, that are to be added to the callback list. - */ - add(callbacks: Function): JQueryCallback; - /** - * Add a callback or a collection of callbacks to a callback list. - * - * @param callbacks A function, or array of functions, that are to be added to the callback list. - */ - add(callbacks: Function[]): JQueryCallback; - - /** - * Disable a callback list from doing anything more. - */ - disable(): JQueryCallback; - - /** - * Determine if the callbacks list has been disabled. - */ - disabled(): boolean; - - /** - * Remove all of the callbacks from a list. - */ - empty(): JQueryCallback; - - /** - * Call all of the callbacks with the given arguments - * - * @param arguments The argument or list of arguments to pass back to the callback list. - */ - fire(...arguments: any[]): JQueryCallback; - - /** - * Determine if the callbacks have already been called at least once. - */ - fired(): boolean; - - /** - * Call all callbacks in a list with the given context and arguments. - * - * @param context A reference to the context in which the callbacks in the list should be fired. - * @param arguments An argument, or array of arguments, to pass to the callbacks in the list. - */ - fireWith(context?: any, args?: any[]): JQueryCallback; - - /** - * Determine whether a supplied callback is in a list - * - * @param callback The callback to search for. - */ - has(callback: Function): boolean; - - /** - * Lock a callback list in its current state. - */ - lock(): JQueryCallback; - - /** - * Determine if the callbacks list has been locked. - */ - locked(): boolean; - - /** - * Remove a callback or a collection of callbacks from a callback list. - * - * @param callbacks A function, or array of functions, that are to be removed from the callback list. - */ - remove(callbacks: Function): JQueryCallback; - /** - * Remove a callback or a collection of callbacks from a callback list. - * - * @param callbacks A function, or array of functions, that are to be removed from the callback list. - */ - remove(callbacks: Function[]): JQueryCallback; -} - -/** - * Allows jQuery Promises to interop with non-jQuery promises - */ -interface JQueryGenericPromise { - /** - * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress. - * - * @param doneFilter A function that is called when the Deferred is resolved. - * @param failFilter An optional function that is called when the Deferred is rejected. - */ - then(doneFilter: (value?: T, ...values: any[]) => U|JQueryPromise, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise; - - /** - * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress. - * - * @param doneFilter A function that is called when the Deferred is resolved. - * @param failFilter An optional function that is called when the Deferred is rejected. - */ - then(doneFilter: (value?: T, ...values: any[]) => void, failFilter?: (...reasons: any[]) => any, progressFilter?: (...progression: any[]) => any): JQueryPromise; -} - -/** - * Interface for the JQuery promise/deferred callbacks - */ -interface JQueryPromiseCallback { - (value?: T, ...args: any[]): void; -} - -interface JQueryPromiseOperator { - (callback1: JQueryPromiseCallback|JQueryPromiseCallback[], ...callbacksN: Array|JQueryPromiseCallback[]>): JQueryPromise; -} - -/** - * Interface for the JQuery promise, part of callbacks - */ -interface JQueryPromise extends JQueryGenericPromise { - /** - * Determine the current state of a Deferred object. - */ - state(): string; - /** - * Add handlers to be called when the Deferred object is either resolved or rejected. - * - * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected. - * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected. - */ - always(alwaysCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...alwaysCallbacksN: Array|JQueryPromiseCallback[]>): JQueryPromise; - /** - * Add handlers to be called when the Deferred object is resolved. - * - * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved. - * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved. - */ - done(doneCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...doneCallbackN: Array|JQueryPromiseCallback[]>): JQueryPromise; - /** - * Add handlers to be called when the Deferred object is rejected. - * - * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected. - * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected. - */ - fail(failCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...failCallbacksN: Array|JQueryPromiseCallback[]>): JQueryPromise; - /** - * Add handlers to be called when the Deferred object generates progress notifications. - * - * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications. - */ - progress(progressCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...progressCallbackN: Array|JQueryPromiseCallback[]>): JQueryPromise; - - // Deprecated - given no typings - pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise; -} - -/** - * Interface for the JQuery deferred, part of callbacks - */ -interface JQueryDeferred extends JQueryGenericPromise { - /** - * Determine the current state of a Deferred object. - */ - state(): string; - /** - * Add handlers to be called when the Deferred object is either resolved or rejected. - * - * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected. - * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected. - */ - always(alwaysCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...alwaysCallbacksN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - /** - * Add handlers to be called when the Deferred object is resolved. - * - * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved. - * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved. - */ - done(doneCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...doneCallbackN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - /** - * Add handlers to be called when the Deferred object is rejected. - * - * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected. - * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected. - */ - fail(failCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...failCallbacksN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - /** - * Add handlers to be called when the Deferred object generates progress notifications. - * - * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications. - */ - progress(progressCallback1?: JQueryPromiseCallback|JQueryPromiseCallback[], ...progressCallbackN: Array|JQueryPromiseCallback[]>): JQueryDeferred; - - /** - * Call the progressCallbacks on a Deferred object with the given args. - * - * @param args Optional arguments that are passed to the progressCallbacks. - */ - notify(value?: any, ...args: any[]): JQueryDeferred; - - /** - * Call the progressCallbacks on a Deferred object with the given context and args. - * - * @param context Context passed to the progressCallbacks as the this object. - * @param args Optional arguments that are passed to the progressCallbacks. - */ - notifyWith(context: any, value?: any[]): JQueryDeferred; - - /** - * Reject a Deferred object and call any failCallbacks with the given args. - * - * @param args Optional arguments that are passed to the failCallbacks. - */ - reject(value?: any, ...args: any[]): JQueryDeferred; - /** - * Reject a Deferred object and call any failCallbacks with the given context and args. - * - * @param context Context passed to the failCallbacks as the this object. - * @param args An optional array of arguments that are passed to the failCallbacks. - */ - rejectWith(context: any, value?: any[]): JQueryDeferred; - - /** - * Resolve a Deferred object and call any doneCallbacks with the given args. - * - * @param value First argument passed to doneCallbacks. - * @param args Optional subsequent arguments that are passed to the doneCallbacks. - */ - resolve(value?: T, ...args: any[]): JQueryDeferred; - - /** - * Resolve a Deferred object and call any doneCallbacks with the given context and args. - * - * @param context Context passed to the doneCallbacks as the this object. - * @param args An optional array of arguments that are passed to the doneCallbacks. - */ - resolveWith(context: any, value?: T[]): JQueryDeferred; - - /** - * Return a Deferred's Promise object. - * - * @param target Object onto which the promise methods have to be attached - */ - promise(target?: any): JQueryPromise; - - // Deprecated - given no typings - pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise; -} - -/** - * Interface of the JQuery extension of the W3C event object - */ -interface BaseJQueryEventObject extends Event { - data: any; - delegateTarget: Element; - isDefaultPrevented(): boolean; - isImmediatePropagationStopped(): boolean; - isPropagationStopped(): boolean; - namespace: string; - originalEvent: Event; - preventDefault(): any; - relatedTarget: Element; - result: any; - stopImmediatePropagation(): void; - stopPropagation(): void; - target: Element; - pageX: number; - pageY: number; - which: number; - metaKey: boolean; -} - -interface JQueryInputEventObject extends BaseJQueryEventObject { - altKey: boolean; - ctrlKey: boolean; - metaKey: boolean; - shiftKey: boolean; -} - -interface JQueryMouseEventObject extends JQueryInputEventObject { - button: number; - clientX: number; - clientY: number; - offsetX: number; - offsetY: number; - pageX: number; - pageY: number; - screenX: number; - screenY: number; -} - -interface JQueryKeyEventObject extends JQueryInputEventObject { - char: any; - charCode: number; - key: any; - keyCode: number; -} - -interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject{ -} - -/* - Collection of properties of the current browser -*/ - -interface JQuerySupport { - ajax?: boolean; - boxModel?: boolean; - changeBubbles?: boolean; - checkClone?: boolean; - checkOn?: boolean; - cors?: boolean; - cssFloat?: boolean; - hrefNormalized?: boolean; - htmlSerialize?: boolean; - leadingWhitespace?: boolean; - noCloneChecked?: boolean; - noCloneEvent?: boolean; - opacity?: boolean; - optDisabled?: boolean; - optSelected?: boolean; - scriptEval? (): boolean; - style?: boolean; - submitBubbles?: boolean; - tbody?: boolean; -} - -interface JQueryParam { - /** - * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - * - * @param obj An array or object to serialize. - */ - (obj: any): string; - - /** - * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - * - * @param obj An array or object to serialize. - * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization. - */ - (obj: any, traditional: boolean): string; -} - -/** - * The interface used to construct jQuery events (with $.Event). It is - * defined separately instead of inline in JQueryStatic to allow - * overriding the construction function with specific strings - * returning specific event objects. - */ -interface JQueryEventConstructor { - (name: string, eventProperties?: any): JQueryEventObject; - new (name: string, eventProperties?: any): JQueryEventObject; -} - -/** - * The interface used to specify coordinates. - */ -interface JQueryCoordinates { - left: number; - top: number; -} - -/** - * Elements in the array returned by serializeArray() - */ -interface JQuerySerializeArrayElement { - name: string; - value: string; -} - -interface JQueryAnimationOptions { - /** - * A string or number determining how long the animation will run. - */ - duration?: any; - /** - * A string indicating which easing function to use for the transition. - */ - easing?: string; - /** - * A function to call once the animation is complete. - */ - complete?: Function; - /** - * A function to be called for each animated property of each animated element. This function provides an opportunity to modify the Tween object to change the value of the property before it is set. - */ - step?: (now: number, tween: any) => any; - /** - * A function to be called after each step of the animation, only once per animated element regardless of the number of animated properties. (version added: 1.8) - */ - progress?: (animation: JQueryPromise, progress: number, remainingMs: number) => any; - /** - * A function to call when the animation begins. (version added: 1.8) - */ - start?: (animation: JQueryPromise) => any; - /** - * A function to be called when the animation completes (its Promise object is resolved). (version added: 1.8) - */ - done?: (animation: JQueryPromise, jumpedToEnd: boolean) => any; - /** - * A function to be called when the animation fails to complete (its Promise object is rejected). (version added: 1.8) - */ - fail?: (animation: JQueryPromise, jumpedToEnd: boolean) => any; - /** - * A function to be called when the animation completes or stops without completing (its Promise object is either resolved or rejected). (version added: 1.8) - */ - always?: (animation: JQueryPromise, jumpedToEnd: boolean) => any; - /** - * A Boolean indicating whether to place the animation in the effects queue. If false, the animation will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case the animation is added to the queue represented by that string. When a custom queue name is used the animation does not automatically start; you must call .dequeue("queuename") to start it. - */ - queue?: any; - /** - * A map of one or more of the CSS properties defined by the properties argument and their corresponding easing functions. (version added: 1.4) - */ - specialEasing?: Object; -} - -interface JQueryEasingFunction { - ( percent: number ): number; -} - -interface JQueryEasingFunctions { - [ name: string ]: JQueryEasingFunction; - linear: JQueryEasingFunction; - swing: JQueryEasingFunction; -} - -/** - * Static members of jQuery (those on $ and jQuery themselves) - */ -interface JQueryStatic { - - /** - * Perform an asynchronous HTTP (Ajax) request. - * - * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup(). - */ - ajax(settings: JQueryAjaxSettings): JQueryXHR; - /** - * Perform an asynchronous HTTP (Ajax) request. - * - * @param url A string containing the URL to which the request is sent. - * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup(). - */ - ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR; - - /** - * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax(). - * - * @param dataTypes An optional string containing one or more space-separated dataTypes - * @param handler A handler to set default values for future Ajax requests. - */ - ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void; - /** - * Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax(). - * - * @param handler A handler to set default values for future Ajax requests. - */ - ajaxPrefilter(handler: (opts: any, originalOpts: JQueryAjaxSettings, jqXHR: JQueryXHR) => any): void; - - ajaxSettings: JQueryAjaxSettings; - - /** - * Set default values for future Ajax requests. Its use is not recommended. - * - * @param options A set of key/value pairs that configure the default Ajax request. All options are optional. - */ - ajaxSetup(options: JQueryAjaxSettings): void; - - /** - * Load data from the server using a HTTP GET request. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html). - */ - get(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP GET request. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param success A callback function that is executed if the request succeeds. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html). - */ - get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP GET request. - * - * @param settings The JQueryAjaxSettings to be used for the request - */ - get(settings : JQueryAjaxSettings): JQueryXHR; - /** - * Load JSON-encoded data from the server using a GET HTTP request. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. - */ - getJSON(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR; - /** - * Load JSON-encoded data from the server using a GET HTTP request. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param success A callback function that is executed if the request succeeds. - */ - getJSON(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR; - /** - * Load a JavaScript file from the server using a GET HTTP request, then execute it. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. - */ - getScript(url: string, success?: (script: string, textStatus: string, jqXHR: JQueryXHR) => any): JQueryXHR; - - /** - * Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - */ - param: JQueryParam; - - /** - * Load data from the server using a HTTP POST request. - * - * @param url A string containing the URL to which the request is sent. - * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html). - */ - post(url: string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP POST request. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but can be null in that case. - * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html). - */ - post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR; - /** - * Load data from the server using a HTTP POST request. - * - * @param settings The JQueryAjaxSettings to be used for the request - */ - post(settings : JQueryAjaxSettings): JQueryXHR; - /** - * A multi-purpose callbacks list object that provides a powerful way to manage callback lists. - * - * @param flags An optional list of space-separated flags that change how the callback list behaves. - */ - Callbacks(flags?: string): JQueryCallback; - - /** - * Holds or releases the execution of jQuery's ready event. - * - * @param hold Indicates whether the ready hold is being requested or released - */ - holdReady(hold: boolean): void; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param selector A string containing a selector expression - * @param context A DOM Element, Document, or jQuery to use as context - */ - (selector: string, context?: Element|JQuery): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param element A DOM element to wrap in a jQuery object. - */ - (element: Element): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object. - */ - (elementArray: Element[]): JQuery; - - /** - * Binds a function to be executed when the DOM has finished loading. - * - * @param callback A function to execute after the DOM is ready. - */ - (callback: (jQueryAlias?: JQueryStatic) => any): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param object A plain object to wrap in a jQuery object. - */ - (object: {}): JQuery; - - /** - * Accepts a string containing a CSS selector which is then used to match a set of elements. - * - * @param object An existing jQuery object to clone. - */ - (object: JQuery): JQuery; - - /** - * Specify a function to execute when the DOM is fully loaded. - */ - (): JQuery; - - /** - * Creates DOM elements on the fly from the provided string of raw HTML. - * - * @param html A string of HTML to create on the fly. Note that this parses HTML, not XML. - * @param ownerDocument A document in which the new elements will be created. - */ - (html: string, ownerDocument?: Document): JQuery; - - /** - * Creates DOM elements on the fly from the provided string of raw HTML. - * - * @param html A string defining a single, standalone, HTML element (e.g.
      or
      ). - * @param attributes An object of attributes, events, and methods to call on the newly-created element. - */ - (html: string, attributes: Object): JQuery; - - /** - * Relinquish jQuery's control of the $ variable. - * - * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself). - */ - noConflict(removeAll?: boolean): JQueryStatic; - - /** - * Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events. - * - * @param deferreds One or more Deferred objects, or plain JavaScript objects. - */ - when(...deferreds: Array/* as JQueryDeferred */>): JQueryPromise; - - /** - * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties. - */ - cssHooks: { [key: string]: any; }; - cssNumber: any; - - /** - * Store arbitrary data associated with the specified element. Returns the value that was set. - * - * @param element The DOM element to associate with the data. - * @param key A string naming the piece of data to set. - * @param value The new data value. - */ - data(element: Element, key: string, value: T): T; - /** - * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element. - * - * @param element The DOM element to associate with the data. - * @param key A string naming the piece of data to set. - */ - data(element: Element, key: string): any; - /** - * Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element. - * - * @param element The DOM element to associate with the data. - */ - data(element: Element): any; - - /** - * Execute the next function on the queue for the matched element. - * - * @param element A DOM element from which to remove and execute a queued function. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - dequeue(element: Element, queueName?: string): void; - - /** - * Determine whether an element has any jQuery data associated with it. - * - * @param element A DOM element to be checked for data. - */ - hasData(element: Element): boolean; - - /** - * Show the queue of functions to be executed on the matched element. - * - * @param element A DOM element to inspect for an attached queue. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - queue(element: Element, queueName?: string): any[]; - /** - * Manipulate the queue of functions to be executed on the matched element. - * - * @param element A DOM element where the array of queued functions is attached. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param newQueue An array of functions to replace the current queue contents. - */ - queue(element: Element, queueName: string, newQueue: Function[]): JQuery; - /** - * Manipulate the queue of functions to be executed on the matched element. - * - * @param element A DOM element on which to add a queued function. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param callback The new function to add to the queue. - */ - queue(element: Element, queueName: string, callback: Function): JQuery; - - /** - * Remove a previously-stored piece of data. - * - * @param element A DOM element from which to remove data. - * @param name A string naming the piece of data to remove. - */ - removeData(element: Element, name?: string): JQuery; - - /** - * A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function. - * - * @param beforeStart A function that is called just before the constructor returns. - */ - Deferred(beforeStart?: (deferred: JQueryDeferred) => any): JQueryDeferred; - - /** - * Effects - */ - - easing: JQueryEasingFunctions; - - fx: { - tick: () => void; - /** - * The rate (in milliseconds) at which animations fire. - */ - interval: number; - stop: () => void; - speeds: { slow: number; fast: number; }; - /** - * Globally disable all animations. - */ - off: boolean; - step: any; - }; - - /** - * Takes a function and returns a new one that will always have a particular context. - * - * @param fnction The function whose context will be changed. - * @param context The object to which the context (this) of the function should be set. - * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument. - */ - proxy(fnction: (...args: any[]) => any, context: Object, ...additionalArguments: any[]): any; - /** - * Takes a function and returns a new one that will always have a particular context. - * - * @param context The object to which the context (this) of the function should be set. - * @param name The name of the function whose context will be changed (should be a property of the context object). - * @param additionalArguments Any number of arguments to be passed to the function named in the name argument. - */ - proxy(context: Object, name: string, ...additionalArguments: any[]): any; - - Event: JQueryEventConstructor; - - /** - * Takes a string and throws an exception containing it. - * - * @param message The message to send out. - */ - error(message: any): JQuery; - - expr: any; - fn: any; //TODO: Decide how we want to type this - - isReady: boolean; - - // Properties - support: JQuerySupport; - - /** - * Check to see if a DOM element is a descendant of another DOM element. - * - * @param container The DOM element that may contain the other element. - * @param contained The DOM element that may be contained by (a descendant of) the other element. - */ - contains(container: Element, contained: Element): boolean; - - /** - * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties. - * - * @param collection The object or array to iterate over. - * @param callback The function that will be executed on every object. - */ - each( - collection: T[], - callback: (indexInArray: number, valueOfElement: T) => any - ): any; - - /** - * A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties. - * - * @param collection The object or array to iterate over. - * @param callback The function that will be executed on every object. - */ - each( - collection: any, - callback: (indexInArray: any, valueOfElement: any) => any - ): any; - - /** - * Merge the contents of two or more objects together into the first object. - * - * @param target An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument. - * @param object1 An object containing additional properties to merge in. - * @param objectN Additional objects containing properties to merge in. - */ - extend(target: any, object1?: any, ...objectN: any[]): any; - /** - * Merge the contents of two or more objects together into the first object. - * - * @param deep If true, the merge becomes recursive (aka. deep copy). - * @param target The object to extend. It will receive the new properties. - * @param object1 An object containing additional properties to merge in. - * @param objectN Additional objects containing properties to merge in. - */ - extend(deep: boolean, target: any, object1?: any, ...objectN: any[]): any; - - /** - * Execute some JavaScript code globally. - * - * @param code The JavaScript code to execute. - */ - globalEval(code: string): any; - - /** - * Finds the elements of an array which satisfy a filter function. The original array is not affected. - * - * @param array The array to search through. - * @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value. this will be the global window object. - * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false. - */ - grep(array: T[], func: (elementOfArray: T, indexInArray: number) => boolean, invert?: boolean): T[]; - - /** - * Search for a specified value within an array and return its index (or -1 if not found). - * - * @param value The value to search for. - * @param array An array through which to search. - * @param fromIndex he index of the array at which to begin the search. The default is 0, which will search the whole array. - */ - inArray(value: T, array: T[], fromIndex?: number): number; - - /** - * Determine whether the argument is an array. - * - * @param obj Object to test whether or not it is an array. - */ - isArray(obj: any): boolean; - /** - * Check to see if an object is empty (contains no enumerable properties). - * - * @param obj The object that will be checked to see if it's empty. - */ - isEmptyObject(obj: any): boolean; - /** - * Determine if the argument passed is a Javascript function object. - * - * @param obj Object to test whether or not it is a function. - */ - isFunction(obj: any): boolean; - /** - * Determines whether its argument is a number. - * - * @param obj The value to be tested. - */ - isNumeric(value: any): boolean; - /** - * Check to see if an object is a plain object (created using "{}" or "new Object"). - * - * @param obj The object that will be checked to see if it's a plain object. - */ - isPlainObject(obj: any): boolean; - /** - * Determine whether the argument is a window. - * - * @param obj Object to test whether or not it is a window. - */ - isWindow(obj: any): boolean; - /** - * Check to see if a DOM node is within an XML document (or is an XML document). - * - * @param node he DOM node that will be checked to see if it's in an XML document. - */ - isXMLDoc(node: Node): boolean; - - /** - * Convert an array-like object into a true JavaScript array. - * - * @param obj Any object to turn into a native Array. - */ - makeArray(obj: any): any[]; - - /** - * Translate all items in an array or object to new array of items. - * - * @param array The Array to translate. - * @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object. - */ - map(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[]; - /** - * Translate all items in an array or object to new array of items. - * - * @param arrayOrObject The Array or Object to translate. - * @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object. - */ - map(arrayOrObject: any, callback: (value: any, indexOrKey: any) => any): any; - - /** - * Merge the contents of two arrays together into the first array. - * - * @param first The first array to merge, the elements of second added. - * @param second The second array to merge into the first, unaltered. - */ - merge(first: T[], second: T[]): T[]; - - /** - * An empty function. - */ - noop(): any; - - /** - * Return a number representing the current time. - */ - now(): number; - - /** - * Takes a well-formed JSON string and returns the resulting JavaScript object. - * - * @param json The JSON string to parse. - */ - parseJSON(json: string): any; - - /** - * Parses a string into an XML document. - * - * @param data a well-formed XML string to be parsed - */ - parseXML(data: string): XMLDocument; - - /** - * Remove the whitespace from the beginning and end of a string. - * - * @param str Remove the whitespace from the beginning and end of a string. - */ - trim(str: string): string; - - /** - * Determine the internal JavaScript [[Class]] of an object. - * - * @param obj Object to get the internal JavaScript [[Class]] of. - */ - type(obj: any): string; - - /** - * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers. - * - * @param array The Array of DOM elements. - */ - unique(array: Element[]): Element[]; - - /** - * Parses a string into an array of DOM nodes. - * - * @param data HTML string to be parsed - * @param context DOM element to serve as the context in which the HTML fragment will be created - * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string - */ - parseHTML(data: string, context?: HTMLElement, keepScripts?: boolean): any[]; - - /** - * Parses a string into an array of DOM nodes. - * - * @param data HTML string to be parsed - * @param context DOM element to serve as the context in which the HTML fragment will be created - * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string - */ - parseHTML(data: string, context?: Document, keepScripts?: boolean): any[]; -} - -/** - * The jQuery instance members - */ -interface JQuery { - /** - * Register a handler to be called when Ajax requests complete. This is an AjaxEvent. - * - * @param handler The function to be invoked. - */ - ajaxComplete(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: any) => any): JQuery; - /** - * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxError(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxSettings: JQueryAjaxSettings, thrownError: any) => any): JQuery; - /** - * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxSend(handler: (event: JQueryEventObject, jqXHR: JQueryXHR, ajaxOptions: JQueryAjaxSettings) => any): JQuery; - /** - * Register a handler to be called when the first Ajax request begins. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxStart(handler: () => any): JQuery; - /** - * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxStop(handler: () => any): JQuery; - /** - * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event. - * - * @param handler The function to be invoked. - */ - ajaxSuccess(handler: (event: JQueryEventObject, XMLHttpRequest: XMLHttpRequest, ajaxOptions: JQueryAjaxSettings) => any): JQuery; - - /** - * Load data from the server and place the returned HTML into the matched element. - * - * @param url A string containing the URL to which the request is sent. - * @param data A plain object or string that is sent to the server with the request. - * @param complete A callback function that is executed when the request completes. - */ - load(url: string, data?: string|Object, complete?: (responseText: string, textStatus: string, XMLHttpRequest: XMLHttpRequest) => any): JQuery; - - /** - * Encode a set of form elements as a string for submission. - */ - serialize(): string; - /** - * Encode a set of form elements as an array of names and values. - */ - serializeArray(): JQuerySerializeArrayElement[]; - - /** - * Adds the specified class(es) to each of the set of matched elements. - * - * @param className One or more space-separated classes to be added to the class attribute of each matched element. - */ - addClass(className: string): JQuery; - /** - * Adds the specified class(es) to each of the set of matched elements. - * - * @param function A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set. - */ - addClass(func: (index: number, className: string) => string): JQuery; - - /** - * Add the previous set of elements on the stack to the current set, optionally filtered by a selector. - */ - addBack(selector?: string): JQuery; - - /** - * Get the value of an attribute for the first element in the set of matched elements. - * - * @param attributeName The name of the attribute to get. - */ - attr(attributeName: string): string; - /** - * Set one or more attributes for the set of matched elements. - * - * @param attributeName The name of the attribute to set. - * @param value A value to set for the attribute. - */ - attr(attributeName: string, value: string|number): JQuery; - /** - * Set one or more attributes for the set of matched elements. - * - * @param attributeName The name of the attribute to set. - * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments. - */ - attr(attributeName: string, func: (index: number, attr: string) => string|number): JQuery; - /** - * Set one or more attributes for the set of matched elements. - * - * @param attributes An object of attribute-value pairs to set. - */ - attr(attributes: Object): JQuery; - - /** - * Determine whether any of the matched elements are assigned the given class. - * - * @param className The class name to search for. - */ - hasClass(className: string): boolean; - - /** - * Get the HTML contents of the first element in the set of matched elements. - */ - html(): string; - /** - * Set the HTML contents of each element in the set of matched elements. - * - * @param htmlString A string of HTML to set as the content of each matched element. - */ - html(htmlString: string): JQuery; - /** - * Set the HTML contents of each element in the set of matched elements. - * - * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set. - */ - html(func: (index: number, oldhtml: string) => string): JQuery; - /** - * Set the HTML contents of each element in the set of matched elements. - * - * @param func A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set. - */ - - /** - * Get the value of a property for the first element in the set of matched elements. - * - * @param propertyName The name of the property to get. - */ - prop(propertyName: string): any; - /** - * Set one or more properties for the set of matched elements. - * - * @param propertyName The name of the property to set. - * @param value A value to set for the property. - */ - prop(propertyName: string, value: string|number|boolean): JQuery; - /** - * Set one or more properties for the set of matched elements. - * - * @param properties An object of property-value pairs to set. - */ - prop(properties: Object): JQuery; - /** - * Set one or more properties for the set of matched elements. - * - * @param propertyName The name of the property to set. - * @param func A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element. - */ - prop(propertyName: string, func: (index: number, oldPropertyValue: any) => any): JQuery; - - /** - * Remove an attribute from each element in the set of matched elements. - * - * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes. - */ - removeAttr(attributeName: string): JQuery; - - /** - * Remove a single class, multiple classes, or all classes from each element in the set of matched elements. - * - * @param className One or more space-separated classes to be removed from the class attribute of each matched element. - */ - removeClass(className?: string): JQuery; - /** - * Remove a single class, multiple classes, or all classes from each element in the set of matched elements. - * - * @param function A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments. - */ - removeClass(func: (index: number, className: string) => string): JQuery; - - /** - * Remove a property for the set of matched elements. - * - * @param propertyName The name of the property to remove. - */ - removeProp(propertyName: string): JQuery; - - /** - * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - * - * @param className One or more class names (separated by spaces) to be toggled for each element in the matched set. - * @param swtch A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed. - */ - toggleClass(className: string, swtch?: boolean): JQuery; - /** - * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - * - * @param swtch A boolean value to determine whether the class should be added or removed. - */ - toggleClass(swtch?: boolean): JQuery; - /** - * Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - * - * @param func A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments. - * @param swtch A boolean value to determine whether the class should be added or removed. - */ - toggleClass(func: (index: number, className: string, swtch: boolean) => string, swtch?: boolean): JQuery; - - /** - * Get the current value of the first element in the set of matched elements. - */ - val(): any; - /** - * Set the value of each element in the set of matched elements. - * - * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked. - */ - val(value: string|string[]|number): JQuery; - /** - * Set the value of each element in the set of matched elements. - * - * @param func A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments. - */ - val(func: (index: number, value: string) => string): JQuery; - - - /** - * Get the value of style properties for the first element in the set of matched elements. - * - * @param propertyName A CSS property. - */ - css(propertyName: string): string; - /** - * Set one or more CSS properties for the set of matched elements. - * - * @param propertyName A CSS property name. - * @param value A value to set for the property. - */ - css(propertyName: string, value: string|number): JQuery; - /** - * Set one or more CSS properties for the set of matched elements. - * - * @param propertyName A CSS property name. - * @param value A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments. - */ - css(propertyName: string, value: (index: number, value: string) => string|number): JQuery; - /** - * Set one or more CSS properties for the set of matched elements. - * - * @param properties An object of property-value pairs to set. - */ - css(properties: Object): JQuery; - - /** - * Get the current computed height for the first element in the set of matched elements. - */ - height(): number; - /** - * Set the CSS height of every matched element. - * - * @param value An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string). - */ - height(value: number|string): JQuery; - /** - * Set the CSS height of every matched element. - * - * @param func A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set. - */ - height(func: (index: number, height: number) => number|string): JQuery; - - /** - * Get the current computed height for the first element in the set of matched elements, including padding but not border. - */ - innerHeight(): number; - - /** - * Sets the inner height on elements in the set of matched elements, including padding but not border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - innerHeight(height: number|string): JQuery; - - /** - * Get the current computed width for the first element in the set of matched elements, including padding but not border. - */ - innerWidth(): number; - - /** - * Sets the inner width on elements in the set of matched elements, including padding but not border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - innerWidth(width: number|string): JQuery; - - /** - * Get the current coordinates of the first element in the set of matched elements, relative to the document. - */ - offset(): JQueryCoordinates; - /** - * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements. - * - * @param coordinates An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements. - */ - offset(coordinates: JQueryCoordinates): JQuery; - /** - * An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements. - * - * @param func A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties. - */ - offset(func: (index: number, coords: JQueryCoordinates) => JQueryCoordinates): JQuery; - - /** - * Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements. - * - * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation. - */ - outerHeight(includeMargin?: boolean): number; - - /** - * Sets the outer height on elements in the set of matched elements, including padding and border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - outerHeight(height: number|string): JQuery; - - /** - * Get the current computed width for the first element in the set of matched elements, including padding and border. - * - * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation. - */ - outerWidth(includeMargin?: boolean): number; - - /** - * Sets the outer width on elements in the set of matched elements, including padding and border. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - outerWidth(width: number|string): JQuery; - - /** - * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent. - */ - position(): JQueryCoordinates; - - /** - * Get the current horizontal position of the scroll bar for the first element in the set of matched elements or set the horizontal position of the scroll bar for every matched element. - */ - scrollLeft(): number; - /** - * Set the current horizontal position of the scroll bar for each of the set of matched elements. - * - * @param value An integer indicating the new position to set the scroll bar to. - */ - scrollLeft(value: number): JQuery; - - /** - * Get the current vertical position of the scroll bar for the first element in the set of matched elements or set the vertical position of the scroll bar for every matched element. - */ - scrollTop(): number; - /** - * Set the current vertical position of the scroll bar for each of the set of matched elements. - * - * @param value An integer indicating the new position to set the scroll bar to. - */ - scrollTop(value: number): JQuery; - - /** - * Get the current computed width for the first element in the set of matched elements. - */ - width(): number; - /** - * Set the CSS width of each element in the set of matched elements. - * - * @param value An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - */ - width(value: number|string): JQuery; - /** - * Set the CSS width of each element in the set of matched elements. - * - * @param func A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set. - */ - width(func: (index: number, width: number) => number|string): JQuery; - - /** - * Remove from the queue all items that have not yet been run. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - clearQueue(queueName?: string): JQuery; - - /** - * Store arbitrary data associated with the matched elements. - * - * @param key A string naming the piece of data to set. - * @param value The new data value; it can be any Javascript type including Array or Object. - */ - data(key: string, value: any): JQuery; - /** - * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute. - * - * @param key Name of the data stored. - */ - data(key: string): any; - /** - * Store arbitrary data associated with the matched elements. - * - * @param obj An object of key-value pairs of data to update. - */ - data(obj: { [key: string]: any; }): JQuery; - /** - * Return the value at the named data store for the first element in the jQuery collection, as set by data(name, value) or by an HTML5 data-* attribute. - */ - data(): any; - - /** - * Execute the next function on the queue for the matched elements. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - dequeue(queueName?: string): JQuery; - - /** - * Remove a previously-stored piece of data. - * - * @param name A string naming the piece of data to delete or space-separated string naming the pieces of data to delete. - */ - removeData(name: string): JQuery; - /** - * Remove a previously-stored piece of data. - * - * @param list An array of strings naming the pieces of data to delete. - */ - removeData(list: string[]): JQuery; - /** - * Remove all previously-stored piece of data. - */ - removeData(): JQuery; - - /** - * Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished. - * - * @param type The type of queue that needs to be observed. (default: fx) - * @param target Object onto which the promise methods have to be attached - */ - promise(type?: string, target?: Object): JQueryPromise; - - /** - * Perform a custom animation of a set of CSS properties. - * - * @param properties An object of CSS properties and values that the animation will move toward. - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - animate(properties: Object, duration?: string|number, complete?: Function): JQuery; - /** - * Perform a custom animation of a set of CSS properties. - * - * @param properties An object of CSS properties and values that the animation will move toward. - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. (default: swing) - * @param complete A function to call once the animation is complete. - */ - animate(properties: Object, duration?: string|number, easing?: string, complete?: Function): JQuery; - /** - * Perform a custom animation of a set of CSS properties. - * - * @param properties An object of CSS properties and values that the animation will move toward. - * @param options A map of additional options to pass to the method. - */ - animate(properties: Object, options: JQueryAnimationOptions): JQuery; - - /** - * Set a timer to delay execution of subsequent items in the queue. - * - * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue. - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - delay(duration: number, queueName?: string): JQuery; - - /** - * Display the matched elements by fading them to opaque. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - fadeIn(duration?: number|string, complete?: Function): JQuery; - /** - * Display the matched elements by fading them to opaque. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeIn(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display the matched elements by fading them to opaque. - * - * @param options A map of additional options to pass to the method. - */ - fadeIn(options: JQueryAnimationOptions): JQuery; - - /** - * Hide the matched elements by fading them to transparent. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - fadeOut(duration?: number|string, complete?: Function): JQuery; - /** - * Hide the matched elements by fading them to transparent. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeOut(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Hide the matched elements by fading them to transparent. - * - * @param options A map of additional options to pass to the method. - */ - fadeOut(options: JQueryAnimationOptions): JQuery; - - /** - * Adjust the opacity of the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param opacity A number between 0 and 1 denoting the target opacity. - * @param complete A function to call once the animation is complete. - */ - fadeTo(duration: string|number, opacity: number, complete?: Function): JQuery; - /** - * Adjust the opacity of the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param opacity A number between 0 and 1 denoting the target opacity. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeTo(duration: string|number, opacity: number, easing?: string, complete?: Function): JQuery; - - /** - * Display or hide the matched elements by animating their opacity. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - fadeToggle(duration?: number|string, complete?: Function): JQuery; - /** - * Display or hide the matched elements by animating their opacity. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - fadeToggle(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display or hide the matched elements by animating their opacity. - * - * @param options A map of additional options to pass to the method. - */ - fadeToggle(options: JQueryAnimationOptions): JQuery; - - /** - * Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements. - * - * @param queue The name of the queue in which to stop animations. - */ - finish(queue?: string): JQuery; - - /** - * Hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - hide(duration?: number|string, complete?: Function): JQuery; - /** - * Hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - hide(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Hide the matched elements. - * - * @param options A map of additional options to pass to the method. - */ - hide(options: JQueryAnimationOptions): JQuery; - - /** - * Display the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - show(duration?: number|string, complete?: Function): JQuery; - /** - * Display the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - show(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display the matched elements. - * - * @param options A map of additional options to pass to the method. - */ - show(options: JQueryAnimationOptions): JQuery; - - /** - * Display the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - slideDown(duration?: number|string, complete?: Function): JQuery; - /** - * Display the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - slideDown(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display the matched elements with a sliding motion. - * - * @param options A map of additional options to pass to the method. - */ - slideDown(options: JQueryAnimationOptions): JQuery; - - /** - * Display or hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - slideToggle(duration?: number|string, complete?: Function): JQuery; - /** - * Display or hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - slideToggle(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display or hide the matched elements with a sliding motion. - * - * @param options A map of additional options to pass to the method. - */ - slideToggle(options: JQueryAnimationOptions): JQuery; - - /** - * Hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - slideUp(duration?: number|string, complete?: Function): JQuery; - /** - * Hide the matched elements with a sliding motion. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - slideUp(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Hide the matched elements with a sliding motion. - * - * @param options A map of additional options to pass to the method. - */ - slideUp(options: JQueryAnimationOptions): JQuery; - - /** - * Stop the currently-running animation on the matched elements. - * - * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false. - * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false. - */ - stop(clearQueue?: boolean, jumpToEnd?: boolean): JQuery; - /** - * Stop the currently-running animation on the matched elements. - * - * @param queue The name of the queue in which to stop animations. - * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false. - * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false. - */ - stop(queue?: string, clearQueue?: boolean, jumpToEnd?: boolean): JQuery; - - /** - * Display or hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param complete A function to call once the animation is complete. - */ - toggle(duration?: number|string, complete?: Function): JQuery; - /** - * Display or hide the matched elements. - * - * @param duration A string or number determining how long the animation will run. - * @param easing A string indicating which easing function to use for the transition. - * @param complete A function to call once the animation is complete. - */ - toggle(duration?: number|string, easing?: string, complete?: Function): JQuery; - /** - * Display or hide the matched elements. - * - * @param options A map of additional options to pass to the method. - */ - toggle(options: JQueryAnimationOptions): JQuery; - /** - * Display or hide the matched elements. - * - * @param showOrHide A Boolean indicating whether to show or hide the elements. - */ - toggle(showOrHide: boolean): JQuery; - - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - bind(eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param handler A function to execute each time the event is triggered. - */ - bind(eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param eventData An object containing data that will be passed to the event handler. - * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true. - */ - bind(eventType: string, eventData: any, preventBubble: boolean): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - * @param preventBubble Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true. - */ - bind(eventType: string, preventBubble: boolean): JQuery; - /** - * Attach a handler to an event for the elements. - * - * @param events An object containing one or more DOM event types and functions to execute for them. - */ - bind(events: any): JQuery; - - /** - * Trigger the "blur" event on an element - */ - blur(): JQuery; - /** - * Bind an event handler to the "blur" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - blur(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "blur" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "change" event on an element. - */ - change(): JQuery; - /** - * Bind an event handler to the "change" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - change(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "change" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "click" event on an element. - */ - click(): JQuery; - /** - * Bind an event handler to the "click" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - */ - click(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "click" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "dblclick" event on an element. - */ - dblclick(): JQuery; - /** - * Bind an event handler to the "dblclick" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "dblclick" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - delegate(selector: any, eventType: string, eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "focus" event on an element. - */ - focus(): JQuery; - /** - * Bind an event handler to the "focus" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - focus(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "focus" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "focusin" event on an element. - */ - focusin(): JQuery; - /** - * Bind an event handler to the "focusin" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - focusin(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "focusin" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - focusin(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "focusout" event on an element. - */ - focusout(): JQuery; - /** - * Bind an event handler to the "focusout" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - focusout(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "focusout" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - focusout(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements. - * - * @param handlerIn A function to execute when the mouse pointer enters the element. - * @param handlerOut A function to execute when the mouse pointer leaves the element. - */ - hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind a single handler to the matched elements, to be executed when the mouse pointer enters or leaves the elements. - * - * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element. - */ - hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "keydown" event on an element. - */ - keydown(): JQuery; - /** - * Bind an event handler to the "keydown" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - keydown(handler: (eventObject: JQueryKeyEventObject) => any): JQuery; - /** - * Bind an event handler to the "keydown" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - keydown(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery; - - /** - * Trigger the "keypress" event on an element. - */ - keypress(): JQuery; - /** - * Bind an event handler to the "keypress" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - keypress(handler: (eventObject: JQueryKeyEventObject) => any): JQuery; - /** - * Bind an event handler to the "keypress" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - keypress(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery; - - /** - * Trigger the "keyup" event on an element. - */ - keyup(): JQuery; - /** - * Bind an event handler to the "keyup" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - keyup(handler: (eventObject: JQueryKeyEventObject) => any): JQuery; - /** - * Bind an event handler to the "keyup" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - keyup(eventData?: any, handler?: (eventObject: JQueryKeyEventObject) => any): JQuery; - - /** - * Bind an event handler to the "load" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - load(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "load" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "mousedown" event on an element. - */ - mousedown(): JQuery; - /** - * Bind an event handler to the "mousedown" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mousedown(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mousedown" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mousedown(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseenter" event on an element. - */ - mouseenter(): JQuery; - /** - * Bind an event handler to be fired when the mouse enters an element. - * - * @param handler A function to execute when the event is triggered. - */ - mouseenter(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to be fired when the mouse enters an element. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseenter(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseleave" event on an element. - */ - mouseleave(): JQuery; - /** - * Bind an event handler to be fired when the mouse leaves an element. - * - * @param handler A function to execute when the event is triggered. - */ - mouseleave(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to be fired when the mouse leaves an element. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseleave(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mousemove" event on an element. - */ - mousemove(): JQuery; - /** - * Bind an event handler to the "mousemove" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mousemove(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mousemove" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mousemove(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseout" event on an element. - */ - mouseout(): JQuery; - /** - * Bind an event handler to the "mouseout" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mouseout(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mouseout" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseout(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseover" event on an element. - */ - mouseover(): JQuery; - /** - * Bind an event handler to the "mouseover" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mouseover(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mouseover" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseover(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Trigger the "mouseup" event on an element. - */ - mouseup(): JQuery; - /** - * Bind an event handler to the "mouseup" JavaScript event. - * - * @param handler A function to execute when the event is triggered. - */ - mouseup(handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - /** - * Bind an event handler to the "mouseup" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - mouseup(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery; - - /** - * Remove an event handler. - */ - off(): JQuery; - /** - * Remove an event handler. - * - * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin". - * @param selector A selector which should match the one originally passed to .on() when attaching event handlers. - * @param handler A handler function previously attached for the event(s), or the special value false. - */ - off(events: string, selector?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove an event handler. - * - * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin". - * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on(). - */ - off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery; - /** - * Remove an event handler. - * - * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin". - * @param handler A handler function previously attached for the event(s), or the special value false. - */ - off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove an event handler. - * - * @param events An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s). - * @param selector A selector which should match the one originally passed to .on() when attaching event handlers. - */ - off(events: { [key: string]: any; }, selector?: string): JQuery; - - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. Rest parameter args is for optional parameters passed to jQuery.trigger(). Note that the actual parameters on the event handler function must be marked as optional (? syntax). - */ - on(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param data Data to be passed to the handler in event.data when an event is triggered. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - on(events: string, data : any, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - on(events: string, selector: string, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event is triggered. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - on(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject, ...eventData: any[]) => any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - on(events: { [key: string]: any; }, selector?: string, data?: any): JQuery; - /** - * Attach an event handler function for one or more events to the selected elements. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - on(events: { [key: string]: any; }, data?: any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names. - * @param handler A function to execute at the time the event is triggered. - */ - one(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names. - * @param data An object containing data that will be passed to the event handler. - * @param handler A function to execute at the time the event is triggered. - */ - one(events: string, data: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - one(events: string, selector: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event is triggered. - * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - */ - one(events: string, selector: string, data: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element. - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - one(events: { [key: string]: any; }, selector?: string, data?: any): JQuery; - - /** - * Attach a handler to an event for the elements. The handler is executed at most once per element per event type. - * - * @param events An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - * @param data Data to be passed to the handler in event.data when an event occurs. - */ - one(events: { [key: string]: any; }, data?: any): JQuery; - - - /** - * Specify a function to execute when the DOM is fully loaded. - * - * @param handler A function to execute after the DOM is ready. - */ - ready(handler: (jQueryAlias?: JQueryStatic) => any): JQuery; - - /** - * Trigger the "resize" event on an element. - */ - resize(): JQuery; - /** - * Bind an event handler to the "resize" JavaScript event. - * - * @param handler A function to execute each time the event is triggered. - */ - resize(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "resize" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - resize(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "scroll" event on an element. - */ - scroll(): JQuery; - /** - * Bind an event handler to the "scroll" JavaScript event. - * - * @param handler A function to execute each time the event is triggered. - */ - scroll(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "scroll" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - scroll(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "select" event on an element. - */ - select(): JQuery; - /** - * Bind an event handler to the "select" JavaScript event. - * - * @param handler A function to execute each time the event is triggered. - */ - select(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "select" JavaScript event. - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - select(eventData: Object, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Trigger the "submit" event on an element. - */ - submit(): JQuery; - /** - * Bind an event handler to the "submit" JavaScript event - * - * @param handler A function to execute each time the event is triggered. - */ - submit(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "submit" JavaScript event - * - * @param eventData An object containing data that will be passed to the event handler. - * @param handler A function to execute each time the event is triggered. - */ - submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Execute all handlers and behaviors attached to the matched elements for the given event type. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param extraParameters Additional parameters to pass along to the event handler. - */ - trigger(eventType: string, extraParameters?: any[]|Object): JQuery; - /** - * Execute all handlers and behaviors attached to the matched elements for the given event type. - * - * @param event A jQuery.Event object. - * @param extraParameters Additional parameters to pass along to the event handler. - */ - trigger(event: JQueryEventObject, extraParameters?: any[]|Object): JQuery; - - /** - * Execute all handlers attached to an element for an event. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param extraParameters An array of additional parameters to pass along to the event handler. - */ - triggerHandler(eventType: string, ...extraParameters: any[]): Object; - - /** - * Execute all handlers attached to an element for an event. - * - * @param event A jQuery.Event object. - * @param extraParameters An array of additional parameters to pass along to the event handler. - */ - triggerHandler(event: JQueryEventObject, ...extraParameters: any[]): Object; - - /** - * Remove a previously-attached event handler from the elements. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param handler The function that is to be no longer executed. - */ - unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove a previously-attached event handler from the elements. - * - * @param eventType A string containing a JavaScript event type, such as click or submit. - * @param fls Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ). - */ - unbind(eventType: string, fls: boolean): JQuery; - /** - * Remove a previously-attached event handler from the elements. - * - * @param evt A JavaScript event object as passed to an event handler. - */ - unbind(evt: any): JQuery; - - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - */ - undelegate(): JQuery; - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - * - * @param selector A selector which will be used to filter the event results. - * @param eventType A string containing a JavaScript event type, such as "click" or "keydown" - * @param handler A function to execute at the time the event is triggered. - */ - undelegate(selector: string, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - * - * @param selector A selector which will be used to filter the event results. - * @param events An object of one or more event types and previously bound functions to unbind from them. - */ - undelegate(selector: string, events: Object): JQuery; - /** - * Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - * - * @param namespace A string containing a namespace to unbind all events from. - */ - undelegate(namespace: string): JQuery; - - /** - * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8) - * - * @param handler A function to execute when the event is triggered. - */ - unload(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "unload" JavaScript event. (DEPRECATED from v1.8) - * - * @param eventData A plain object of data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. (DEPRECATED from v1.10) - */ - context: Element; - - jquery: string; - - /** - * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8) - * - * @param handler A function to execute when the event is triggered. - */ - error(handler: (eventObject: JQueryEventObject) => any): JQuery; - /** - * Bind an event handler to the "error" JavaScript event. (DEPRECATED from v1.8) - * - * @param eventData A plain object of data that will be passed to the event handler. - * @param handler A function to execute when the event is triggered. - */ - error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - - /** - * Add a collection of DOM elements onto the jQuery stack. - * - * @param elements An array of elements to push onto the stack and make into a new jQuery object. - */ - pushStack(elements: any[]): JQuery; - /** - * Add a collection of DOM elements onto the jQuery stack. - * - * @param elements An array of elements to push onto the stack and make into a new jQuery object. - * @param name The name of a jQuery method that generated the array of elements. - * @param arguments The arguments that were passed in to the jQuery method (for serialization). - */ - pushStack(elements: any[], name: string, arguments: any[]): JQuery; - - /** - * Insert content, specified by the parameter, after each element in the set of matched elements. - * - * param content1 HTML string, DOM element, array of elements, or jQuery object to insert after each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements. - */ - after(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, after each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - after(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Insert content, specified by the parameter, to the end of each element in the set of matched elements. - * - * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements. - */ - append(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, to the end of each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set. - */ - append(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Insert every element in the set of matched elements to the end of the target. - * - * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter. - */ - appendTo(target: JQuery|any[]|Element|string): JQuery; - - /** - * Insert content, specified by the parameter, before each element in the set of matched elements. - * - * param content1 HTML string, DOM element, array of elements, or jQuery object to insert before each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements. - */ - before(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, before each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - before(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Create a deep copy of the set of matched elements. - * - * param withDataAndEvents A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false. - * param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false). - */ - clone(withDataAndEvents?: boolean, deepWithDataAndEvents?: boolean): JQuery; - - /** - * Remove the set of matched elements from the DOM. - * - * param selector A selector expression that filters the set of matched elements to be removed. - */ - detach(selector?: string): JQuery; - - /** - * Remove all child nodes of the set of matched elements from the DOM. - */ - empty(): JQuery; - - /** - * Insert every element in the set of matched elements after the target. - * - * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter. - */ - insertAfter(target: JQuery|any[]|Element|Text|string): JQuery; - - /** - * Insert every element in the set of matched elements before the target. - * - * param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter. - */ - insertBefore(target: JQuery|any[]|Element|Text|string): JQuery; - - /** - * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements. - * - * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements. - * param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements. - */ - prepend(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery; - /** - * Insert content, specified by the parameter, to the beginning of each element in the set of matched elements. - * - * param func A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set. - */ - prepend(func: (index: number, html: string) => string|Element|JQuery): JQuery; - - /** - * Insert every element in the set of matched elements to the beginning of the target. - * - * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter. - */ - prependTo(target: JQuery|any[]|Element|string): JQuery; - - /** - * Remove the set of matched elements from the DOM. - * - * @param selector A selector expression that filters the set of matched elements to be removed. - */ - remove(selector?: string): JQuery; - - /** - * Replace each target element with the set of matched elements. - * - * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace. - */ - replaceAll(target: JQuery|any[]|Element|string): JQuery; - - /** - * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed. - * - * param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object. - */ - replaceWith(newContent: JQuery|any[]|Element|Text|string): JQuery; - /** - * Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed. - * - * param func A function that returns content with which to replace the set of matched elements. - */ - replaceWith(func: () => Element|JQuery): JQuery; - - /** - * Get the combined text contents of each element in the set of matched elements, including their descendants. - */ - text(): string; - /** - * Set the content of each element in the set of matched elements to the specified text. - * - * @param text The text to set as the content of each matched element. When Number or Boolean is supplied, it will be converted to a String representation. - */ - text(text: string|number|boolean): JQuery; - /** - * Set the content of each element in the set of matched elements to the specified text. - * - * @param func A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments. - */ - text(func: (index: number, text: string) => string): JQuery; - - /** - * Retrieve all the elements contained in the jQuery set, as an array. - */ - toArray(): any[]; - - /** - * Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place. - */ - unwrap(): JQuery; - - /** - * Wrap an HTML structure around each element in the set of matched elements. - * - * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements. - */ - wrap(wrappingElement: JQuery|Element|string): JQuery; - /** - * Wrap an HTML structure around each element in the set of matched elements. - * - * @param func A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - wrap(func: (index: number) => string|JQuery): JQuery; - - /** - * Wrap an HTML structure around all elements in the set of matched elements. - * - * @param wrappingElement A selector, element, HTML string, or jQuery object specifying the structure to wrap around the matched elements. - */ - wrapAll(wrappingElement: JQuery|Element|string): JQuery; - wrapAll(func: (index: number) => string): JQuery; - - /** - * Wrap an HTML structure around the content of each element in the set of matched elements. - * - * @param wrappingElement An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements. - */ - wrapInner(wrappingElement: JQuery|Element|string): JQuery; - /** - * Wrap an HTML structure around the content of each element in the set of matched elements. - * - * @param func A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - */ - wrapInner(func: (index: number) => string): JQuery; - - /** - * Iterate over a jQuery object, executing a function for each matched element. - * - * @param func A function to execute for each matched element. - */ - each(func: (index: number, elem: Element) => any): JQuery; - - /** - * Retrieve one of the elements matched by the jQuery object. - * - * @param index A zero-based integer indicating which element to retrieve. - */ - get(index: number): HTMLElement; - /** - * Retrieve the elements matched by the jQuery object. - */ - get(): any[]; - - /** - * Search for a given element from among the matched elements. - */ - index(): number; - /** - * Search for a given element from among the matched elements. - * - * @param selector A selector representing a jQuery collection in which to look for an element. - */ - index(selector: string|JQuery|Element): number; - - /** - * The number of elements in the jQuery object. - */ - length: number; - /** - * A selector representing selector passed to jQuery(), if any, when creating the original set. - * version deprecated: 1.7, removed: 1.9 - */ - selector: string; - [index: string]: any; - [index: number]: HTMLElement; - - /** - * Add elements to the set of matched elements. - * - * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements. - * @param context The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method. - */ - add(selector: string, context?: Element): JQuery; - /** - * Add elements to the set of matched elements. - * - * @param elements One or more elements to add to the set of matched elements. - */ - add(...elements: Element[]): JQuery; - /** - * Add elements to the set of matched elements. - * - * @param html An HTML fragment to add to the set of matched elements. - */ - add(html: string): JQuery; - /** - * Add elements to the set of matched elements. - * - * @param obj An existing jQuery object to add to the set of matched elements. - */ - add(obj: JQuery): JQuery; - - /** - * Get the children of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - children(selector?: string): JQuery; - - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param selector A string containing a selector expression to match elements against. - */ - closest(selector: string): JQuery; - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param selector A string containing a selector expression to match elements against. - * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead. - */ - closest(selector: string, context?: Element): JQuery; - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param obj A jQuery object to match elements against. - */ - closest(obj: JQuery): JQuery; - /** - * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - * - * @param element An element to match elements against. - */ - closest(element: Element): JQuery; - - /** - * Get an array of all the elements and selectors matched against the current element up through the DOM tree. - * - * @param selectors An array or string containing a selector expression to match elements against (can also be a jQuery object). - * @param context A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead. - */ - closest(selectors: any, context?: Element): any[]; - - /** - * Get the children of each element in the set of matched elements, including text and comment nodes. - */ - contents(): JQuery; - - /** - * End the most recent filtering operation in the current chain and return the set of matched elements to its previous state. - */ - end(): JQuery; - - /** - * Reduce the set of matched elements to the one at the specified index. - * - * @param index An integer indicating the 0-based position of the element. OR An integer indicating the position of the element, counting backwards from the last element in the set. - * - */ - eq(index: number): JQuery; - - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param selector A string containing a selector expression to match the current set of elements against. - */ - filter(selector: string): JQuery; - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param func A function used as a test for each element in the set. this is the current DOM element. - */ - filter(func: (index: number, element: Element) => any): JQuery; - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param element An element to match the current set of elements against. - */ - filter(element: Element): JQuery; - /** - * Reduce the set of matched elements to those that match the selector or pass the function's test. - * - * @param obj An existing jQuery object to match the current set of elements against. - */ - filter(obj: JQuery): JQuery; - - /** - * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - * - * @param selector A string containing a selector expression to match elements against. - */ - find(selector: string): JQuery; - /** - * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - * - * @param element An element to match elements against. - */ - find(element: Element): JQuery; - /** - * Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - * - * @param obj A jQuery object to match elements against. - */ - find(obj: JQuery): JQuery; - - /** - * Reduce the set of matched elements to the first in the set. - */ - first(): JQuery; - - /** - * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element. - * - * @param selector A string containing a selector expression to match elements against. - */ - has(selector: string): JQuery; - /** - * Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element. - * - * @param contained A DOM element to match elements against. - */ - has(contained: Element): JQuery; - - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param selector A string containing a selector expression to match elements against. - */ - is(selector: string): boolean; - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param func A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element. - */ - is(func: (index: number, element: Element) => boolean): boolean; - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param obj An existing jQuery object to match the current set of elements against. - */ - is(obj: JQuery): boolean; - /** - * Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - * - * @param elements One or more elements to match the current set of elements against. - */ - is(elements: any): boolean; - - /** - * Reduce the set of matched elements to the final one in the set. - */ - last(): JQuery; - - /** - * Pass each element in the current matched set through a function, producing a new jQuery object containing the return values. - * - * @param callback A function object that will be invoked for each element in the current set. - */ - map(callback: (index: number, domElement: Element) => any): JQuery; - - /** - * Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - next(selector?: string): JQuery; - - /** - * Get all following siblings of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - nextAll(selector?: string): JQuery; - - /** - * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - * - * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - nextUntil(selector?: string, filter?: string): JQuery; - /** - * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - * - * @param element A DOM node or jQuery object indicating where to stop matching following sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - nextUntil(element?: Element, filter?: string): JQuery; - /** - * Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - * - * @param obj A DOM node or jQuery object indicating where to stop matching following sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - nextUntil(obj?: JQuery, filter?: string): JQuery; - - /** - * Remove elements from the set of matched elements. - * - * @param selector A string containing a selector expression to match elements against. - */ - not(selector: string): JQuery; - /** - * Remove elements from the set of matched elements. - * - * @param func A function used as a test for each element in the set. this is the current DOM element. - */ - not(func: (index: number, element: Element) => boolean): JQuery; - /** - * Remove elements from the set of matched elements. - * - * @param elements One or more DOM elements to remove from the matched set. - */ - not(elements: Element|Element[]): JQuery; - /** - * Remove elements from the set of matched elements. - * - * @param obj An existing jQuery object to match the current set of elements against. - */ - not(obj: JQuery): JQuery; - - /** - * Get the closest ancestor element that is positioned. - */ - offsetParent(): JQuery; - - /** - * Get the parent of each element in the current set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - parent(selector?: string): JQuery; - - /** - * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - parents(selector?: string): JQuery; - - /** - * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements. - * @param filter A string containing a selector expression to match elements against. - */ - parentsUntil(selector?: string, filter?: string): JQuery; - /** - * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param element A DOM node or jQuery object indicating where to stop matching ancestor elements. - * @param filter A string containing a selector expression to match elements against. - */ - parentsUntil(element?: Element, filter?: string): JQuery; - /** - * Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param obj A DOM node or jQuery object indicating where to stop matching ancestor elements. - * @param filter A string containing a selector expression to match elements against. - */ - parentsUntil(obj?: JQuery, filter?: string): JQuery; - - /** - * Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - prev(selector?: string): JQuery; - - /** - * Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - prevAll(selector?: string): JQuery; - - /** - * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - prevUntil(selector?: string, filter?: string): JQuery; - /** - * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param element A DOM node or jQuery object indicating where to stop matching preceding sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - prevUntil(element?: Element, filter?: string): JQuery; - /** - * Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - * - * @param obj A DOM node or jQuery object indicating where to stop matching preceding sibling elements. - * @param filter A string containing a selector expression to match elements against. - */ - prevUntil(obj?: JQuery, filter?: string): JQuery; - - /** - * Get the siblings of each element in the set of matched elements, optionally filtered by a selector. - * - * @param selector A string containing a selector expression to match elements against. - */ - siblings(selector?: string): JQuery; - - /** - * Reduce the set of matched elements to a subset specified by a range of indices. - * - * @param start An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set. - * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set. - */ - slice(start: number, end?: number): JQuery; - - /** - * Show the queue of functions to be executed on the matched elements. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - */ - queue(queueName?: string): any[]; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param newQueue An array of functions to replace the current queue contents. - */ - queue(newQueue: Function[]): JQuery; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param callback The new function to add to the queue, with a function to call that will dequeue the next item. - */ - queue(callback: Function): JQuery; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param newQueue An array of functions to replace the current queue contents. - */ - queue(queueName: string, newQueue: Function[]): JQuery; - /** - * Manipulate the queue of functions to be executed, once for each matched element. - * - * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue. - * @param callback The new function to add to the queue, with a function to call that will dequeue the next item. - */ - queue(queueName: string, callback: Function): JQuery; -} -declare module "jquery" { - export = $; -} -declare var jQuery: JQueryStatic; -declare var $: JQueryStatic; \ No newline at end of file diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/typings.json b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/typings.json deleted file mode 100644 index 0af7c54b42..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/globals/jquery/typings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resolution": "main", - "tree": { - "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/4cdfbe96b666eec5e1defbb519a62abf04e96764/jquery/jquery.d.ts", - "raw": "registry:dt/jquery#1.10.0+20160417213236", - "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/4cdfbe96b666eec5e1defbb519a62abf04e96764/jquery/jquery.d.ts" - } -} diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/index.d.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/index.d.ts deleted file mode 100644 index 7b1af70fde..0000000000 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/typings-ng1/index.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -/// -/// -/// -/// -/// -/// diff --git a/public/docs/_examples/upgrade-phonecat-3-final/e2e-spec.ts b/public/docs/_examples/upgrade-phonecat-3-final/e2e-spec.ts index a56d735d1d..49f0ca75a9 100644 --- a/public/docs/_examples/upgrade-phonecat-3-final/e2e-spec.ts +++ b/public/docs/_examples/upgrade-phonecat-3-final/e2e-spec.ts @@ -1,5 +1,6 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; // Angular E2E Testing Guide: // https://docs.angularjs.org/guide/e2e-testing @@ -10,7 +11,7 @@ describe('PhoneCat Application', function() { it('should redirect `index.html` to `index.html#!/phones', function() { browser.get('index.html'); browser.waitForAngular(); - browser.getCurrentUrl().then(function(url) { + browser.getCurrentUrl().then(function(url: string) { expect(url.endsWith('/phones')).toBe(true); }); }); @@ -28,11 +29,11 @@ describe('PhoneCat Application', function() { expect(phoneList.count()).toBe(20); - sendKeys(query, 'nexus'); + query.sendKeys('nexus'); expect(phoneList.count()).toBe(1); query.clear(); - sendKeys(query, 'motorola'); + query.sendKeys('motorola'); expect(phoneList.count()).toBe(8); }); @@ -48,7 +49,7 @@ describe('PhoneCat Application', function() { }); } - sendKeys(queryField, 'tablet'); // Let's narrow the dataset to make the assertions shorter + queryField.sendKeys('tablet'); // Let's narrow the dataset to make the assertions shorter expect(getNames()).toEqual([ 'Motorola XOOM\u2122 with Wi-Fi', @@ -72,7 +73,7 @@ describe('PhoneCat Application', function() { query.sendKeys(str.charAt(i)); } element.all(by.css('.phones li a')).first().click(); - browser.getCurrentUrl().then(function(url) { + browser.getCurrentUrl().then(function(url: string) { expect(url.endsWith('/phones/nexus-s')).toBe(true); }); }); diff --git a/public/docs/_examples/user-input/e2e-spec.ts b/public/docs/_examples/user-input/e2e-spec.ts index e2cf8d69eb..c0bb770848 100644 --- a/public/docs/_examples/user-input/e2e-spec.ts +++ b/public/docs/_examples/user-input/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by, protractor } from 'protractor'; + describe('User Input Tests', function () { beforeAll(function () { @@ -29,9 +31,8 @@ describe('User Input Tests', function () { let inputEle = mainEle.element(by.css('input')); let outputTextEle = mainEle.element(by.css('p')); expect(outputTextEle.getText()).toEqual(''); - return sendKeys(inputEle, 'abc').then(function() { - expect(outputTextEle.getText()).toEqual('a | ab | abc |'); - }); + inputEle.sendKeys('abc'); + expect(outputTextEle.getText()).toEqual('a | ab | abc |'); }); it('should support user input from a local template let (loopback)', function () { @@ -39,9 +40,8 @@ describe('User Input Tests', function () { let inputEle = mainEle.element(by.css('input')); let outputTextEle = mainEle.element(by.css('p')); expect(outputTextEle.getText()).toEqual(''); - return sendKeys(inputEle, 'abc').then(function() { - expect(outputTextEle.getText()).toEqual('abc'); - }); + inputEle.sendKeys('abc'); + expect(outputTextEle.getText()).toEqual('abc'); }); it('should be able to combine click event with a local template var', function () { @@ -49,19 +49,19 @@ describe('User Input Tests', function () { let inputEle = mainEle.element(by.css('input')); let outputTextEle = mainEle.element(by.css('p')); expect(outputTextEle.getText()).toEqual(''); - return sendKeys(inputEle, 'abc').then(function() { - expect(outputTextEle.getText()).toEqual('a | ab | abc |'); - }); + inputEle.sendKeys('abc'); + expect(outputTextEle.getText()).toEqual('a | ab | abc |'); }); - it('should be able to filter key events', async () => { + xit('should be able to filter key events', () => { let mainEle = element(by.css('key-up3')); let inputEle = mainEle.element(by.css('input')); let outputTextEle = mainEle.element(by.css('p')); expect(outputTextEle.getText()).toEqual(''); - await sendKeys(inputEle, 'abc'); + inputEle.sendKeys('abc'); expect(outputTextEle.getText()).toEqual('', 'should be blank - have not sent enter yet'); - await sendKeys(inputEle, protractor.Key.ENTER); + // broken atm, see https://github.com/angular/angular/issues/9419 + inputEle.sendKeys(protractor.Key.ENTER); expect(outputTextEle.getText()).toEqual('abc'); }); @@ -71,11 +71,10 @@ describe('User Input Tests', function () { let inputEle = mainEle.element(by.css('input')); let outputTextEle = mainEle.element(by.css('p')); expect(outputTextEle.getText()).toEqual(''); - return sendKeys(inputEle, 'abc').then(function() { - expect(outputTextEle.getText()).toEqual('', 'should be blank - have not sent enter yet'); - // change the focus - return prevInputEle.click(); - }).then(function() { + inputEle.sendKeys('abc'); + expect(outputTextEle.getText()).toEqual('', 'should be blank - have not sent enter yet'); + // change the focus + prevInputEle.click().then(function() { expect(outputTextEle.getText()).toEqual('abc'); }); }); @@ -87,10 +86,9 @@ describe('User Input Tests', function () { let heroEles = mainEle.all(by.css('li')); let numHeroes: number; expect(heroEles.count()).toBeGreaterThan(0); - heroEles.count().then(function(count) { + heroEles.count().then(function(count: number) { numHeroes = count; - return sendKeys(inputEle, 'abc'); - }).then(function() { + inputEle.sendKeys('abc'); return addButtonEle.click(); }).then(function() { expect(heroEles.count()).toEqual(numHeroes + 1, 'should be one more hero added'); diff --git a/public/docs/_examples/webpack/e2e-spec.ts b/public/docs/_examples/webpack/e2e-spec.ts index 1e88bfccf1..9bca9810eb 100644 --- a/public/docs/_examples/webpack/e2e-spec.ts +++ b/public/docs/_examples/webpack/e2e-spec.ts @@ -1,5 +1,7 @@ -/// -'use strict'; +'use strict'; // necessary for es6 output in node + +import { browser, element, by } from 'protractor'; + describe('QuickStart E2E Tests', function () { let expectedMsg = 'Hello from Angular App with Webpack'; diff --git a/scripts/examples-install.sh b/scripts/examples-install.sh index 2501ad2b8d..06fea39aa5 100755 --- a/scripts/examples-install.sh +++ b/scripts/examples-install.sh @@ -3,6 +3,5 @@ set -ex -o pipefail (cd public/docs/_examples && npm install --no-optional) -(cd public/docs/_examples/_protractor && npm install --no-optional) -npm run webdriver:update --prefix public/docs/_examples/_protractor +npm run webdriver:update --prefix public/docs/_examples gulp add-example-boilerplate diff --git a/tools/plunker-builder/builder.js b/tools/plunker-builder/builder.js index 3f0fdacdd1..9a80b01e43 100644 --- a/tools/plunker-builder/builder.js +++ b/tools/plunker-builder/builder.js @@ -209,10 +209,10 @@ class PlunkerBuilder { _getPlunkerFiles() { // Assume plunker version is sibling of node_modules version - this.readme = fs.readFileSync(this.basePath + '/plunker.README.md', 'utf-8'); - var systemJsConfigPath = '/systemjs.config.plunker.js'; + this.readme = fs.readFileSync(this.basePath + '/_boilerplate/plunker.README.md', 'utf-8'); + var systemJsConfigPath = '/_boilerplate/systemjs.config.plunker.js'; if (this.options.build) { - systemJsConfigPath = '/systemjs.config.plunker.build.js'; + systemJsConfigPath = '/_boilerplate/systemjs.config.plunker.build.js'; } this.systemjsConfig = fs.readFileSync(this.basePath + systemJsConfigPath, 'utf-8'); this.systemjsConfig += this.copyrights.jsCss; From 8710eb052d5d913f2f416216d736a8c723dac8f3 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Thu, 6 Oct 2016 16:10:30 -0700 Subject: [PATCH 29/56] chore(package.json): rename "angular2-" as "angular-" in name (#2558) also ignore a2docs.css --- public/docs/_examples/.gitignore | 2 +- public/docs/_examples/_boilerplate/package.json | 2 +- public/docs/_examples/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/docs/_examples/.gitignore b/public/docs/_examples/.gitignore index 26c5801eb8..3e900ec40a 100644 --- a/public/docs/_examples/.gitignore +++ b/public/docs/_examples/.gitignore @@ -9,7 +9,6 @@ tsconfig.json tslint.json typings.json wallaby.js -_boilerplate/a2docs.css _test-output **/ts/**/*.js @@ -19,3 +18,4 @@ _test-output !**/*e2e-spec.js !systemjs.config.1.js !_boilerplate/* +_boilerplate/a2docs.css diff --git a/public/docs/_examples/_boilerplate/package.json b/public/docs/_examples/_boilerplate/package.json index 74b692d1f0..53bdb49670 100644 --- a/public/docs/_examples/_boilerplate/package.json +++ b/public/docs/_examples/_boilerplate/package.json @@ -1,5 +1,5 @@ { - "name": "angular2-examples", + "name": "angular-examples", "version": "1.0.0", "description": "Example package.json, only contains needed scripts for examples. See _examples/package.json for master package.json.", "scripts": { diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json index 615db7f811..f1a8864533 100644 --- a/public/docs/_examples/package.json +++ b/public/docs/_examples/package.json @@ -1,5 +1,5 @@ { - "name": "angular2-examples-master", + "name": "angular-examples-master", "version": "1.0.0", "description": "Master package.json, the superset of all dependencies for all of the _example package.json files. See _boilerplate/package.json for example npm scripts.", "scripts": { From 61b13c13ec7d295b314b63f89cc99c9551394538 Mon Sep 17 00:00:00 2001 From: Ward Bell Date: Thu, 6 Oct 2016 17:21:05 -0700 Subject: [PATCH 30/56] chore: v.2.0.2 + standard MIT licenses property (#2559) --- .../docs/_examples/_boilerplate/package.json | 7 ++++- public/docs/_examples/package.json | 31 +++++++++++-------- .../_examples/quickstart/js/package.1.json | 7 ++++- .../_examples/quickstart/ts/package.1.json | 27 +++++++++------- .../docs/_examples/styleguide/package.1.json | 7 ++++- .../ts/package.ng1.json | 7 ++++- .../_examples/webpack/ts/package.webpack.json | 7 ++++- public/docs/ts/latest/guide/change-log.jade | 3 ++ 8 files changed, 67 insertions(+), 29 deletions(-) diff --git a/public/docs/_examples/_boilerplate/package.json b/public/docs/_examples/_boilerplate/package.json index 53bdb49670..e168cc9b9f 100644 --- a/public/docs/_examples/_boilerplate/package.json +++ b/public/docs/_examples/_boilerplate/package.json @@ -22,7 +22,12 @@ }, "keywords": [], "author": "", - "license": "ISC", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/angular/angular.io/blob/master/LICENSE" + } + ], "dependencies": {}, "devDependencies": {}, "repository": {} diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json index f1a8864533..3ec650fc69 100644 --- a/public/docs/_examples/package.json +++ b/public/docs/_examples/package.json @@ -10,21 +10,26 @@ }, "keywords": [], "author": "", - "license": "ISC", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/angular/angular.io/blob/master/LICENSE" + } + ], "dependencies": { - "@angular/common": "~2.0.1", - "@angular/compiler": "~2.0.1", - "@angular/compiler-cli": "~0.6.3", - "@angular/core": "~2.0.1", - "@angular/forms": "~2.0.1", - "@angular/http": "~2.0.1", - "@angular/platform-browser": "~2.0.1", - "@angular/platform-browser-dynamic": "~2.0.1", - "@angular/platform-server": "~2.0.1", - "@angular/router": "~3.0.1", - "@angular/upgrade": "~2.0.1", + "@angular/common": "~2.0.2", + "@angular/compiler": "~2.0.2", + "@angular/compiler-cli": "~0.6.4", + "@angular/core": "~2.0.2", + "@angular/forms": "~2.0.2", + "@angular/http": "~2.0.2", + "@angular/platform-browser": "~2.0.2", + "@angular/platform-browser-dynamic": "~2.0.2", + "@angular/platform-server": "~2.0.2", + "@angular/router": "~3.0.2", + "@angular/upgrade": "~2.0.2", - "angular-in-memory-web-api": "~0.1.1", + "angular-in-memory-web-api": "~0.1.5", "bootstrap": "^3.3.7", "core-js": "^2.4.1", "protractor": "^4.0.9", diff --git a/public/docs/_examples/quickstart/js/package.1.json b/public/docs/_examples/quickstart/js/package.1.json index f07246fadd..379df66e09 100644 --- a/public/docs/_examples/quickstart/js/package.1.json +++ b/public/docs/_examples/quickstart/js/package.1.json @@ -5,7 +5,12 @@ "start": "npm run lite", "lite": "lite-server" }, - "license": "ISC", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/angular/angular.io/blob/master/LICENSE" + } + ], "dependencies": { "@angular/common": "~2.0.1", "@angular/compiler": "~2.0.1", diff --git a/public/docs/_examples/quickstart/ts/package.1.json b/public/docs/_examples/quickstart/ts/package.1.json index ea5d056bf4..a6db24d085 100644 --- a/public/docs/_examples/quickstart/ts/package.1.json +++ b/public/docs/_examples/quickstart/ts/package.1.json @@ -9,19 +9,24 @@ "tsc:w": "tsc -w", "typings": "typings" }, - "license": "ISC", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/angular/angular.io/blob/master/LICENSE" + } + ], "dependencies": { - "@angular/common": "~2.0.1", - "@angular/compiler": "~2.0.1", - "@angular/core": "~2.0.1", - "@angular/forms": "~2.0.1", - "@angular/http": "~2.0.1", - "@angular/platform-browser": "~2.0.1", - "@angular/platform-browser-dynamic": "~2.0.1", - "@angular/router": "~3.0.1", - "@angular/upgrade": "~2.0.1", + "@angular/common": "~2.0.2", + "@angular/compiler": "~2.0.2", + "@angular/core": "~2.0.2", + "@angular/forms": "~2.0.2", + "@angular/http": "~2.0.2", + "@angular/platform-browser": "~2.0.2", + "@angular/platform-browser-dynamic": "~2.0.2", + "@angular/router": "~3.0.2", + "@angular/upgrade": "~2.0.2", - "angular-in-memory-web-api": "~0.1.1", + "angular-in-memory-web-api": "~0.1.5", "bootstrap": "^3.3.7", "core-js": "^2.4.1", "reflect-metadata": "^0.1.8", diff --git a/public/docs/_examples/styleguide/package.1.json b/public/docs/_examples/styleguide/package.1.json index f4c2fdaef5..2aafb8b80a 100644 --- a/public/docs/_examples/styleguide/package.1.json +++ b/public/docs/_examples/styleguide/package.1.json @@ -7,7 +7,12 @@ "lite": "lite-server", "start": "concurrently \"npm run tsc:w\" \"npm run lite\" " }, - "license": "ISC", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/angular/angular.io/blob/master/LICENSE" + } + ], "dependencies": { "angular2": "2.0.0-beta.0", "systemjs": "0.19.6", diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/package.ng1.json b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/package.ng1.json index 54f73776dd..9c7e5dd2d0 100644 --- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/package.ng1.json +++ b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/package.ng1.json @@ -4,7 +4,12 @@ "version": "0.0.0", "description": "A tutorial application for AngularJS", "repository": "https://github.com/angular/angular-phonecat", - "license": "MIT", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/angular/angular.io/blob/master/LICENSE" + } + ], "devDependencies": { "bower": "^1.7.7", "http-server": "^0.9.0", diff --git a/public/docs/_examples/webpack/ts/package.webpack.json b/public/docs/_examples/webpack/ts/package.webpack.json index 3995e724db..4abdc3d36d 100644 --- a/public/docs/_examples/webpack/ts/package.webpack.json +++ b/public/docs/_examples/webpack/ts/package.webpack.json @@ -8,7 +8,12 @@ "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail", "postinstall": "typings install" }, - "license": "MIT", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/angular/angular.io/blob/master/LICENSE" + } + ], "dependencies": { "@angular/common": "2.0.0", "@angular/compiler": "2.0.0", diff --git a/public/docs/ts/latest/guide/change-log.jade b/public/docs/ts/latest/guide/change-log.jade index 45cf97401e..183b02c4cd 100644 --- a/public/docs/ts/latest/guide/change-log.jade +++ b/public/docs/ts/latest/guide/change-log.jade @@ -7,6 +7,9 @@ block includes The Angular documentation is a living document with continuous improvements. This log calls attention to recent significant changes. + ## Sync with Angular v.2.0.2 (2016-10-6) + Docs and code samples updated and tested with Angular v.2.0.2 + ## "Routing and Navigation" guide with the _Router Module_ (2016-10-5) The [Routing and Navigation](router.html) guide now locates route configuration in a _Routing Module_. From b88b25a21cb4737c1226b32e1d4b942b620436e2 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Fri, 23 Sep 2016 11:10:11 -0700 Subject: [PATCH 31/56] update symbold for type alias --- public/resources/css/module/_symbol.scss | 2 +- public/resources/js/directives/api-list.js | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/public/resources/css/module/_symbol.scss b/public/resources/css/module/_symbol.scss index e0cf61cc0f..9940883424 100644 --- a/public/resources/css/module/_symbol.scss +++ b/public/resources/css/module/_symbol.scss @@ -51,7 +51,7 @@ $api-symbols: ( ), type-alias: ( content: 'T', - background: $blue-grey-50 + background: $light-green-600 ) ); diff --git a/public/resources/js/directives/api-list.js b/public/resources/js/directives/api-list.js index a813e5ba4a..0684368db2 100644 --- a/public/resources/js/directives/api-list.js +++ b/public/resources/js/directives/api-list.js @@ -1,3 +1,14 @@ +/*eslint no-unused-vars: "angularIO" */ + + +/* +* API List & Filter Directive +* +* A page displaying all of the angular API methods available +* including a filter that can hide/show methods bases on filter +* settings. +*/ + angularIO.directive('apiList', function () { var API_FILTER_KEY = 'apiFilter'; var API_TYPE_KEY = 'apiType'; @@ -31,10 +42,9 @@ angularIO.directive('apiList', function () { '', controllerAs: '$ctrl', controller: function($scope, $attrs, $http, $location) { + // SET DEFAULTS var $ctrl = this; - $ctrl.showMenu = false; - var isForDart = $attrs.lang === 'dart'; $ctrl.apiTypes = [ @@ -63,11 +73,13 @@ angularIO.directive('apiList', function () { $ctrl.showMenu = !$ctrl.showMenu; }; + // CLEAR FILTER $ctrl.clearType = function () { $ctrl.apiType = null; $ctrl.showMenu = !$ctrl.showMenu; }; + // TOGGLE FILTER MENU $ctrl.toggleMenu = function () { $ctrl.showMenu = !$ctrl.showMenu; }; From 5096dd8e376cc36b4acc5afd40a4927a2bdd7361 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Fri, 7 Oct 2016 13:08:23 -0700 Subject: [PATCH 32/56] Refactor of api filter page to include statues, types, queries --- public/resources/css/module/_badge.scss | 2 +- public/resources/js/directives/api-list.js | 286 +++++++++++++++------ 2 files changed, 204 insertions(+), 84 deletions(-) diff --git a/public/resources/css/module/_badge.scss b/public/resources/css/module/_badge.scss index 960c6fd724..fe5bd2b55c 100644 --- a/public/resources/css/module/_badge.scss +++ b/public/resources/css/module/_badge.scss @@ -45,7 +45,7 @@ $badges: ( font-size: 11px; height: $unit * 3; line-height: ($unit * 3) - 2; - margin: ($unit + 4) 0; + margin: ($unit + 4) $unit ($unit + 4) 0; padding: 0 $unit; text-align: center; text-transform: uppercase; diff --git a/public/resources/js/directives/api-list.js b/public/resources/js/directives/api-list.js index 0684368db2..473511ffe8 100644 --- a/public/resources/js/directives/api-list.js +++ b/public/resources/js/directives/api-list.js @@ -12,26 +12,43 @@ angularIO.directive('apiList', function () { var API_FILTER_KEY = 'apiFilter'; var API_TYPE_KEY = 'apiType'; + var API_STATUS_KEY = 'statusType'; + var QUERY_KEY = 'query'; + var TYPE_KEY = 'type'; + var STATUS_KEY = 'status'; + return { restrict: 'E', template: '' + + ' ' + '
      ' + - '
      ' + + '
      ' + '

      {{ section.title }}

      ' + '
        ' + '
      • ' + @@ -42,13 +59,18 @@ angularIO.directive('apiList', function () { '
      ', controllerAs: '$ctrl', controller: function($scope, $attrs, $http, $location) { - // SET DEFAULTS + // DEFAULT VALUES var $ctrl = this; - $ctrl.showMenu = false; - var isForDart = $attrs.lang === 'dart'; + $ctrl.showTypeMenu = false; + $ctrl.showStatusMenu = false; + $ctrl.status = null; + $ctrl.query = null; + $ctrl.type = null; + $ctrl.groupedSections = []; - $ctrl.apiTypes = [ - { cssClass: 'stable', title: 'Only Stable', matches: ['stable']}, + + // API TYPES + $ctrl.types = [ { cssClass: 'directive', title: 'Directive', matches: ['directive'] }, { cssClass: 'pipe', title: 'Pipe', matches: ['pipe'] }, { cssClass: 'decorator', title: 'Decorator', matches: ['decorator'] }, @@ -56,97 +78,195 @@ angularIO.directive('apiList', function () { { cssClass: 'interface', title: 'Interface', matches: ['interface'] }, { cssClass: 'function', title: 'Function', matches: ['function'] }, { cssClass: 'enum', title: 'Enum', matches: ['enum'] }, + { cssClass: 'type-alias', title: 'Type Alias', matches: ['type-alias'] }, { cssClass: 'const', title: 'Const', matches: ['var', 'let', 'const'] } ]; - if (isForDart) $ctrl.apiTypes = $ctrl.apiTypes.filter(function (t) { - return !t.cssClass.match(/^(stable|directive|decorator|interface|enum)$/); - }); + // STATUSES + $ctrl.statuses = [ + { cssClass: 'stable', title: 'Stable', matches: ['stable']}, + { cssClass: 'deprecated', title: 'Deprecated', matches: ['deprecated']}, + { cssClass: 'experimental', title: 'Experimental', matches: ['experimental']}, + { cssClass: 'security', title: 'Security Risk', matches: ['security']} + ]; - $ctrl.apiFilter = getApiFilterFromLocation(); - $ctrl.apiType = getApiTypeFromLocation(); - $ctrl.groupedSections = []; - $ctrl.setType = function (type) { - if (type === $ctrl.apiType) $ctrl.apiType = null; - else $ctrl.apiType = type; - $ctrl.showMenu = !$ctrl.showMenu; - }; + // SET FILTER VALUES + getFilterValues(); - // CLEAR FILTER - $ctrl.clearType = function () { - $ctrl.apiType = null; - $ctrl.showMenu = !$ctrl.showMenu; - }; - - // TOGGLE FILTER MENU - $ctrl.toggleMenu = function () { - $ctrl.showMenu = !$ctrl.showMenu; - }; - - $ctrl.isFiltered = function(section) { - var apiFilter = ($ctrl.apiFilter || '').toLowerCase(); - var matchesModule = $ctrl.apiFilter === '' || $ctrl.apiFilter === null || section.title.toLowerCase().indexOf($ctrl.apiFilter.toLowerCase()) !== -1; - var isVisible = false; - - section.items.forEach(function(item) { - - // Filter by stability (ericjim: only 'stable' for now) - if ($ctrl.apiType && $ctrl.apiType.matches.length === 1 && - $ctrl.apiType.matches[0] === 'stable' && item.stability === 'stable') { - item.show = true; - isVisible = true; - return isVisible; - } // NOTE: other checks can be performed for stability (experimental, deprecated, etc) - - // Filter by docType - var matchesDocType = !$ctrl.apiType || $ctrl.apiType.matches.indexOf(item.docType) !== -1; - var matchesTitle = !apiFilter || item.title.toLowerCase().indexOf(apiFilter) !== -1; - item.show = matchesDocType && (matchesTitle || matchesModule); - - if (item.show) { - isVisible = true; - } - }); - - return isVisible; - }; + // GRAB DATA FOR SECTIONS $http.get($attrs.src).then(function(response) { - $ctrl.sections = response.data; + $ctrl.sections =  response.data; + $ctrl.groupedSections = Object.keys($ctrl.sections).map(function(title) { return { title: title, items: $ctrl.sections[title] }; }); }); - $scope.$watchGroup( - [function() { return $ctrl.apiFilter; }, function() { return $ctrl.apiType; }, function() { return $ctrl.sections; }], - function() { - var apiFilter = ($ctrl.apiFilter || '').toLowerCase(); - $location.search(API_FILTER_KEY, apiFilter || null); - $location.search(API_TYPE_KEY, $ctrl.apiType && $ctrl.apiType.title || null); + // SET SELECTED VALUE FROM MENUS/FORM + $ctrl.set = function(item, kind) { + var value = (item && item.matches) ? item.matches[0] : null; + + switch(kind) { + case 'type': $ctrl.type = value ; break; + case 'query': $ctrl.query = value ; break; + case 'status': $ctrl.status = value ; break; + } + + $ctrl.toggleMenu(kind); + } + + + // CLEAR SELECTED VALUE FROM MENUS/FORM + $ctrl.clear = function (kind) { + switch(kind) { + case 'type': $ctrl.type = null ; break; + case 'query': $ctrl.query = null ; break; + case 'status': $ctrl.status = null ; break; + } + + $ctrl.toggleMenu(kind); + }; + + + // TOGGLE MENU + $ctrl.toggleMenu = function(kind) { + console.log(kind); + + switch(kind) { + case 'type': $ctrl.showTypeMenu = !$ctrl.showTypeMenu; ; break; + case 'status': $ctrl.showStatusMenu = !$ctrl.showStatusMenu; ; break; + } + } + + + // UPDATE VALUES IF DART API + var isForDart = $attrs.lang === 'dart'; + if (isForDart) { + $ctrl.apiTypes = $ctrl.apiTypes.filter(function (t) { + return !t.cssClass.match(/^(stable|directive|decorator|interface|enum)$/); + }); + } + + + // SET URL WITH VALUES + $scope.$watchGroup( + [ + function() { return $ctrl.query; }, + function() { return $ctrl.type; }, + function() { return $ctrl.status; }, + function() { return $ctrl.sections; } + ], + + function() { + var queryURL = $ctrl.query ? $ctrl.query.toLowerCase() : null; + var typeURL = $ctrl.type || null; + var statusURL = $ctrl.status || null; + + // SET URLS + $location.search(QUERY_KEY, queryURL); + $location.search(STATUS_KEY, statusURL); + $location.search(TYPE_KEY, typeURL); } ); - function getApiFilterFromLocation() { - return $location.search()[API_FILTER_KEY] || null; + + // GET VALUES FORM URL + function getFilterValues() { + var urlParams = $location.search(); + + $ctrl.status = urlParams[STATUS_KEY] || null; + $ctrl.query = urlParams[QUERY_KEY] || null;; + $ctrl.type = urlParams[TYPE_KEY] || null;; } - function getApiTypeFromLocation() { - var apiFilter = $location.search()[API_TYPE_KEY]; - if (!apiFilter) { - return null; - } else if (!$ctrl.apiFilter || $ctrl.apiFilter.title != apiFilter) { - for (var i = 0, ii = $ctrl.apiTypes.length; i < ii; i++) { - if ($ctrl.apiTypes[i].title == apiFilter) { - return $ctrl.apiTypes[i]; - } - } + + // CHECK IF IT'S A CONSTANT TYPE + function isConst(item) { + var isConst = false; + + switch(item.docType) { + case 'let': isConst = true; break; + case 'var': isConst = true; break; + case 'const': isConst = true; break; + default: isConst = false; } - // If we get here then the apiType query didn't match any apiTypes - $location.search(API_TYPE_KEY, null); + + return isConst; } + + // FILTER SECTION & ITEMS LOOP + $ctrl.filterSections = function(section) { + var showSection = false; + + section.items.forEach(function(item) { + item.show = false; + + // CHECK IF TYPE IS NULL & STATUS, QUERY + if (($ctrl.type === null) && statusSelected(item) && queryEntered(section, item)) { + item.show = true; + } + + // CHECK IF TYPE IS SELECTED & STATUS, QUERY + if (($ctrl.type === item.docType) && statusSelected(item) && queryEntered(section, item)) { + item.show = true; + } + + // CHECK IF TYPE IS CONST & STATUS, QUERY + if (($ctrl.type === 'const') && isConst(item) && statusSelected(item) && queryEntered(section, item)) { + item.show = true; + } + + // SHOW SECTION IF ONE ITEM IS VISIBLE + if(!showSection && item.show) { + showSection = true; + } + }); + + return showSection; + } + + + // CHECK FOR QUERY + function queryEntered(section, item) { + var isVisible = false; + + // CHECK IF QUERY MATCH SECTION OR ITEM + var query = ($ctrl.query || '').toLowerCase(); + var matchesSection = $ctrl.query === '' || $ctrl.query === null || section.title.toLowerCase().indexOf($ctrl.query.toLowerCase()) !== -1; + var matchesTitle = !query || item.title.toLowerCase().indexOf(query) !== -1; + + // FILTER BY QUERY + if(matchesTitle || matchesSection) { + isVisible = true; + } + + return isVisible; + } + + + // CHECK IF AN API ITEM IS VISIBLE BY STATUS + function statusSelected(item) { + var status = item.stability; + var insecure = item.secure === 'false' ? false : true; + var isVisible = false; + + if($ctrl.status === null) { + isVisible = true; + } + + if(status === $ctrl.status) { + isVisible = true; + } + + if(($ctrl.status === 'security') && insecure) { + isVisible = true; + } + + return isVisible; + }; } }; }); \ No newline at end of file From 165c73b1dd021e425bb86c83ef6ba07abbffa2b3 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Fri, 7 Oct 2016 13:10:46 -0700 Subject: [PATCH 33/56] removed unused vars --- public/resources/js/directives/api-list.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/resources/js/directives/api-list.js b/public/resources/js/directives/api-list.js index 473511ffe8..5e65eefa70 100644 --- a/public/resources/js/directives/api-list.js +++ b/public/resources/js/directives/api-list.js @@ -10,9 +10,6 @@ */ angularIO.directive('apiList', function () { - var API_FILTER_KEY = 'apiFilter'; - var API_TYPE_KEY = 'apiType'; - var API_STATUS_KEY = 'statusType'; var QUERY_KEY = 'query'; var TYPE_KEY = 'type'; var STATUS_KEY = 'status'; From 2eec71cebb739334a63d0d1557dcdd3ed9e32c36 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Fri, 7 Oct 2016 13:13:36 -0700 Subject: [PATCH 34/56] more cleanup --- public/resources/js/directives/api-list.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/resources/js/directives/api-list.js b/public/resources/js/directives/api-list.js index 5e65eefa70..d74ee68e5b 100644 --- a/public/resources/js/directives/api-list.js +++ b/public/resources/js/directives/api-list.js @@ -130,8 +130,6 @@ angularIO.directive('apiList', function () { // TOGGLE MENU $ctrl.toggleMenu = function(kind) { - console.log(kind); - switch(kind) { case 'type': $ctrl.showTypeMenu = !$ctrl.showTypeMenu; ; break; case 'status': $ctrl.showStatusMenu = !$ctrl.showStatusMenu; ; break; @@ -170,7 +168,7 @@ angularIO.directive('apiList', function () { ); - // GET VALUES FORM URL + // GET VALUES FROM URL function getFilterValues() { var urlParams = $location.search(); From 49f11f7dc0cc11b875dcb400235189a2315214ca Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Fri, 7 Oct 2016 13:43:16 -0700 Subject: [PATCH 35/56] label update --- public/resources/js/directives/api-list.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/resources/js/directives/api-list.js b/public/resources/js/directives/api-list.js index d74ee68e5b..6e58260e34 100644 --- a/public/resources/js/directives/api-list.js +++ b/public/resources/js/directives/api-list.js @@ -20,9 +20,9 @@ angularIO.directive('apiList', function () { '