Merge branch 'master' into rename-repo-url

kineticjs/kineticjs-tests.ts

@@ -1,7 +1,7 @@
 /// <reference path="kineticjs.d.ts"/>
 
 // http://www.html5canvastutorials.com/kineticjs/html5-canvas-kineticjs-rect-tutorial/
-module RectTutorial {
+namespace RectTutorial {
     var stage = new Kinetic.Stage({
         container: 'container',
         width: 578,
@@ -28,7 +28,7 @@ module RectTutorial {
 }
 
 // http://www.html5canvastutorials.com/kineticjs/html5-canvas-kineticjs-circle-tutorial/
-module CircleTutorial {
+namespace CircleTutorial {
     var stage = new Kinetic.Stage({
         container: 'container',
         width: 578,

kineticjs/kineticjs.d.ts

@@ -3,7 +3,7 @@
 // Definitions by: Basarat Ali Syed <http://www.github.com/basarat>, Ralph de Ruijter <http://www.superdopey.nl/techblog/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module Kinetic {
+declare namespace Kinetic {
 
     var Node: {
         new (config: ObjectOptionsConfig): INode;
@@ -57,7 +57,7 @@ declare module Kinetic {
         rotate(theta: number): void;
         rotateDeg(deg: number): void;
 
-        // Events 
+        // Events
         on(typesStr: string, handler: (data: any) => any): void;
         off(typesStr: string): void;
         fire(typeStr: string, event?: any, bubble?: boolean): any;
@@ -95,7 +95,7 @@ declare module Kinetic {
         getHeight(): any;
         setHeight(height: number): any;
 
-        // id 
+        // id
         id(): string;
         id(id: string): void;
         getId(): string;