Merge branch 'master' of https://github.com/BorisYankov/DefinitelyTyped into handleExtraObjectLiteralProperties

angularjs/angular-mocks.d.ts

@@ -308,5 +308,6 @@ declare module angular {
 ///////////////////////////////////////////////////////////////////////////////
 // functions attached to global object (window)
 ///////////////////////////////////////////////////////////////////////////////
-declare var module: (...modules: any[]) => any;
+//Use `angular.mock.module` instead of `module`, as `module` conflicts with commonjs.
+//declare var module: (...modules: any[]) => any;
 declare var inject: angular.IInjectStatic;

bardjs/bardjs-tests.ts

@@ -39,7 +39,7 @@ module bardTests {
         var myService: MyService;
         var $rootScope: angular.IRootScopeService;
 
-        beforeEach(module(bard.$httpBackend, 'myModule'));
+        beforeEach(angular.mock.module(bard.$httpBackend, 'myModule'));
 
         beforeEach(inject(function(_myService_: MyService, _$rootScope_: angular.IRootScopeService) {
             myService = _myService_;
@@ -63,7 +63,7 @@ module bardTests {
     function test_$q() {
         var myService: MyService;
 
-        beforeEach(module(bard.$q, bard.$httpBackend, 'myModule'));
+        beforeEach(angular.mock.module(bard.$q, bard.$httpBackend, 'myModule'));
 
         beforeEach(inject(function(_myService_: MyService) {
             myService = _myService_;
@@ -139,7 +139,7 @@ module bardTests {
      * bard.fakeLogger
      */
     function test_fakeLogger() {
-        beforeEach(module('myModule', bard.fakeLogger));
+        beforeEach(angular.mock.module('myModule', bard.fakeLogger));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeLogger));
         ////
@@ -150,7 +150,7 @@ module bardTests {
      * bard.fakeRouteHelperProvider
      */
     function test_fakeRouteHelperProvider() {
-        beforeEach(module('myModule', bard.fakeRouteHelperProvider));
+        beforeEach(angular.mock.module('myModule', bard.fakeRouteHelperProvider));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeRouteHelperProvider));
         ////
@@ -161,7 +161,7 @@ module bardTests {
      * bard.fakeRouteProvider
      */
     function test_fakeRouteProvider() {
-        beforeEach(module('myModule', bard.fakeRouteProvider));
+        beforeEach(angular.mock.module('myModule', bard.fakeRouteProvider));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeRouteProvider));
         ////
@@ -172,7 +172,7 @@ module bardTests {
      * bard.fakeStateProvider
      */
     function test_fakeStateProvider() {
-        beforeEach(module('myModule', bard.fakeStateProvider));
+        beforeEach(angular.mock.module('myModule', bard.fakeStateProvider));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeStateProvider));
         ////
@@ -183,7 +183,7 @@ module bardTests {
      * bard.fakeToastr
      */
     function test_fakeToastr() {
-        beforeEach(module('myModule', bard.fakeToastr));
+        beforeEach(angular.mock.module('myModule', bard.fakeToastr));
         ////
         beforeEach(bard.appModule('myModule', bard.fakeToastr));
         ////

chui/chui-tests.ts

@@ -37,6 +37,7 @@ $(function() {
    $.UIGoToArticle("#main");
    $.UIGoBack();
    $.UIGoBackToArticle("#main");
+   $.UIEnableBrowserHashModification();
    $.UIBlock();
    $.UIBlock(.5);
    $.UIUnblock();

chui/chui.d.ts

@@ -1,8 +1,8 @@
-// Type definitions for chui v3.9.0
+// Type definitions for chui v3.9.1
 // Project: https://github.com/chocolatechipui/chocolatechip-ui
 // Definitions by: Robert Biggs <http://chocolatechip-ui.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// ChocolateChip-UI 3.9.0
+// ChocolateChip-UI 3.9.1
 /**
  These TypeScript delcarations for ChocolateChip-UI contain interfaces for both ChocolateChipJS and jQuery. Depending on which library you are using, you will get the type interfaces appropriate for it.
 */
@@ -89,6 +89,17 @@ interface ChocolateChipStatic {
    */
   isNavigating: boolean;
 
+  /**
+   * Tell ChocolateChip-UI to not modify window hash during navigation.
+   * The default value is false.
+   */
+  UIBrowserHashModification: boolean;
+
+  /**
+   * Method to tell ChocolateChip-UI to register navigation history on Window hash.
+   */
+  UIEnableBrowserHashModification(): void;
+
   /**
    * Navigate to the article indicated by the provided destination ID. This enters the destination into the navigation history array.
    *
@@ -784,6 +795,17 @@ interface JQueryStatic {
    */
   isNavigating: boolean;
 
+  /**
+   * Tell ChocolateChip-UI to not modify window hash during navigation.
+   * The default value is false.
+   */
+  UIBrowserHashModification: boolean;
+
+  /**
+   * Method to tell ChocolateChip-UI to register navigation history on Window hash.
+   */
+  UIEnableBrowserHashModification(): void;
+
   /**
    * Navigate to the article indicated by the provided destination ID. This enters the destination into the navigation history array.
    *
@@ -1014,6 +1036,54 @@ interface JQueryStatic {
    */
   UIUnBindData(controller?: string): void;
 
+  /**
+   * Object used to store string templates and parsed templates.
+   *
+   * @param string A string defining the template.
+   * @param string A label used to access an object's properties in the template. If none is provided it defaults to "data": [[= data.name]].
+   * @return void
+   */
+  templates: Object;
+
+  /**
+   * This method returns a parsed template.
+   *
+   */
+  template: {
+
+    /**
+     * This method parses a string and an optoinal variable name and returns a parsed template in the form of a function. You can then pass this function data to get rendered nodes.
+     *
+     * @param template A string of markup to use as a template.
+     * @param variable An option name to use in the template. If it were "myData": [[= myData.name]]. Otherwise it defaults to "data": [[= data.name]].
+     * @return A function.
+     */
+    (template: string, variable?: string): Function;
+
+    /**
+     * A method to repeated output a template.
+     *
+     * @param element The target container into which the content will be inserted.
+     * @param template A string of markup.
+     * @param data The iterable data the template will consume.
+     * @return void.
+     */
+    repeater: (element: JQuery, template: string, data: any) => void;
+
+    /**
+     * A object that holds the reference to the controller for a repeater.
+     * This is used to cache the data that a repeater uses. After the repeater is rendered, the reference is deleted from this object.
+     *
+     */
+    data: {
+        repeaterName?: any;
+    };
+  
+    /**
+     * Use this value to output an index value in a template repeater.
+     */
+    index: number;
+  };
 }
 
 /**

coffeeify/coffeeify-tests.ts

@@ -0,0 +1,15 @@
+/// <reference path="coffeeify.d.ts" />
+
+import coffeeify = require('coffeeify');
+
+coffeeify.sourceMap = false;
+
+var isCoffee = coffeeify.isCoffee('foo.coffee');
+var isLiterate = coffeeify.isLiterate('bar.coffee');
+coffeeify.compile('out.js', 'console.log 42', (err, compiled) => {
+    console.log(err);
+    console.log(compiled);
+});
+
+coffeeify('test.coffee').end();
+

coffeeify/coffeeify.d.ts

@@ -0,0 +1,37 @@
+// Type definitions for coffeeify
+// Project: https://github.com/jnordberg/coffeeify
+// Definitions by: Qubo <https://github.com/tkQubo>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../through/through.d.ts" />
+
+declare module "coffeeify" {
+    import through = require('through');
+
+    namespace coffeeify {
+        interface Coffeeify {
+            isCoffee(file: string): boolean;
+            isLiterate(file: string): boolean;
+            sourceMap: boolean;
+            compile(file: string, data: string, callback: Callback): void;
+            (file: string): through.ThroughStream;
+        }
+
+        interface Callback {
+            (error: ParseError, compiled: string): void;
+        }
+
+        interface ParseError extends SyntaxError {
+            new(error: any, src: string, file: string): ParseError;
+            message: string;
+            line: number;
+            column: number;
+            annotated: string;
+        }
+    }
+
+    var coffeeify: coffeeify.Coffeeify;
+
+    export = coffeeify;
+}
+

easeljs/easeljs.d.ts

@@ -925,7 +925,7 @@ declare module createjs {
         static framerate: number;
         static interval: number;
         static maxDelta: number;
-        static paused: number;
+        static paused: boolean;
         static RAF: string;
         static RAF_SYNCHED: string;
         static TIMEOUT: string;

fabricjs/fabricjs.d.ts

@@ -4149,37 +4149,41 @@ declare module fabric {
     requestAnimFrame(callback: Function): void;
   }
 
+  interface IUtilAminEaseFunction {
+    (t: number, b: number, c: number, d: number): number;
+  }
+
   interface IUtilAnimEase {
-    easeInBack(): Function;
-    easeInBounce(): Function;
-    easeInCirc(): Function;
-    easeInCubic(): Function;
-    easeInElastic(): Function;
-    easeInExpo(): Function;
-    easeInOutBack(): Function;
-    easeInOutBounce(): Function;
-    easeInOutCirc(): Function;
-    easeInOutCubic(): Function;
-    easeInOutElastic(): Function;
-    easeInOutExpo(): Function;
-    easeInOutQuad(): Function;
-    easeInOutQuart(): Function;
-    easeInOutQuint(): Function;
-    easeInOutSine(): Function;
-    easeInQuad(): Function;
-    easeInQuart(): Function;
-    easeInQuint(): Function;
-    easeInSine(): Function;
-    easeOutBack(): Function;
-    easeOutBounce(): Function;
-    easeOutCirc(): Function;
-    easeOutCubic(): Function;
-    easeOutElastic(): Function;
-    easeOutExpo(): Function;
-    easeOutQuad(): Function;
-    easeOutQuart(): Function;
-    easeOutQuint(): Function;
-    easeOutSine(): Function;
+    easeInBack: IUtilAminEaseFunction;
+    easeInBounce: IUtilAminEaseFunction;
+    easeInCirc: IUtilAminEaseFunction;
+    easeInCubic: IUtilAminEaseFunction;
+    easeInElastic: IUtilAminEaseFunction;
+    easeInExpo: IUtilAminEaseFunction;
+    easeInOutBack: IUtilAminEaseFunction;
+    easeInOutBounce: IUtilAminEaseFunction;
+    easeInOutCirc: IUtilAminEaseFunction;
+    easeInOutCubic: IUtilAminEaseFunction;
+    easeInOutElastic: IUtilAminEaseFunction;
+    easeInOutExpo: IUtilAminEaseFunction;
+    easeInOutQuad: IUtilAminEaseFunction;
+    easeInOutQuart: IUtilAminEaseFunction;
+    easeInOutQuint: IUtilAminEaseFunction;
+    easeInOutSine: IUtilAminEaseFunction;
+    easeInQuad: IUtilAminEaseFunction;
+    easeInQuart: IUtilAminEaseFunction;
+    easeInQuint: IUtilAminEaseFunction;
+    easeInSine: IUtilAminEaseFunction;
+    easeOutBack: IUtilAminEaseFunction;
+    easeOutBounce: IUtilAminEaseFunction;
+    easeOutCirc: IUtilAminEaseFunction;
+    easeOutCubic: IUtilAminEaseFunction;
+    easeOutElastic: IUtilAminEaseFunction;
+    easeOutExpo: IUtilAminEaseFunction;
+    easeOutQuad: IUtilAminEaseFunction;
+    easeOutQuart: IUtilAminEaseFunction;
+    easeOutQuint: IUtilAminEaseFunction;
+    easeOutSine: IUtilAminEaseFunction;
   }
 
   interface IUtilArc {

loglevel/loglevel.d.ts

@@ -98,5 +98,4 @@ declare module loglevel {
 	export function noConflict():any;
 }
 
-declare
-var log:typeof loglevel;
+declare var log:typeof loglevel;

mousetrap/mousetrap-global-bind-tests.ts

@@ -1,14 +1,14 @@
 /// <reference path="mousetrap-global-bind.d.ts"/>
 
-Mousetrap.globalBind('4', function() { console.log('4'); });
-Mousetrap.globalBind("?", function() { console.log('show shortcuts!'); });
-Mousetrap.globalBind('esc', function() { console.log('escape'); }, 'keyup');
+Mousetrap.bindGlobal('4', function() { console.log('4'); });
+Mousetrap.bindGlobal("?", function() { console.log('show shortcuts!'); });
+Mousetrap.bindGlobal('esc', function() { console.log('escape'); }, 'keyup');
 
 // combinations
-Mousetrap.globalBind('command+shift+K', function() { console.log('command shift k'); });
+Mousetrap.bindGlobal('command+shift+K', function() { console.log('command shift k'); });
 
 // map multiple combinations to the same callback
-Mousetrap.globalBind(['command+k', 'ctrl+k'], function() {
+Mousetrap.bindGlobal(['command+k', 'ctrl+k'], function() {
     console.log('command k or control k');
 
     // return false to prevent default browser behavior
@@ -17,15 +17,15 @@ Mousetrap.globalBind(['command+k', 'ctrl+k'], function() {
 });
 
 // gmail style sequences
-Mousetrap.globalBind('g i', function() { console.log('go to inbox'); });
-Mousetrap.globalBind('* a', function() { console.log('select all'); });
+Mousetrap.bindGlobal('g i', function() { console.log('go to inbox'); });
+Mousetrap.bindGlobal('* a', function() { console.log('select all'); });
 
 // konami code!
-Mousetrap.globalBind('up up down down left right left right b a enter', function() {
+Mousetrap.bindGlobal('up up down down left right left right b a enter', function() {
     console.log('konami code');
 });
 
-Mousetrap.globalBind(['ctrl+s', 'meta+s'], (e, combo) => {
+Mousetrap.bindGlobal(['ctrl+s', 'meta+s'], (e, combo) => {
     if (e.preventDefault) {
         e.preventDefault();
     } else {

mousetrap/mousetrap-global-bind.d.ts

@@ -6,6 +6,6 @@
 /// <reference path="./mousetrap.d.ts" />
 
 interface MousetrapStatic {
-    globalBind(keys: string, callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
-    globalBind(keyArray: string[], callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
+    bindGlobal(keys: string, callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
+    bindGlobal(keyArray: string[], callback: (e: ExtendedKeyboardEvent, combo: string) => any, action?: string): void;
 }

pixi.js/pixi.js.d.ts

@@ -762,7 +762,7 @@ declare module PIXI {
         fragmentSrc: string;
 
         init(): void;
-        cachUniformLocations(keys: string): void;
+        cacheUniformLocations(keys: string): void;
         cacheAttributeLocations(keys: string): void;
         compile(): WebGLProgram;
         syncUniform(uniform: any): void;

through/through.d.ts

@@ -8,7 +8,7 @@
 declare module "through" {
 	import stream = require("stream");
 
-	function through(write?: (data) => void,
+	function through(write?: (data: any) => void,
 		end?: () => void,
 		opts?: {
 			autoDestroy: boolean;
@@ -21,4 +21,4 @@ declare module "through" {
 	}
 
 	export = through;
-}
+}

vortex-web-client/vortex-web-client.d.ts

@@ -482,7 +482,4 @@ declare module DDS {
  * Defines the core Vortex-Web-Client javascript library. It includes the JavaScript API for DDS. This API allows
  * web applications to share data among them as well as with native DDS applications.
  */
-declare
-var dds:typeof DDS;
-
-
+declare var dds:typeof DDS;