kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-24 05:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/types-2.0' into types2.0

Browse Source 
# Conflicts:
#	electron/github-electron.app.d.ts
#	electron/github-electron.auto-updater.d.ts
#	electron/github-electron.browser-window.d.ts
#	electron/github-electron.clipboard.d.ts
#	electron/github-electron.content-tracing.d.ts
#	electron/github-electron.crash-reporter.d.ts
#	electron/github-electron.desktop-capturer.d.ts
#	electron/github-electron.dialog.d.ts
#	electron/github-electron.dom.d.ts
#	electron/github-electron.event-emitter.d.ts
#	electron/github-electron.global-shortcut.d.ts
#	electron/github-electron.ipc-main.d.ts
#	electron/github-electron.ipc-renderer.d.ts
#	electron/github-electron.menu-item.d.ts
#	electron/github-electron.menu.d.ts
#	electron/github-electron.native-image.d.ts
#	electron/github-electron.power-monitor.d.ts
#	electron/github-electron.power-save-blocker.d.ts
#	electron/github-electron.protocol.d.ts
#	electron/github-electron.remote.d.ts
#	electron/github-electron.screen.d.ts
#	electron/github-electron.session.d.ts
#	electron/github-electron.shell.d.ts
#	electron/github-electron.tray.d.ts
#	electron/github-electron.web-contents.d.ts
#	electron/github-electron.web-frame.d.ts
This commit is contained in:
Ryan Cavanaugh
2016-04-08 12:47:22 -07:00
parent 4f7524fc65 ec9eb4b28c
commit 0e9df16001
59 changed files with 5271 additions and 5067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
angularjs/angular-animate.d.ts vendored
View File

@@ -287,9 +287,11 @@ declare namespace angular.animate {
interface IAnimateCssService {
(element: JQuery, animateCssOptions: IAnimationOptions): IAnimateCssRunner;
}
}
declare module angular {
interface IModule {
animation(name: string, animationFactory: IAnimateFactory): IModule;
animation(name: string, animationFactory: angular.animate.IAnimateFactory): IModule;
animation(name: string, inlineAnnotatedFunction: any[]): IModule;
animation(object: Object): IModule;
}