implab/implabjs-djx Commit - r22:a1ab2b5975ad

Switched to dojo-typings...

cin -

r22:a1ab2b5975ad v1.0.0-rc10 default

parent child

Context file:

r22:a1ab2b5975ad

build.gradle +3 -3

             configureTsMain {
                 compilerOptions {
-                    baseUrl = "$projectDir/src"
+                    /*baseUrl = "$projectDir/src"
                     paths = [
                         "dojo/*" : [ "typings/dojo/*" ],
                         "dijit/*" : [ "typings/dijit/*" ]
+                    ]*/
-                    types = ["requirejs", "$projectDir/src/typings/dojo/index" /*, "dojo-typings"*/]
+                    types = ["requirejs", "dojo-typings"]
                 }
             }

src/main/ts/tsx/BuildContextBase.ts +2 -2

             import dom = require("dojo/dom-construct");
-            export abstract class BuildContextBase implements BuildContext {
+            export abstract class BuildContextBase<TNode extends Node> implements BuildContext<TNode> {
                 _attrs = {};
                 _children = new Array();
                     }
                 }
-                abstract _getDomNode(): Node;
+                abstract _getDomNode(): TNode;
                 ensureCreated() {
                     if (!this._created) {

src/main/ts/tsx/DjxWidgetBase.ts +2 -3

             import _AttachMixin = require("dijit/_AttachMixin");
             import { BuildContext, isNode } from "./traits";
             import registry = require("dijit/registry");
-            import { Handle } from "dojo/interfaces";
             // type Handle = dojo.Handle;
                     super.buildRendering();
                 }
-                abstract render(): BuildContext;
+                abstract render(): BuildContext<HTMLElement>;
                 _processTemplateNode<T extends (Element | Node | _WidgetBase)>(
                     baseNode: T,
                     getAttrFunc: (baseNode: T, attr: string) => string,
                     // tslint:disable-next-line: ban-types
-                    attachFunc: (node: T, type: string, func?: Function) => Handle
+                    attachFunc: (node: T, type: string, func?: Function) => dojo.Handle
                 ): boolean {
                     if (isNode(baseNode)) {
                         const w = registry.byNode(baseNode);

src/main/ts/tsx/HtmlElementContext.ts +1 -1

             import { argumentNotEmptyString } from "@implab/core-amd/safe";
             import { BuildContextBase } from "./BuildContextBase";
-            export class HtmlElementContext extends BuildContextBase {
+            export class HtmlElementContext extends BuildContextBase<HTMLElement> {
                 elementType: string;
                 _element: HTMLElement | undefined;

src/main/ts/tsx/WidgetContext.ts +1 -1

             export type _WidgetCtor = new (attrs: any, srcNode?: string | Node) => _Widget;
-            export class WidgetContext extends BuildContextBase {
+            export class WidgetContext extends BuildContextBase<Node> {
                 widgetClass: _WidgetCtor;
                 _instance: _Widget | undefined;

src/main/ts/tsx/traits.ts +2 -2

             export type DojoNodePosition = "first" | "after" | "before" | "last" | "replace" | "only" | number;
-            export interface BuildContext {
+            export interface BuildContext<TNode extends Node = Node> {
-                getDomNode(): Node;
+                getDomNode(): TNode;
                 placeAt(refNode: string | Node, position?: DojoNodePosition): void;
             }

src/main/tsconfig.json +1 -6

             {
                 "extends": "../tsconfig",
                 "compilerOptions": {
-                    "baseUrl": "../",
                     "rootDir": "ts",
                     "rootDirs": [
                         "ts",
                         "typings"
                     ],
-                    "paths" : {
-                        "dojo/*" : [ "typings/dojo/*" ],
-                        "dijit/*" : [ "typings/dijit/*" ]
-                    },
                     "types": [
-                        "requirejs", "./typings/index", "../typings/dojo/index"
+                        "requirejs", "./typings/index", "dojo-typings"
                     ]
                 }
             }

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

             import { Handle } from "dojo/interfaces";
             import _WidgetBase = require("./_WidgetBase");
-            import declare = require("dojo/_base/declare");
+            import dojo = require("dojo/_base/kernel");
-            import dojo = require("dojo/_base/html");
             declare module "./_WidgetBase" {
                 interface _WidgetBase {

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

             import Destroyable = require("./Destroyable");
             import { ExtensionEvent } from "dojo/on";
             import { NodeFragmentOrString, Handle, NodeOrString, WatchHandle } from "dojo/interfaces";
+            import dojo = require("dojo/_base/kernel");
             declare namespace _WidgetBase {
                 interface _WidgetBase extends Stateful, Destroyable {
                     defer(fcn: Function, delay?: number): Handle;
                 }
-                interface _WidgetBaseConstructor<W = _WidgetBase> extends DeclareConstructor<W> {
+                interface _WidgetBaseConstructor<W = _WidgetBase> extends dojo._base.DeclareConstructor<W> {
                     new(params: Object, srcNodeRef?: NodeOrString): W;
                 }

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