wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-11 11:50:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'request-promise' of https://github.com/joeskeen/DefinitelyTyped; branch 'master' of https://github.com/borisyankov/DefinitelyTyped into request-promise

Browse Source 
* 'request-promise' of https://github.com/joeskeen/DefinitelyTyped:

# By Ilya Mochalov (83) and others
# Via Masahiro Wakame (243) and others
* 'master' of https://github.com/borisyankov/DefinitelyTyped: (473 commits)
  provide the explicit types in geolocation-tests to make the build happy
  in ng-cordova files correct the conventions for multiple authors
  add the ngCordova type definitions for network,deviceOrientation,deviceMotion, appAvailability,geolocation,emailComposer and dialogs
  lodash: signatures of the method _.forEach have been changed
  lodash: signatures of the method _.some have been changed
  lodash: signatures of the method _.compact have been changed
  lodash: signatures of the method _.startsWith have been changed
  lodash: signatures of the method _.callback have been changed
  Add delegate and undelegate methods to View
  Updated net.connect, combined url.Url and url.UrlOptions.
  fix angularjs/angular-resource.d.ts
  Added definition for inline-css
  rename the folder from ngCordova to follow the convention similar to bower & npm
  lodash: signatures of the method _.map changed
  added missing declaration for optional dynamicHash property on DurandalRelativeRouteSettings to support TypeScript 1.6 tightened compilation rules
  lodash: signatures of the method _.padLeft have been changed
  lodash: signatures of the method _.snakeCase have been changed
  lodash: signatures of the method _.propertyOf have been changed
  lodash: signatures of the method _.parseInt have been changed
  lodash: signatures of the method _.matchesProperty have been changed
  ...

Conflicts:
	request-promise/request-promise.d.ts
	request/request.d.ts
This commit is contained in:
Joe Skeen
2015-11-04 10:43:58 -07:00
parent 2d23048aa0 001ca36ba5
commit 0d92319be4
380 changed files with 69196 additions and 40809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
request-promise/request-promise.d.ts
Vendored
+2 -2
View File
@@ -10,7 +10,7 @@
declare module 'request-promise' {
import request = require('request');
import http = require('http');
import http = require('http');
interface RequestPromise extends request.Request {
then(onFulfilled: Function, onRejected?: Function): Promise<any>;
@@ -19,7 +19,7 @@ declare module 'request-promise' {
promise(): Promise<any>;
}
interface RequestPromiseOptions extends request.Options {
interface RequestPromiseOptions extends request.OptionalOptions {
simple?: boolean;
transform?: (body: any, response: http.IncomingMessage) => any;
resolveWithFullResponse?: boolean;