implab/implabjs-djx Commit - r21:b1e622a3b266

Compatibility with dojo-typings package

cin -

r21:b1e622a3b266 default

parent child

Context file:

r21:b1e622a3b266

src/main/ts/declare.ts +2 -1

             import declare = require("dojo/_base/declare");
             import { each } from "@implab/core-amd/safe";
             import { Constructor } from "@implab/core-amd/interfaces";
+            import dojo = require("dojo/_base/kernel");
             // declare const declare: any;
-            type DeclareConstructor<T> = declare.DeclareConstructor<T>;
+            type DeclareConstructor<T> = dojo._base.DeclareConstructor<T>;
             export interface AbstractConstructor<T = {}> {
                 prototype: T;

src/typings/dijit/_AttachMixin.d.ts +2 -1

             import { Handle } from "dojo/interfaces";
             import _WidgetBase = require("./_WidgetBase");
             import declare = require("dojo/_base/declare");
+            import dojo = require("dojo/_base/html");
             declare module "./_WidgetBase" {
                 interface _WidgetBase {
                 destroyRendering(preserveDom?: boolean): void;
             }
-            interface _AttachMixinConstructor extends declare.DeclareConstructor<_AttachMixin> { }
+            interface _AttachMixinConstructor extends dojo._base.DeclareConstructor<_AttachMixin> { }
             declare const _AttachMixin: _AttachMixinConstructor;
             export = _AttachMixin;

src/typings/dojo/_base/declare.d.ts +8 -4

+            import dojo = require("./kernel");
             declare module "./kernel" {
                 interface Dojo {
-                    declare: declare.Declare;
+                    declare: dojo._base.Declare;
                     safeMixin: typeof declare.safeMixin;
                 }
-            declare namespace declare {
+                namespace _base {
                     interface DeclareCreatedObject {
                         declaredClass: string;
                     }
                 }
-            declare const declare: declare.Declare;
+            declare const declare: dojo._base.Declare;
             export = declare;

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages