implab/implabjs-dojo-typings Commit - r2:1e22cac2aaf4

Added events map support to _WidgetBase, corrected attributes map support in _WidgetBase

cin -

r2:1e22cac2aaf4 v1.0.0-rc1 default

parent child

Context file:

r2:1e22cac2aaf4

Collapse all files

dojo-typings/src/test/typings/traits.d.ts created 644 +25 0

			@@ -0,0 +1,25
		1	import * as _WidgetBase from "dijit/_WidgetBase";
		2	import * as Stateful from "dojo/Stateful";
		3
		4	export interface IRemovable {
		5	remove(): void;
		6	}
		7
		8	type StatefulAttrs<T> = T extends Stateful<infer A> ? A : never;
		9
		10	interface WatchFn {
		11	<T extends Stateful, K extends keyof StatefulAttrs<T>>(
		12	target: T,
		13	prop: K,
		14	render: (model: StatefulAttrs<T>[K]) => any,
		15	own?: (obj: IRemovable) => void
		16	);
		17	<W extends _WidgetBase, K extends keyof W>(
		18	target: W,
		19	prop: K,
		20	render: (model: W[K]) => any,
		21	own?: (obj: IRemovable) => void
		22	);
		23	}
		24
		25	export declare const watch: WatchFn;

dojo-typings/src/main/typings/dijit/dijit.d.ts +100 -23

              /// <reference path="../dojo/index.d.ts" />
              /// <reference path="form.d.ts" />
              /// <reference path="layout.d.ts" />
              declare namespace dijit {
-             	/* Global Dijit Interface */
-             	interface Dijit { }
-             	/* dijit/_AttachMixin */
-             	/* tslint:disable:class-name */
-             	interface _WidgetBase {
-             		dojoAttachEvent: string;
-             		dojoAttachPoint: string;
              	}
-             	interface _AttachMixin {
              		/**
-             		 * List of widget attribute names associated with data-dojo-attach-point=... in the template, ex: ["containerNode", "labelNode"]
              		 */
-             		_attachPoints: string[];
              		/**
-             		 * List of connections associated with data-dojo-attach-event=... in the template
              		 */
-             		_attachEvents: dojo.Handle[];
              		/**
-             		 * Object to which attach points and events will be scoped.  Defaults to 'this'.
              		 */
-             		attachScope: any;
              		/**
-             		 * Search descendants of this.containerNode for data-dojo-attach-point and data-dojo-attach-event.
              		 *
-             		 * Should generally be left false (the default value) both for performance and to avoid failures when this.containerNode holds other _AttachMixin instances with their own attach points and events.
              		 */
-             		searchContainerNode: boolean;
              		/**
-             		 * Attach to DOM nodes marked with special attributes.
              		 */
-             		buildRendering(): void;
              		/**
-             		 * hook for _WidgetsInTemplateMixin
              		 */
-             		_beforeFillContent(): void;
              		/**
-             		 * Iterate through the dom nodes and attach functions and nodes accordingly.
              		 *
-             		 * Map widget properties and functions to the handlers specified in the dom node and it's descendants. This function iterates over all nodes and looks for these properties:
-             		 * - dojoAttachPoint/data-dojo-attach-point
-             		 * - dojoAttachEvent/data-dojo-attach-event
              		 */
-             		_attachTemplateNodes(rootNode: Element | Node): void;
              		/**
-             		 * Process data-dojo-attach-point and data-dojo-attach-event for given node or widget.
              		 *
-             		 * Returns true if caller should process baseNode's children too.
              		 */
-             		_processTemplateNode<T extends (Element | Node | _WidgetBase)>(
-             			baseNode: T,
-             			getAttrFunc: (baseNode: T, attr: string) => string,
-             			attachFunc: (node: T, type: string, func?: Function) => dojo.Handle
-             		): boolean;
              		/**
-             		 * Roughly corresponding to dojo/on, this is the default function for processing a data-dojo-attach-event.  Meant to attach to DOMNodes, not to widgets.
              		 */
-             		_attach(node: Element | Node, type: string, func?: Function): dojo.Handle;
              		/**
-             		 * Detach and clean up the attachments made in _attachtempalteNodes.
              		 */
-             		_detachTemplateNodes(): void;
-             		destroyRendering(preserveDom?: boolean): void;
              	}
-             	interface _AttachMixinConstructor extends dojo._base.DeclareConstructor<_AttachMixin> { }
-             	/* dijit/_BidiMixin */
-             	interface _WidgetBase {
              		/**
-             		 * Gets the right direction of text.
              		 */
-             		getTextDir(text: string): string;
              		/**
-             		 * Set element.dir according to this.textDir, assuming this.textDir has a value.
              		 */
-             		applyTextDir(element: HTMLElement, text?: string): void;
              		/**
-             		 * Wraps by UCC (Unicode control characters) option's text according to this.textDir
              		 */
-             		enforceTextDirWithUcc(option: HTMLOptionElement, text: string): string;
              		/**
-             		 * Restores the text of origObj, if needed, after enforceTextDirWithUcc, e.g. set("textDir", textDir).
              		 */
-             		restoreOriginalText(origObj: HTMLOptionElement): HTMLOptionElement;
              	}
-             	/* dijit/_ConfirmDialogMixin */
-             	interface _ConfirmDialogMixin extends _WidgetsInTemplateMixin {
              		/**
-             		 * HTML snippet for action bar, overrides _DialogMixin.actionBarTemplate
              		 */
-             		actionBarTemplate: string;
              		/**
-             		 * Label of OK button.
              		 */
-             		buttonOk: string;
              		/**
-             		 * Label of cancel button.
              		 */
-             		buttonCancel: string;
              	}
-             	/* dijit/_Contained */
-             	interface _Contained {
              		/**
-             		 * Returns the previous child of the parent or null if this is the
-             		 * first child of the parent.
              		 */
-             		getPreviousSibling<T extends _WidgetBase>(): T;
              		/**
-             		 * Returns the next child of the parent or null if this is the last
-             		 * child of the parent.
              		 */
-             		getNextSibling<T extends _WidgetBase>(): T;
              		/**
-             		 * Returns the index of this widget within its container parent.
-             		 * It returns -1 if the parent does not exist or if the parent is
-             		 * not a dijit/_Container.
              		 */
-             		getIndexInParent(): number;
              	}
-             	interface _ContainedConstructor extends dojo._base.DeclareConstructor<_Contained> { }
-             	/* dijit/_Container */
-             	interface _Container {
-             		buildRendering(): void;
              		/**
-             		 * Makes the given widget a child of this widget.
              		 */
-             		addChild<T extends _WidgetBase>(widget: T, insertIndex?: number): void;
              		/**
-             		 * Removes the passed widget instance from this widget but does
-             		 * not destroy it.  You can also pass in an integer indicating
-             		 * the index within the container to remove (ie, removeChild(5) removes the sixth widget)
              		 */
-             		removeChild<T extends _WidgetBase>(widget: T): void;
-             		removeChild<T extends number>(widget: number): void;
              		/**
-             		 * Returns true if widget has child widgets, i.e. if this.containerNode contains widgets.
              		 */
-             		hasChildren(): boolean;
              		/**
-             		 * Gets the index of the child in this container or -1 if not found
              		 */
-             		getIndexOfChild<T extends _WidgetBase>(widget: T): number;
              	}
-             	interface _ContainerConstructor extends dojo._base.DeclareConstructor<_Container> { }
-             	/* dijit/_CssStateMixin */
-             	interface CSSStateNodes {
-             		[node: string]: string;
              	}
-             	interface _CssStateMixin {
              		/**
-             		 * True if cursor is over this widget
              		 */
-             		hovering: boolean;
              		/**
-             		 * True if mouse was pressed while over this widget, and hasn't been released yet
              		 */
-             		active: boolean;
              	}
-             	interface _CssStateMixinConstructor extends dojo._base.DeclareConstructor<_CssStateMixin> { }
-             	/* dijit/_DialogMixin */
-             	interface _DialogMixin {
              		/**
-             		 * HTML snippet to show the action bar (gray bar with OK/cancel buttons).
-             		 * Blank by default, but used by ConfirmDialog/ConfirmTooltipDialog subclasses.
              		 */
-             		actionBarTemplate: string;
              		/**
-             		 * Callback when the user hits the submit button.
-             		 * Override this method to handle Dialog execution.
              		 */
-             		execute(formContents?: any): void;
              		/**
-             		 * Called when user has pressed the Dialog's cancel button, to notify container.
              		 */
-             		onCancel(): void;
              		/**
-             		 * Called when user has pressed the dialog's OK button, to notify container.
              		 */
-             		onExecute(): void;
              	}
-             	/* dijit/_FocusMixin */
-             	interface _FocusMixin { }
-             	interface _WidgetBase {
              		/**
-             		 * Called when the widget becomes "active" because
-             		 * it or a widget inside of it either has focus, or has recently
-             		 * been clicked.
              		 */
-             		onFocus(): void;
              		/**
-             		 * Called when the widget stops being "active" because
-             		 * focus moved to something outside of it, or the user
-             		 * clicked somewhere outside of it, or the widget was
-             		 * hidden.
              		 */
-             		onBlur(): void;
              	}
-             	/* dijit/_HasDropDown */
-             	interface _HasDropDown<T extends _WidgetBase> extends _FocusMixin {
              		/**
-             		 * The button/icon/node to click to display the drop down.
-             		 * Can be set via a data-dojo-attach-point assignment.
-             		 * If missing, then either focusNode or domNode (if focusNode is also missing) will be used.
              		 */
-             		_buttonNode: HTMLElement;
              		/**
-             		 * Will set CSS class dijitUpArrow, dijitDownArrow, dijitRightArrow etc. on this node depending
-             		 * on where the drop down is set to be positioned.
-             		 * Can be set via a data-dojo-attach-point assignment.
-             		 * If missing, then _buttonNode will be used.
              		 */
-             		_arrowWrapperNode: HTMLElement;
              		/**
-             		 * The node to set the aria-expanded class on.
-             		 * Also sets popupActive class but that will be removed in 2.0.
-             		 * Can be set via a data-dojo-attach-point assignment.
-             		 * If missing, then focusNode or _buttonNode (if focusNode is missing) will be used.
              		 */
-             		_popupStateNode: HTMLElement;
              		/**
-             		 * The node to display the popup around.
-             		 * Can be set via a data-dojo-attach-point assignment.
-             		 * If missing, then domNode will be used.
              		 */
-             		_aroundNode: HTMLElement;
              		/**
-             		 * The widget to display as a popup.  This widget *must* be
-             		 * defined before the startup function is called.
              		 */
-             		dropDown: T;
              		/**
-             		 * Set to true to make the drop down at least as wide as this
-             		 * widget.  Set to false if the drop down should just be its
-             		 * default width.
              		 */
-             		autoWidth: boolean;
              		/**
-             		 * Set to true to make the drop down exactly as wide as this
-             		 * widget.  Overrides autoWidth.
              		 */
-             		forceWidth: boolean;
              		/**
-             		 * The max height for our dropdown.
-             		 * Any dropdown taller than this will have scrollbars.
-             		 * Set to 0 for no max height, or -1 to limit height to available space in viewport
              		 */
-             		maxHeight: number;
              		/**
-             		 * This variable controls the position of the drop down.
-             		 * It's an array of strings
              		 */
-             		dropDownPosition: string[];
-             		/* TODO remove for TS 1.8 */
-             		/* dropDownPosition: ('before' | 'after' | 'above' | 'below')[]; */
              		/**
-             		 * When set to false, the click events will not be stopped, in
-             		 * case you want to use them in your subclass
              		 */
-             		_stopClickEvents: boolean;
              		/**
-             		 * Callback when the user mousedown/touchstart on the arrow icon.
              		 */
-             		_onDropDownMouseDown(e: MouseEvent): void;
              		/**
-             		 * Callback on mouseup/touchend after mousedown/touchstart on the arrow icon.
-             		 * Note that this function is called regardless of what node the event occurred on (but only after
-             		 * a mousedown/touchstart on the arrow).
              		 */
-             		_onDropDownMouseUp(e?: MouseEvent): void;
              		/**
-             		 * The drop down was already opened on mousedown/keydown; just need to stop the event
              		 */
-             		_onDropDownClick(e: MouseEvent): void;
-             		buildRendering(): void;
-             		postCreate(): void;
-             		destroy(preserveDom?: boolean): void;
              		/**
-             		 * Returns true if the dropdown exists and it's data is loaded.  This can
-             		 * be overridden in order to force a call to loadDropDown().
              		 */
-             		isLoaded(): boolean;
              		/**
-             		 * Creates the drop down if it doesn't exist, loads the data
-             		 * if there's an href and it hasn't been loaded yet, and then calls
-             		 * the given callback.
              		 */
-             		loadDropDown(loadCallback: () => void): void;
              		/**
-             		 * Creates the drop down if it doesn't exist, loads the data
-             		 * if there's an href and it hasn't been loaded yet, and
-             		 * then opens the drop down.  This is basically a callback when the
-             		 * user presses the down arrow button to open the drop down.
              		 */
-             		loadAndOpenDropDown(): dojo.Deferred<T>;
              		/**
-             		 * Callback when the user presses the down arrow button or presses
-             		 * the down arrow key to open/close the drop down.
-             		 * Toggle the drop-down widget; if it is up, close it, if not, open it
              		 */
-             		toggleDropDown(): void;
              		/**
-             		 * Opens the dropdown for this widget.   To be called only when this.dropDown
-             		 * has been created and is ready to display (ie, it's data is loaded).
              		 */
-             		openDropDown(): PlaceLocation;
              		/**
-             		 * Closes the drop down on this widget
              		 */
-             		closeDropDown(focus?: boolean): void;
              	}
-             	/* dijit/_OnDijitClickMixin */
-             	interface _OnDijitClickMixin {
              		/**
-             		 * override _WidgetBase.connect() to make this.connect(node, "ondijitclick", ...) work
              		 */
-             		connect(obj: any, event: string | dojo.ExtensionEvent, method: string | dojo.EventListener): dojo.WatchHandle;
              	}
-             	interface _OnDijitClickMixinConstructor {
              		/**
-             		 * Deprecated.   New code should access the dijit/a11yclick event directly, ex:
-             		 * |	this.own(on(node, a11yclick, function(){ ... }));
              		 *
-             		 * Mixing in this class will make _WidgetBase.connect(node, "ondijitclick", ...) work.
-             		 * It also used to be necessary to make templates with ondijitclick work, but now you can just require
-             		 * dijit/a11yclick.
              		 */
-             		new (): _OnDijitClickMixin;
-             		a11yclick: A11yClick;
              	}
-             	/* dijit/_TemplatedMixin */
-             	interface _TemplatedMixin extends _AttachMixin {
              		/**
-             		 * A string that represents the widget template.
-             		 * Use in conjunction with dojo.cache() to load from a file.
              		 */
-             		templateString: string;
              		/**
-             		 * Path to template (HTML file) for this widget relative to dojo.baseUrl.
-             		 * Deprecated: use templateString with require([... "dojo/text!..."], ...) instead
              		 */
-             		templatePath: string;
              		/**
-             		 * Set _AttachMixin.searchContainerNode to true for back-compat for widgets that have data-dojo-attach-point's
-             		 * and events inside this.containerNode.   Remove for 2.0.
              		 */
-             		searchContainerNode: boolean;
              		/**
-             		 * Construct the UI for this widget from a template, setting this.domNode.
              		 */
-             		buildRendering(): void;
              	}
-             	interface _TemplatedMixinConstructor extends _WidgetBaseConstructor<_TemplatedMixin> {
              		/**
-             		 * Static method to get a template based on the templatePath or
-             		 * templateString key
              		 */
-             		getCachedTemplate(templateString: string, alwaysUseString: string, doc?: Document): string | HTMLElement;
              	}
-             	/* dijit/_Widget */
-             	interface _Widget extends _WidgetBase, _OnDijitClickMixin, _FocusMixin {
              		/**
-             		 * Connect to this function to receive notifications of mouse click events.
              		 */
-             		onClick(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of mouse double click events.
              		 */
-             		onDblClick(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of keys being pressed down.
              		 */
-             		onKeyDown(event: KeyboardEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of printable keys being typed.
              		 */
-             		onKeyPress(event: KeyboardEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of keys being released.
              		 */
-             		onKeyUp(event: KeyboardEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of when the mouse button is pressed down.
              		 */
-             		onMouseDown(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of when the mouse moves over nodes contained within this widget.
              		 */
-             		onMouseMove(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of when the mouse moves off of nodes contained within this widget.
              		 */
-             		onMouseOut(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of when the mouse moves onto nodes contained within this widget.
              		 */
-             		onMouseOver(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of when the mouse moves off of this widget.
              		 */
-             		onMouseLeave(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of when the mouse moves onto this widget.
              		 */
-             		onMouseEnter(event: MouseEvent): void;
              		/**
-             		 * Connect to this function to receive notifications of when the mouse button is released.
              		 */
-             		onMouseUp(event: MouseEvent): void;
-             		postCreate(): void;
              		/**
-             		 * Deprecated.  Use set() instead.
              		 */
-             		setAttribute(attr: string, value: any): void;
              		/**
-             		 * This method is deprecated, use get() or set() directly.
              		 */
-             		attr(name: string | { [attr: string]: any }, value?: any): any;
              		/**
-             		 * Returns all the widgets contained by this, i.e., all widgets underneath this.containerNode.
              		 */
-             		getDescendants(): _Widget[];
              		/**
-             		 * Called when this widget becomes the selected pane in a
-             		 * `dijit/layout/TabContainer`, `dijit/layout/StackContainer`,
-             		 * `dijit/layout/AccordionContainer`, etc.
              		 *
-             		 * Also called to indicate display of a `dijit.Dialog`, `dijit.TooltipDialog`, or `dijit.TitlePane`.
              		 */
-             		onShow(): void;
              		/**
-             		 * Called when another widget becomes the selected pane in a
-             		 * `dijit/layout/TabContainer`, `dijit/layout/StackContainer`,
-             		 * `dijit/layout/AccordionContainer`, etc.
              		 *
-             		 * Also called to indicate hide of a `dijit.Dialog`, `dijit.TooltipDialog`, or `dijit.TitlePane`.
              		 */
-             		onHide(): void;
              		/**
-             		 * Called when this widget is being displayed as a popup (ex: a Calendar popped
-             		 * up from a DateTextBox), and it is hidden.
-             		 * This is called from the dijit.popup code, and should not be called directly.
              		 *
-             		 * Also used as a parameter for children of `dijit/layout/StackContainer` or subclasses.
-             		 * Callback if a user tries to close the child.   Child will be closed if this function returns true.
              		 */
-             		onClose(): boolean;
              	}
+                 interface _WidgetBase {
+                     /**
+                      * Used across all instances a hash to cache attribute names and their getter
+                      * and setter names.
+                      */
+                     _attrPairNames: { [attr: string]: string };
+                     /**
+                      * Helper function for get() and set().
+                      * Caches attribute name values so we don't do the string ops every time.
+                      */
+                     _getAttrNames(name: string): string;
+                     /**
+                      * Internal helper for directly changing an attribute value.
+                      * This method id derived from Stateful and must not be used!
+                      * @deprecated use `_set(name, value)` instead.
+                      */
+                     _changeAttrValue(name: string, value: any): this;
+                     get<K extends keyof this & string>(name: K): this[K];
+                     /**
+                      * Helper function to set new value for specified property, and call handlers
+                      * registered with watch() if the value has changed.
+                      * @param name
+                      * @param value
+                      */
+                     _set<K extends keyof this>(name: K, value: this[K]): void;
+                     /**
+                      * Helper function to get value for specified property stored by this._set(),
+                      * i.e. for properties with custom setters.  Used mainly by custom getters.
+                      *
+                      * For example, CheckBox._getValueAttr() calls this._get("value").
+                      * @param name
+                      */
+                     _get<K extends keyof this>(name: K): this[K];
+                     /**
+                      * Set a property on a Stateful instance
+                      */
+                     set<K extends keyof this & string>(name: K, value: this[K]): this;
+                     set<K extends { [p in keyof this]: this[p] extends any[] ? p : never; }[keyof this & string]>(name: K, ...values: this[K]): this;
+                     set(values: Partial<this>): this;
+                     /**
+                      * Watches a property for changes
+                      */
+                     watch(callback: <K extends keyof any>(prop: K, oldValue: any, newValue: any) => void): dojo.WatchHandle;
+                     watch<K extends keyof this>(name: K, callback: (prop: K, oldValue: this[K], newValue: this[K]) => void): dojo.WatchHandle;
+                 }
+                 type EventInitArgs<T extends Event> = {
+                     [p in keyof T]?: T[p] extends (...args: any) => any ? never : T[p];
+                 };
-             	/* dijit/_WidgetBase */
-             	interface _WidgetBase<Attrs = any> extends dojo.Stateful<Attrs & _WidgetBase>, Destroyable {
+                 interface _WidgetBase<Events extends { [name in keyof Events]: Event } = GlobalEventHandlersEventMap> extends Destroyable {
              		/**
-             		 * A unique, opaque ID string that can be assigned by users or by the
-             		 * system. If the developer passes an ID which is known not to be
-             		 * unique, the specified ID is ignored and the system-generated ID is
-             		 * used instead.
              		 */
-             		id: string;
              		/**
-             		 * Rarely used.  Overrides the default Dojo locale used to render this widget,
-             		 * as defined by the [HTML LANG](http://www.w3.org/TR/html401/struct/dirlang.html#adef-lang) attribute.
-             		 * Value must be among the list of locales specified during by the Dojo bootstrap,
-             		 * formatted according to [RFC 3066](http://www.ietf.org/rfc/rfc3066.txt) (like en-us).
              		 */
-             		lang: string;
              		/**
-             		 * Bi-directional support, as defined by the [HTML DIR](http://www.w3.org/TR/html401/struct/dirlang.html#adef-dir)
-             		 * attribute. Either left-to-right "ltr" or right-to-left "rtl".  If undefined, widgets renders in page's
-             		 * default direction.
              		 */
-             		dir: string;
              		/**
-             		 * HTML class attribute
              		 */
-             		class: string;
              		/**
-             		 * HTML style attributes as cssText string or name/value hash
              		 */
-             		style: string;
              		/**
-             		 * HTML title attribute.
              		 *
-             		 * For form widgets this specifies a tooltip to display when hovering over
-             		 * the widget (just like the native HTML title attribute).
              		 *
-             		 * For TitlePane or for when this widget is a child of a TabContainer, AccordionContainer,
-             		 * etc., it's used to specify the tab label, accordion pane title, etc.  In this case it's
-             		 * interpreted as HTML.
              		 */
-             		title: string;
              		/**
-             		 * When this widget's title attribute is used to for a tab label, accordion pane title, etc.,
-             		 * this specifies the tooltip to appear when the mouse is hovered over that text.
              		 */
-             		tooltip: string;
              		/**
-             		 * Root CSS class of the widget (ex: dijitTextBox), used to construct CSS classes to indicate
-             		 * widget state.
              		 */
-             		baseClass: string;
              		/**
-             		 * pointer to original DOM node
              		 */
-             		srcNodeRef: HTMLElement;
              		/**
-             		 * This is our visible representation of the widget! Other DOM
-             		 * Nodes may by assigned to other properties, usually through the
-             		 * template system's data-dojo-attach-point syntax, but the domNode
-             		 * property is the canonical "top level" node in widget UI.
              		 */
-             		domNode: HTMLElement;
              		/**
-             		 * Designates where children of the source DOM node will be placed.
-             		 * "Children" in this case refers to both DOM nodes and widgets.
              		 */
-             		containerNode: HTMLElement;
              		/**
-             		 * The document this widget belongs to.  If not specified to constructor, will default to
-             		 * srcNodeRef.ownerDocument, or if no sourceRef specified, then to the document global
              		 */
-             		ownerDocument: HTMLElement;
              		/**
-             		 * Deprecated.	Instead of attributeMap, widget should have a _setXXXAttr attribute
-             		 * for each XXX attribute to be mapped to the DOM.
              		 */
-             		attributeMap: { [attribute: string]: any };
              		/**
-             		 * Bi-directional support,	the main variable which is responsible for the direction of the text.
-             		 * The text direction can be different than the GUI direction by using this parameter in creation
-             		 * of a widget.
              		 */
-             		textDir: string;
+                     _started?: boolean;
              		/**
-             		 * Kicks off widget instantiation.  See create() for details.
              		 */
-             		postscript(params?: any, srcNodeRef?: HTMLElement): void;
              		/**
-             		 * Kick off the life-cycle of a widget
              		 */
-             		create(params?: any, srcNodeRef?: HTMLElement): void;
              		/**
-             		 * Called after the parameters to the widget have been read-in,
-             		 * but before the widget template is instantiated. Especially
-             		 * useful to set properties that are referenced in the widget
-             		 * template.
              		 */
-             		postMixInProperties(): void;
              		/**
-             		 * Construct the UI for this widget, setting this.domNode.
-             		 * Most widgets will mixin `dijit._TemplatedMixin`, which implements this method.
              		 */
-             		buildRendering(): void;
              		/**
-             		 * Processing after the DOM fragment is created
              		 */
-             		postCreate(): void;
              		/**
-             		 * Processing after the DOM fragment is added to the document
              		 */
-             		startup(): void;
              		/**
-             		 * Destroy this widget and its descendants
              		 */
-             		destroyRecursive(preserveDom?: boolean): void;
              		/**
-             		 * Destroys the DOM nodes associated with this widget.
              		 */
-             		destroyRendering(preserveDom?: boolean): void;
              		/**
-             		 * Recursively destroy the children of this widget and their
-             		 * descendants.
              		 */
-             		destroyDescendants(preserveDom?: boolean): void;
              		/**
-             		 * Deprecated. Override destroy() instead to implement custom widget tear-down
-             		 * behavior.
+                      * @deprecated
              		 */
-             		uninitialize(): boolean;
              		/**
-             		 * Used by widgets to signal that a synthetic event occurred, ex:
-             		 * |	myWidget.emit("attrmodified-selectedChildWidget", {}).
              		 */
-             		emit(type: string, eventObj?: any, callbackArgs?: any[]): any;
+                     emit<K extends keyof Events>(eventName: K, evt: EventInitArgs<Events[K]>): void;
+                     /**
+                      * @param type
+                      * @param eventObj
+                      * @param callbackArgs
+                      */
+                     emit<K extends string>(
+                         type: K,
+                         eventObj?: K extends keyof Events ? EventInitArgs<Events[K]> : any,
+                         callbackArgs?: any[]
+                     ): any;
              		/**
-             		 * Call specified function when event occurs, ex: myWidget.on("click", function(){ ... }).
              		 */
+                     on<K extends keyof Events>(eventName: K, cb: (evt: Events[K]) => void): dojo.WatchHandle;
-             		on(type: string | dojo.ExtensionEvent, func: dojo.EventListener | Function): dojo.WatchHandle;
              		/**
-             		 * Returns a string that represents the widget.
              		 */
-             		toString(): string;
              		/**
-             		 * Returns all direct children of this widget, i.e. all widgets underneath this.containerNode whose parent
-             		 * is this widget.   Note that it does not return all descendants, but rather just direct children.
              		 */
-             		getChildren<T extends _WidgetBase>(): T[];
              		/**
-             		 * Returns the parent widget of this widget.
              		 */
-             		getParent<T extends _WidgetBase>(): T;
              		/**
-             		 * Deprecated, will be removed in 2.0, use this.own(on(...)) or this.own(aspect.after(...)) instead.
+                      * @deprecated
              		 */
-             		connect(obj: any, event: string | dojo.ExtensionEvent, method: string | dojo.EventListener): dojo.WatchHandle;
              		/**
-             		 * Deprecated, will be removed in 2.0, use handle.remove() instead.
+                      * @deprecated
              		 */
-             		disconnect(handle: dojo.WatchHandle): void;
              		/**
-             		 * Deprecated, will be removed in 2.0, use this.own(topic.subscribe()) instead.
+                      * @deprecated
              		 */
-             		subscribe(t: string, method: dojo.EventListener): dojo.WatchHandle;
              		/**
-             		 * Deprecated, will be removed in 2.0, use handle.remove() instead.
+                      * @deprecated
              		 */
-             		unsubscribe(handle: dojo.WatchHandle): void;
              		/**
-             		 * Return this widget's explicit or implicit orientation (true for LTR, false for RTL)
              		 */
-             		isLeftToRight(): boolean;
              		/**
-             		 * Return true if this widget can currently be focused
-             		 * and false if not
              		 */
-             		isFocusable(): boolean;
              		/**
-             		 * Place this widget somewhere in the DOM based
-             		 * on standard domConstruct.place() conventions.
              		 */
-             		placeAt<T extends _WidgetBase>(reference: dojo.NodeFragmentOrString | T, position?: string | number): this;
              		/**
-             		 * Wrapper to setTimeout to avoid deferred functions executing
-             		 * after the originating widget has been destroyed.
-             		 * Returns an object handle with a remove method (that returns null) (replaces clearTimeout).
              		 */
-             		defer(fcn: Function, delay?: number): dojo.Handle;
              	}
-             	interface _WidgetBaseConstructor<W> extends Pick<dojo._base.DeclareConstructor<W>, Exclude<keyof dojo._base.DeclareConstructor<W>, 'new'>> {
-             		new (params?: Partial<W> & ThisType<W>, srcNodeRef?: dojo.NodeOrString): W & dojo._base.DeclareCreatedObject;
              	}
-             	/* dijit/_WidgetsInTemplateMixin */
-             	interface _WidgetsInTemplateMixin {
              		/**
-             		 * Used to provide a context require to dojo/parser in order to be
-             		 * able to use relative MIDs (e.g. `./Widget`) in the widget's template.
              		 */
-             		contextRequire: Function;
-             		startup(): void;
              	}
-             	interface _WidgetsInTemplateMixinConstructor extends dojo._base.DeclareConstructor<_WidgetsInTemplateMixin> {
-             		new (params: Object, srcNodeRef: dojo.NodeOrString): _WidgetsInTemplateMixin;
              	}
-             	/* dijit/a11yclick */
-             	interface A11yClick {
              		/**
-             		 * Custom press, release, and click synthetic events
-             		 * which trigger on a left mouse click, touch, or space/enter keyup.
              		 */
-             		(node: HTMLElement, listener: Function): dojo.Handle;
              		/**
-             		 * Mousedown (left button), touchstart, or keydown (space or enter) corresponding to logical click operation.
              		 */
-             		press: dojo.ExtensionEvent;
              		/**
-             		 * Mouseup (left button), touchend, or keyup (space or enter) corresponding to logical click operation.
              		 */
-             		release: dojo.ExtensionEvent;
              		/**
-             		 * Mouse cursor or a finger is dragged over the given node.
              		 */
-             		move: dojo.ExtensionEvent;
              	}
-             	/* dijit/Calendar */
-             	interface _MonthDropDownButton extends form.DropDownButton<_MonthDropDown> {
-             		onMonthSelect(): void;
-             		postCreate(): void;
-             		set(name: 'month', value: number): this;
-             		set(name: string, value: any): this;
-             		set(values: Object): this;
+                     //set(name: 'month', value: number): this;
+                     //set(name: string, value: any): this;
+                     //set(values: Object): this;
              	}
-             	interface _MonthDropDownButtonConstructor extends _WidgetBaseConstructor<_MonthDropDownButton> { }
-             	interface _MonthDropDown extends _Widget, _TemplatedMixin, _CssStateMixin {
-             		months: string[];
-             		baseClass: string;
-             		templateString: string;
              		/**
-             		 * Callback when month is selected from drop down
              		 */
-             		onChange(month: number): void;
-             		set(name: 'months', value: string[]): this;
-             		set(name: string, value: any): this;
-             		set(values: Object): this;
+                     //set(name: 'months', value: string[]): this;
+                     //set(name: string, value: any): this;
+                     //set(values: Object): this;
              	}
-             	interface _MonthDropDownConstructor extends _WidgetBaseConstructor<_MonthDropDown> { }
-             	interface Calendar extends CalendarLite, _Widget, _CssStateMixin {
-             		baseClass: string;
              		/**
-             		 * Set node classes for various mouse events, see dijit._CssStateMixin for more details
              		 */
-             		cssStateNodes: CSSStateNodes;
              		/**
-             		 * Creates the drop down button that displays the current month and lets user pick a new one
              		 */
-             		_createMonthWidget(): _MonthDropDownButton;
-             		postCreate(): void;
              		/**
-             		 * Handler for when user selects a month from the drop down list
              		 */
-             		_onMonthSelect(newMonth: number): void;
              		/**
-             		 * Handler for mouse over events on days, sets hovered style
              		 */
-             		_onDayMouseOver(evt: MouseEvent): void;
              		/**
-             		 * Handler for mouse out events on days, clears hovered style
              		 */
-             		_onDayMouseOut(evt: MouseEvent): void;
-             		_onDayMouseDown(evt: MouseEvent): void;
-             		_onDayMouseUp(evt: MouseEvent): void;
              		/**
-             		 * Provides keyboard navigation of calendar.
              		 */
-             		handleKey(evt: KeyboardEvent): void;
              		/**
-             		 * For handling keydown events on a stand alone calendar
              		 */
-             		_onKeyDown(evt: KeyboardEvent): void;
              		/**
-             		 * Deprecated.   Notification that a date cell was selected.  It may be the same as the previous value.
              		 */
-             		onValueSelected(date: Date): void;
-             		onChange(date: Date): void;
              		/**
-             		 * May be overridden to return CSS classes to associate with the date entry for the given dateObject
-             		 * for example to indicate a holiday in specified locale.
              		 */
-             		getClassForDate(dateObject: Date, locale?: string): string;
-             		get(name: 'value'): Date;
-             		get(name: string): any;
-             		set(name: 'value', value: number | Date): this;
-             		set(name: string, value: any): this;
-             		set(values: Object): this;
+                     // get(name: 'value'): Date;
+                     // get(name: string): any;
+                     // set(name: 'value', value: number | Date): this;
+                     // set(name: string, value: any): this;
+                     // set(values: Object): this;
              	}
-             	interface CalendarConstructor extends _WidgetBaseConstructor<Calendar> {
-             		_MonthWidget: _MonthWidgetConstructor;
-             		_MonthDropDown: _MonthDropDownButtonConstructor;
-             		_MonthDropDownButton: _MonthDropDownButtonConstructor;
              	}
-             	/* dijit/CalendarLite */
-             	interface _MonthWidget extends _WidgetBase {
-             		set(name: 'month', value: Date): this;
-             		set(name: string, value: any): this;
-             		set(values: Object): this;
+                     // set(name: 'month', value: Date): this;
+                     // set(name: string, value: any): this;
+                     // set(values: Object): this;
              	}
-             	interface _MonthWidgetConstructor extends _WidgetBaseConstructor<_MonthWidget> { }
-             	interface CalendarLite extends _WidgetBase, _TemplatedMixin {
              		/**
-             		 * Template for main calendar
              		 */
-             		templateString: string;
              		/**
-             		 * Template for cell for a day of the week (ex: M)
              		 */
-             		dowTemplateString: string;
-             		dateTemplateString: string;
-             		weekTemplateString: string;
              		/**
-             		 * The currently selected Date, initially set to invalid date to indicate no selection.
              		 */
-             		value: Date;
              		/**
-             		 * JavaScript namespace to find calendar routines.	 If unspecified, uses Gregorian calendar routines
-             		 * at dojo/date and dojo/date/locale.
              		 */
-             		datePackage: string;
              		/**
-             		 * How to represent the days of the week in the calendar header. See locale
              		 */
-             		dayWidth: string;
              		/**
-             		 * Order fields are traversed when user hits the tab key
              		 */
-             		tabIndex: string;
              		/**
-             		 * (Optional) The first day of week override. By default the first day of week is determined
-             		 * for the current locale (extracted from the CLDR).
-             		 * Special value -1 (default value), means use locale dependent value.
              		 */
-             		dayOffset: number;
              		/**
-             		 * Date object containing the currently focused date, or the date which would be focused
-             		 * if the calendar itself was focused.   Also indicates which year and month to display,
-             		 * i.e. the current "page" the calendar is on.
              		 */
-             		currentFocus: Date;
              		/**
-             		 * Put the summary to the node with role=grid
              		 */
-             		_setSummaryAttr: string;
-             		baseClass: string;
              		/**
-             		 * Runs various tests on the value, checking that it's a valid date, rather
-             		 * than blank or NaN.
              		 */
-             		_isValidDate(value: Date): boolean;
              		/**
-             		 * Convert Number into Date, or copy Date object.   Then, round to nearest day,
-             		 * setting to 1am to avoid issues when DST shift occurs at midnight, see #8521, #9366)
              		 */
-             		_patchDate(value: number | Date): Date;
              		/**
-             		 * This just sets the content of node to the specified text.
-             		 * Can't do "node.innerHTML=text" because of an IE bug w/tables, see #3434.
              		 */
-             		_setText(node: HTMLElement, text?: string): void;
              		/**
-             		 * Fills in the calendar grid with each day (1-31).
-             		 * Call this on creation, when moving to a new month.
              		 */
-             		_populateGrid(): void;
              		/**
-             		 * Fill in localized month, and prev/current/next years
              		 */
-             		_populateControls(): void;
              		/**
-             		 * Sets calendar's value to today's date
              		 */
-             		goToToday(): void;
              		/**
-             		 * Creates the drop down button that displays the current month and lets user pick a new one
              		 */
-             		_createMonthWidget(): void;
-             		buildRendering(): void;
-             		postCreate(): void;
              		/**
-             		 * Set up connects for increment/decrement of months/years
              		 */
-             		_connectControls(): void;
              		/**
-             		 * If the calendar currently has focus, then focuses specified date,
-             		 * changing the currently displayed month/year if necessary.
-             		 * If the calendar doesn't have focus, updates currently
-             		 * displayed month/year, and sets the cell that will get focus
-             		 * when Calendar is focused.
              		 */
-             		_setCurrentFocusAttr(date: Date, forceFocus?: boolean): void;
              		/**
-             		 * Focus the calendar by focusing one of the calendar cells
              		 */
-             		focus(): void;
              		/**
-             		 * Handler for day clicks, selects the date if appropriate
              		 */
-             		_onDayClick(evt: MouseEvent): void;
              		/**
-             		 * Returns the cell corresponding to the date, or null if the date is not within the currently
-             		 * displayed month.
              		 */
-             		_getNodeByDate(value: Date): HTMLElement;
              		/**
-             		 * Marks the specified cells as selected, and clears cells previously marked as selected.
-             		 * For CalendarLite at most one cell is selected at any point, but this allows an array
-             		 * for easy subclassing.
              		 */
-             		_markSelectedDates(dates: Date[]): void;
              		/**
-             		 * Called only when the selected date has changed
              		 */
-             		onChange(date: Date): void;
              		/**
-             		 * May be overridden to disable certain dates in the calendar e.g. `isDisabledDate=dojo.date.locale.isWeekend`
              		 */
-             		isDisabledDate(dateObject: Date, locale?: string): boolean;
              		/**
-             		 * May be overridden to return CSS classes to associate with the date entry for the given dateObject,
-             		 * for example to indicate a holiday in specified locale.
              		 */
-             		getClassForDate(dateObject: Date, locale?: string): string;
-             		get(name: 'value'): Date;
-             		get(name: string): any;
-             		set(name: 'value', value: number | Date): this;
-             		set(name: string, value: any): this;
-             		set(values: Object): this;
+                     // get(name: 'value'): Date;
+                     // get(name: string): any;
+                     // set(name: 'value', value: number | Date): this;
+                     // set(name: string, value: any): this;
+                     // set(values: Object): this;
              	}
-             	interface CalendarLiteConstructor extends _WidgetBaseConstructor<CalendarLite> {
-             		_MonthWidget: _MonthWidgetConstructor;
              	}
-             	/* dijit/Destroyable */
-             	interface Destroyable {
-             		_destroyed?: true;
              		/**
-             		 * Destroy this class, releasing any resources registered via own().
              		 */
-             		destroy(preserveDom?: boolean): void;
              		/**
-             		 * Track specified handles and remove/destroy them when this instance is destroyed, unless they were
-             		 * already removed/destroyed manually.
              		 */
-             		own(...args: any[]): any[];
              	}
              	/**
-             	 * Mixin to track handles and release them when instance is destroyed.
              	 */
-             	interface DestroyableConstructor extends dojo._base.DeclareConstructor<Destroyable> { }
-             	/** dijit/_KeyNavMixin */
              	/**
-             	 * A mixin to allow arrow key and letter key navigation of child or descendant widgets.
-             	 * It can be used by dijit/_Container based widgets with a flat list of children, or more complex widgets like dijit/Tree.
              	 *
-             	 * To use this mixin, the subclass must:
              	 *
-             	 * 	- Implement  _getNext(), _getFirst(), _getLast(), _onLeftArrow(), _onRightArrow() _onDownArrow(), _onUpArrow() methods to handle home/end/left/right/up/down keystrokes. Next and previous in this context refer to a linear ordering of the descendants used by letter key search.
-             	 * 	- Set all descendants' initial tabIndex to "-1"; both initial descendants and any descendants added later, by for example addChild()
-             	 * 	- Define childSelector to a function or string that identifies focusable descendant widgets
              	 *
-             	 * Also, child widgets must implement a focus() method.
              	 */
-             	interface _KeyNavMixin extends _FocusMixin {
              		/**
-             		 * Tab index of the container; same as HTML tabIndex attribute.
-             		 * Note then when user tabs into the container, focus is immediately moved to the first item in the container.
              		 */
-             		tabIndex: string;
              		/**
-             		 * Selector (passed to on.selector()) used to identify what to treat as a child widget.   Used to monitor focus events and set this.focusedChild.   Must be set by implementing class.   If this is a string (ex: "> *") then the implementing class must require dojo/query.
              		 */
-             		childSelector: string | Function | null;
              		/**
-             		 * Called on left arrow key, or right arrow key if widget is in RTL mode.
-             		 * Should go back to the previous child in horizontal container widgets like Toolbar.
              		 */
-             		_onLeftArrow(evt?: KeyboardEvent): void;
              		/**
-             		 * Called on right arrow key, or left arrow key if widget is in RTL mode.
-             		 * Should go to the next child in horizontal container widgets like Toolbar.
              		 */
-             		_onRightArrow(evt?: KeyboardEvent): void;
              		/**
-             		 * Called on up arrow key. Should go to the previous child in vertical container widgets like Menu.
              		 */
-             		_onUpArrow(evt?: KeyboardEvent): void;
              		/**
-             		 * Called on down arrow key. Should go to the next child in vertical container widgets like Menu.
              		 */
-             		_onDownArrow(evt?: KeyboardEvent): void;
              		/**
-             		 * Default focus() implementation: focus the first child.
              		 */
-             		focus(): void;
              		/**
-             		 * Returns first child that can be focused.
              		 */
-             		_getFirstFocusableChild(): _WidgetBase;
              		/**
-             		 * Returns last child that can be focused.
              		 */
-             		_getLastFocusableChild(): _WidgetBase;
              		/**
-             		 * Focus the first focusable child in the container.
              		 */
-             		focusFirstChild(): void;
              		/**
-             		 * Focus the last focusable child in the container.
              		 */
-             		focusLastChild(): void;
              		/**
-             		 * Focus specified child widget.
              		 *
-             		 * @param widget Reference to container's child widget
-             		 * @param last If true and if widget has multiple focusable nodes, focus the last one instead of the first one
              		 */
-             		focusChild(widget: _WidgetBase, last?: boolean): void;
              		/**
-             		 * Handler for when the container itself gets focus.
              		 *
-             		 * Initially the container itself has a tabIndex, but when it gets focus, switch focus to first child.
              		 */
-             		_onContainerFocus(evt: Event): void;
              		/**
-             		 * Called when a child widget gets focus, either by user clicking it, or programatically by arrow key handling code.
              		 *
-             		 * It marks that the current node is the selected one, and the previously selected node no longer is.
              		 */
-             		_onChildFocus(child?: _WidgetBase): void;
-             		_searchString: string;
-             		multiCharSearchDuration: number;
              		/**
-             		 * When a key is pressed that matches a child item, this method is called so that a widget can take appropriate action is necessary.
              		 */
-             		onKeyboardSearch(tem: _WidgetBase, evt: Event, searchString: string, numMatches: number): void;
              		/**
-             		 * Compares the searchString to the widget's text label, returning:
              		 *
-             		 * 	* -1: a high priority match  and stop searching
-             		 * 	* 0: not a match
-             		 * 	* 1: a match but keep looking for a higher priority match
              		 */
-             		_keyboardSearchCompare(item: _WidgetBase, searchString: string): -1 | 0 | 1;
              		/**
-             		 * When a key is pressed, if it's an arrow key etc. then it's handled here.
              		 */
-             		_onContainerKeydown(evt: Event): void;
              		/**
-             		 * When a printable key is pressed, it's handled here, searching by letter.
              		 */
-             		_onContainerKeypress(evt: Event): void;
              		/**
-             		 * Perform a search of the widget's options based on the user's keyboard activity
              		 *
-             		 * Called on keypress (and sometimes keydown), searches through this widget's children looking for items that match the user's typed search string.  Multiple characters typed within 1 sec of each other are combined for multicharacter searching.
              		 */
-             		_keyboardSearch(evt: Event, keyChar: string): void;
              		/**
-             		 * Called when focus leaves a child widget to go to a sibling widget.
              		 */
-             		_onChildBlur(widget: _WidgetBase): void;
              		/**
-             		 * Returns the next or previous focusable descendant, compared to "child".
-             		 * Implements and extends _KeyNavMixin._getNextFocusableChild() for a _Container.
              		 */
-             		_getNextFocusableChild(child: _WidgetBase, dir: 1 | -1): _WidgetBase | null;
              		/**
-             		 * Returns the first child.
              		 */
-             		_getFirst(): _WidgetBase | null;
              		/**
-             		 * Returns the last descendant.
              		 */
-             		_getLast(): _WidgetBase | null;
              		/**
-             		 * Returns the next descendant, compared to "child".
              		 */
-             		_getNext(child: _WidgetBase, dir: 1 | -1): _WidgetBase | null;
              	}
-             	interface _KeyNavMixinConstructor extends dojo._base.DeclareConstructor<_KeyNavMixin> { }
-             	/* dijit/_KeyNavContainer */
              	/**
-             	 * A _Container with keyboard navigation of its children.
              	 *
-             	 * Provides normalized keyboard and focusing code for Container widgets.
-             	 * To use this mixin, call connectKeyNavHandlers() in postCreate().
-             	 * Also, child widgets must implement a focus() method.
              	 */
-             	interface _KeyNavContainer extends _FocusMixin, _KeyNavMixin, _Container {
              		/**
-             		 * Deprecated.  You can call this in postCreate() to attach the keyboard handlers to the container, but the preferred method is to override _onLeftArrow() and _onRightArrow(), or _onUpArrow() and _onDownArrow(), to call focusPrev() and focusNext().
              		 *
-             		 * @param prevKeyCodes Key codes for navigating to the previous child.
-             		 * @param nextKeyCodes Key codes for navigating to the next child.
              		 */
-             		connectKeyNavHandlers(prevKeyCodes: number[], nextKeyCodes: number[]): void;
              		/**
-             		 * @deprecated
              		 */
-             		startupKeyNavChildren(): void;
              		/**
-             		 * Setup for each child widget.
              		 *
-             		 * Sets tabIndex=-1 on each child, so that the tab key will leave the container rather than visiting each child.
              		 *
-             		 * Note: if you add children by a different method than addChild(), then need to call this manually or at least make sure the child's tabIndex is -1.
              		 *
-             		 * Note: see also _LayoutWidget.setupChild(), which is also called for each child widget.
              		 */
-             		_startupChild(widget: _WidgetBase): void;
              		/**
-             		 * Returns the first child.
              		 */
-             		_getFirst(): _Widget | null;
              		/**
-             		 * Returns the last descendant.
              		 */
-             		_getLast(): _Widget | null;
              		/**
-             		 * Focus the next widget
              		 */
-             		focusNext(): void;
              		/**
-             		 * Focus the last focusable node in the previous widget
              		 *
-             		 * (ex: go to the ComboButton icon section rather than button section)
              		 */
-             		focusPrev(): void;
              		/**
-             		 * Implement _KeyNavMixin.childSelector, to identify focusable child nodes.
              		 *
-             		 * If we allowed a dojo/query dependency from this module this could more simply be a string "> *" instead of this function.
              		 */
-             		childSelector(node: Element | Node): boolean | void | any;
              	}
-             	interface _KeyNavContainerConstructor extends dojo._base.DeclareConstructor<_KeyNavContainer> { }
-             	/* dijit/_MenuBase */
              	/**
-             	 * Abstract base class for Menu and MenuBar.
-             	 * Subclass should implement _onUpArrow(), _onDownArrow(), _onLeftArrow(), and _onRightArrow().
              	 */
-             	interface _MenuBase extends _Widget, _TemplatedMixin, _KeyNavContainer, _CssStateMixin {
-             		selected: MenuItem | null;
-             		_setSelectedAttr(item?: MenuItem | null): void;
              		/**
-             		 * This Menu has been clicked (mouse or via space/arrow key) or opened as a submenu, so mere mouseover will open submenus.  Focusing a menu via TAB does NOT automatically make it active since TAB is a navigation operation and not a selection one.
              		 *
-             		 * For Windows apps, pressing the ALT key focuses the menubar menus (similar to TAB navigation) but the menu is not active (ie no dropdown) until an item is clicked.
              		 */
-             		activated: boolean;
-             		_setActivatedAttr(val: boolean): void;
              		/**
-             		 * pointer to menu that displayed me
              		 */
-             		parentMenu: _Widget | null;
              		/**
-             		 * After a menu has been activated (by clicking on it etc.), number of milliseconds before hovering (without clicking) another MenuItem causes that MenuItem's popup to automatically open.
              		 */
-             		popupDelay: number;
              		/**
-             		 * For a passive (unclicked) Menu, number of milliseconds before hovering (without clicking) will cause the popup to open.  Default is Infinity, meaning you need to click the menu to open it.
              		 */
-             		passivePopupDelay: number;
              		/**
-             		 * A toggle to control whether or not a Menu gets focused when opened as a drop down from a MenuBar or DropDownButton/ComboButton.   Note though that it always get focused when opened via the keyboard.
              		 */
-             		autoFocus: boolean;
              		/**
-             		 * Selector (passed to on.selector()) used to identify MenuItem child widgets, but exclude inert children like MenuSeparator.  If subclass overrides to a string (ex: "> *"), the subclass must require dojo/query.
              		 */
-             		childSelector(node: Element | Node): boolean | void | Function;
              		/**
-             		 * Attach point for notification about when a menu item has been executed. This is an internal mechanism used for Menus to signal to their parent to close them, because they are about to execute the onClick handler.  In general developers should not attach to or override this method.
              		 */
-             		onExecute(): void;
              		/**
-             		 * Attach point for notification about when the user cancels the current menu
-             		 * This is an internal mechanism used for Menus to signal to their parent to close them.  In general developers should not attach to or override this method.
              		 */
-             		onCancel(): void;
              		/**
-             		 * This handles the right arrow key (left arrow key on RTL systems), which will either open a submenu, or move to the next item in the ancestor MenuBar
              		 */
-             		_moveToPopup(evt: Event): void;
              		/**
-             		 * This handler is called when the mouse moves over the popup.
              		 */
-             		_onPopupHover(evt?: MouseEvent): void;
              		/**
-             		 * Called when cursor is over a MenuItem.
              		 */
-             		onItemHover(item: MenuItem): void;
              		/**
-             		 * Called when a child MenuItem becomes deselected.   Setup timer to close its popup.
              		 */
-             		_onChildDeselect(item: MenuItem): void;
              		/**
-             		 * Callback fires when mouse exits a MenuItem
              		 */
-             		onItemUnhover(item: MenuItem): void;
              		/**
-             		 * Cancels the popup timer because the user has stop hovering on the MenuItem, etc.
              		 */
-             		_stopPopupTimer(): void;
              		/**
-             		 * Cancels the pending-close timer because the close has been preempted
              		 */
-             		_stopPendingCloseTimer(): void;
              		/**
-             		 * Returns the top menu in this chain of Menus
              		 */
-             		_getTopMenu(): void;
              		/**
-             		 * Handle clicks on an item.
              		 */
-             		onItemClick(item: _WidgetBase, evt: Event): void;
              		/**
-             		 * Open the popup to the side of/underneath the current menu item, and optionally focus first item
              		 */
-             		_openItemPopup(fromItem: MenuItem, focus: boolean): void;
              		/**
-             		 * Callback when this menu is opened.
-             		 * This is called by the popup manager as notification that the menu was opened.
              		 */
-             		onOpen(evt?: Event): void;
              		/**
-             		 * Callback when this menu is closed.
-             		 * This is called by the popup manager as notification that the menu was closed.
              		 */
-             		onClose(): boolean;
              		/**
-             		 * Called when submenu is clicked or focus is lost.  Close hierarchy of menus.
              		 */
-             		_closeChild(): void;
              		/**
-             		 * Called when child of this Menu gets focus from:
              		 *
-             		 *  1. clicking it
-             		 *  2. tabbing into it
-             		 *  3. being opened by a parent menu.
              		 *
-             		 * This is not called just from mouse hover.
              		 */
-             		_onItemFocus(item: MenuItem): void;
              		/**
-             		 * Called when focus is moved away from this Menu and it's submenus.
              		 */
-             		_onBlur(): void;
              		/**
-             		 * Called when the user is done with this menu.  Closes hierarchy of menus.
              		 */
-             		_cleanUp(clearSelectedItem?: boolean): void;
              	}
-             	interface _MenuBaseConstructor extends _WidgetBaseConstructor<_MenuBase> { }
-             	/* dijit/Dialog */
-             	interface _DialogBase extends _TemplatedMixin, form._FormMixin, _DialogMixin, _CssStateMixin {
-             		templateString: string;
-             		baseClass: string;
-             		cssStateNodes: CSSStateNodes;
              		/**
-             		 * True if Dialog is currently displayed on screen.
              		 */
-             		open: boolean;
              		/**
-             		 * The time in milliseconds it takes the dialog to fade in and out
              		 */
-             		duration: number;
              		/**
-             		 * A Toggle to modify the default focus behavior of a Dialog, which
-             		 * is to re-focus the element which had focus before being opened.
-             		 * False will disable refocusing. Default: true
              		 */
-             		refocus: boolean;
              		/**
-             		 * A Toggle to modify the default focus behavior of a Dialog, which
-             		 * is to focus on the first dialog element after opening the dialog.
-             		 * False will disable autofocusing. Default: true
              		 */
-             		autofocus: boolean;
              		/**
-             		 * Toggles the movable aspect of the Dialog. If true, Dialog
-             		 * can be dragged by it's title. If false it will remain centered
-             		 * in the viewport.
              		 */
-             		draggable: boolean;
              		/**
-             		 * Maximum size to allow the dialog to expand to, relative to viewport size
              		 */
-             		maxRatio: number;
              		/**
-             		 * Dialog show [x] icon to close itself, and ESC key will close the dialog.
              		 */
-             		closable: boolean;
-             		postMixInProperties(): void;
-             		postCreate(): void;
              		/**
-             		 * Called when data has been loaded from an href.
-             		 * Unlike most other callbacks, this function can be connected to (via `dojo.connect`)
-             		 * but should *not* be overridden.
              		 */
-             		onLoad(data?: any): void;
-             		focus(): void;
-             		/* Not entirely sure of the resolution type of these promises */
              		/**
-             		 * Display the dialog
              		 */
-             		show(): dojo.promise.Promise<any>;
              		/**
-             		 * Hide the dialog
              		 */
-             		hide(): dojo.promise.Promise<any>;
              		/**
-             		 * Called with no argument when viewport scrolled or viewport size changed.  Adjusts Dialog as
-             		 * necessary to keep it visible.
              		 *
-             		 * Can also be called with an argument (by dojox/layout/ResizeHandle etc.) to explicitly set the
-             		 * size of the dialog.
              		 */
-             		resize(dim?: dojo.DomGeometryWidthHeight): void;
-             		destroy(preserveDom?: boolean): void;
              	}
-             	interface _DialogBaseConstructor extends _WidgetBaseConstructor<_DialogBase> { }
-             	interface Dialog extends layout.ContentPane, _DialogBase {
-             		/* overrides conflicting methods */
-             		resize(dim?: dojo.DomGeometryWidthHeight): void;
              	}
-             	interface DialogLevelManager {
-             		_beginZIndex: number;
              		/**
-             		 * Call right before fade-in animation for new dialog.
              		 *
-             		 * Saves current focus, displays/adjusts underlay for new dialog,
-             		 * and sets the z-index of the dialog itself.
              		 *
-             		 * New dialog will be displayed on top of all currently displayed dialogs.
-             		 * Caller is responsible for setting focus in new dialog after the fade-in
-             		 * animation completes.
              		 */
-             		show(dialog: _WidgetBase, underlayAttrs: Object): void;
              		/**
-             		 * Called when the specified dialog is hidden/destroyed, after the fade-out
-             		 * animation ends, in order to reset page focus, fix the underlay, etc.
-             		 * If the specified dialog isn't open then does nothing.
              		 *
-             		 * Caller is responsible for either setting display:none on the dialog domNode,
-             		 * or calling dijit/popup.hide(), or removing it from the page DOM.
              		 */
-             		hide(dialog: _WidgetBase): void;
              		/**
-             		 * Returns true if specified Dialog is the top in the task
              		 */
-             		isTop(dialog: _WidgetBase): boolean;
              	}
-             	interface DialogConstructor extends _WidgetBaseConstructor<Dialog> {
              		/**
-             		 * for monkey patching and dojox/widget/DialogSimple
              		 */
-             		_DialogBase: _DialogBaseConstructor;
-             		_DialogLevelManager: DialogLevelManager;
-             		_dialogStack: {
-             			dialog: _WidgetBase,
              			focus: any,
-             			underlayAttrs: any
              		}[];
              	}
-             	/* dijit/ConfirmDialog */
-             	interface ConfirmDialog extends _ConfirmDialogMixin { }
-             	interface ConfirmDialogConstructor extends DialogConstructor { }
-             	/* dijit/DropDownMenu */
              	/**
-             	 * A menu, without features for context menu (Meaning, drop down menu)
              	 */
-             	interface DropDownMenu extends _MenuBase { }
-             	interface DropDownMenuConstructor extends _WidgetBaseConstructor<DropDownMenu> { }
-             	/* dijit/Fieldset */
              	/**
-             	 * An accessible fieldset that can be expanded or collapsed via
-             	 * its legend.  Fieldset extends `dijit.TitlePane`.
              	 */
-             	interface Fieldset extends TitlePane {
-             		open: boolean;
              	}
-             	interface FieldsetConstructor extends _WidgetBaseConstructor<Fieldset> { }
-             	/* dijit/Menu */
              	/**
-             	 * A context menu you can assign to multiple elements
              	 */
-             	interface Menu extends dijit.DropDownMenu {
              		/**
-             		 * Array of dom node ids of nodes to attach to.
-             		 * Fill this with nodeIds upon widget creation and it becomes context menu for those nodes.
              		 */
-             		targetNodeIds: string[];
              		/**
-             		 * CSS expression to apply this Menu to descendants of targetNodeIds, rather than to
-             		 * the nodes specified by targetNodeIds themselves.  Useful for applying a Menu to
-             		 * a range of rows in a table, tree, etc.
              		 *
-             		 * The application must require() an appropriate level of dojo/query to handle the selector.
              		 */
-             		selector: string;
              		/**
-             		 * If true, right clicking anywhere on the window will cause this context menu to open.
-             		 * If false, must specify targetNodeIds.
              		 */
-             		contextMenuForWindow: boolean;
              		/**
-             		 * If true, menu will open on left click instead of right click, similar to a file menu.
              		 */
-             		leftClickToOpen: boolean;
              		/**
-             		 * When this menu closes, re-focus the element which had focus before it was opened.
              		 */
-             		refocus: boolean;
              		/**
-             		 * Attach menu to given node
              		 */
-             		bindDomNode(node: string | Node): void;
              		/**
-             		 * Detach menu from given node
              		 */
-             		unBindDomNode(nodeName: string | Node): void;
              	}
-             	interface MenuConstructor extends _WidgetBaseConstructor<Menu> { }
-             	/* dijit/MenuBar */
-             	interface MenuBar extends _MenuBase {
-             		baseClass: 'dijitMenuBar';
-             		popupDelay: number;
-             		_isMenuBar: true;
-             		_orient: string[];
-             		_moveToPopup(evt: Event): void;
-             		focusChild(item: _WidgetBase): void;
-             		_onChildDeselect(item: _WidgetBase): void;
-             		_onLeftArrow(): void;
-             		_onRightArrow(): void;
-             		_onDownArrow(): void;
-             		_onUpArrow(): void;
-             		onItemClick(item: _WidgetBase, evt: Event): void;
              	}
-             	interface MenuBarConstructor extends _WidgetBaseConstructor<MenuBar> { }
-             	/* dijit/MenuBarItem */
-             	interface MenuBarItem extends MenuItem { }
-             	interface MenuBarItemConstructor extends _WidgetBaseConstructor<MenuBarItem> { }
-             	/* dijit/MenuItem */
-             	interface MenuItem extends _Widget, _TemplatedMixin, _Contained, _CssStateMixin {
              		/**
-             		 * Text for the accelerator (shortcut) key combination, a control, alt, etc. modified keystroke meant to execute the menu item regardless of where the focus is on the page.
              		 *
-             		 * Note that although Menu can display accelerator keys, there is no infrastructure to actually catch and execute those accelerators.
              		 */
-             		accelKey: string;
              		/**
-             		 * If true, the menu item is disabled.
-             		 * If false, the menu item is enabled.
              		 */
-             		disabled: boolean;
-             		/** Menu text as HTML */
-             		label: string;
              		/**
-             		 * Class to apply to DOMNode to make it display an icon.
              		 */
-             		iconClass: string;
              		/**
-             		 * Hook for attr('accelKey', ...) to work.
-             		 * Set accelKey on this menu item.
              		 */
-             		_setAccelKeyAttr(value: string): void;
              		/**
-             		 * Hook for attr('disabled', ...) to work.
-             		 * Enable or disable this menu item.
              		 */
-             		_setDisabledAttr(value: boolean): void;
-             		_setLabelAttr(val: string): void;
-             		_setIconClassAttr(val: string): void;
-             		_fillContent(source: Element): void;
              		/**
-             		 * Indicate that this node is the currently selected one
              		 */
-             		_setSelected(selected: boolean): void;
-             		focus(): void;
              		/**
-             		 * Deprecated.
-             		 * Use set('disabled', bool) instead.
              		 */
-             		setDisabled(disabled: boolean): void;
              		/**
-             		 * Deprecated.
-             		 * Use set('label', ...) instead.
              		 */
-             		setLabel(content: string): void;
              	}
-             	interface MenuItemConstructor extends _WidgetBaseConstructor<MenuItem> { }
-             	/* dijit/MenuSeparator */
-             	interface MenuSeparator extends _WidgetBase, _TemplatedMixin, _Contained { }
-             	interface MenuSeparatorConstructor extends _WidgetBaseConstructor<MenuSeparator> { }
-             	/* dijit/place */
-             	interface PlacePosition {
-             		x: number;
-             		y: number;
              	}
-             	interface PlaceWidthHeight {
-             		w: number;
-             		h: number;
              	}
-             	interface PlaceRectangle extends PlacePosition, PlaceWidthHeight { }
-             	type PlaceCorner = 'BL' | 'TR' | 'BR' | 'TL';
-             	type PlacePositions = 'before' | 'after' | 'before-centered' | 'after-centered' | 'above-centered' | 'above' | 'above-alt' | 'below-centered' | 'below' | 'below-alt';
-             	interface PlaceChoice {
-             		corner: PlaceCorner;
-             		pos: PlacePosition;
-             		aroundCorner?: PlaceCorner;
              	}
-             	interface PlaceLocation extends PlaceRectangle {
-             		corner: PlaceCorner;
-             		aroundCorner: PlaceCorner;
-             		overflow: number;
-             		spaceAvailable: PlaceWidthHeight;
              	}
-             	interface LayoutNodeFunction {
-             		(node: HTMLElement, aroundCorner: string, corner: string, spaceAvailable: PlaceWidthHeight, aroundNodeCoords: PlaceWidthHeight): number;
              	}
-             	interface Place {
              		/**
-             		 * Positions node kitty-corner to the rectangle centered at (pos.x, pos.y) with width and height of
-             		 * padding.x * 2 and padding.y * 2, or zero if padding not specified.  Picks first corner in corners[]
-             		 * where node is fully visible, or the corner where it's most visible.
              		 *
-             		 * Node is assumed to be absolutely or relatively positioned.
              		 */
-             		at(node: Element, pos?: PlacePosition, corners?: PlaceCorner[], padding?: PlacePosition, layoutNode?: LayoutNodeFunction): PlaceLocation;
              		/**
-             		 * Position node adjacent or kitty-corner to anchor
-             		 * such that it's fully visible in viewport.
              		 */
-             		around(node: Element, anchor: Element | PlaceRectangle, positions: PlacePositions[], leftToRight?: boolean, layoutNode?: LayoutNodeFunction): PlaceLocation;
              	}
-             	/* dijit/popup */
-             	interface PopupOpenArgs {
              		/**
-             		 * widget to display
              		 */
-             		popup?: _WidgetBase;
              		/**
-             		 * the button etc. that is displaying this popup
              		 */
-             		parent?: _WidgetBase;
              		/**
-             		 * DOM node (typically a button); place popup relative to this node.  (Specify this *or* "x" and "y" parameters.)
              		 */
-             		around?: HTMLElement;
              		/**
-             		 * Absolute horizontal position (in pixels) to place node at.  (Specify this *or* "around" parameter.)
              		 */
-             		x?: number;
              		/**
-             		 * Absolute vertical position (in pixels) to place node at.  (Specify this *or* "around" parameter.)
              		 */
-             		y?: number;
              		/**
-             		 * When the around parameter is specified, orient should be a list of positions to try
              		 */
-             		orient?: string | string[] | { BL?: string; TR?: string; TL?: string; BR?: string; };
              		/**
-             		 * callback when user has canceled the popup by:
              		 *
-             		 * 1. hitting ESC or
-             		 * 2. by using the popup widget's proprietary cancel mechanism (like a cancel button in a dialog);
-             		 *    i.e. whenever popupWidget.onCancel() is called, args.onCancel is called
              		 */
-             		onCancel?: () => void;
              		/**
-             		 * callback whenever this popup is closed
              		 */
-             		onClose?: () => void;
              		/**
-             		 * callback when user "executed" on the popup/sub-popup by selecting a menu choice, etc. (top menu only)
              		 */
-             		onExecute?: () => void;
              		/**
-             		 * adding a buffer around the opening position. This is only useful when around is not set.
              		 */
-             		padding?: PlacePosition;
              		/**
-             		 * The max height for the popup.  Any popup taller than this will have scrollbars.
-             		 * Set to Infinity for no max height.  Default is to limit height to available space in viewport,
-             		 * above or below the aroundNode or specified x/y position.
              		 */
-             		maxHeight?: number;
              	}
-             	interface PopupManager {
              		/**
-             		 * Stack of currently popped up widgets.
-             		 * (someone opened _stack[0], and then it opened _stack[1], etc.)
              		 */
-             		_stack: _WidgetBase[];
              		/**
-             		 * Z-index of the first popup.   (If first popup opens other
-             		 * popups they get a higher z-index.)
              		 */
-             		_beginZIndex: number;
-             		_idGen: number;
              		/**
-             		 * If screen has been scrolled, reposition all the popups in the stack.
-             		 * Then set timer to check again later.
              		 */
-             		_repositionAll(): void;
              		/**
-             		 * Initialization for widgets that will be used as popups.
-             		 * Puts widget inside a wrapper DIV (if not already in one),
-             		 * and returns pointer to that wrapper DIV.
              		 */
-             		_createWrapper(widget: _WidgetBase): HTMLDivElement;
              		/**
-             		 * Moves the popup widget off-screen.
-             		 * Do not use this method to hide popups when not in use, because
-             		 * that will create an accessibility issue: the offscreen popup is
-             		 * still in the tabbing order.
              		 */
-             		moveOffScreen(widget: _WidgetBase): HTMLDivElement;
              		/**
-             		 * Hide this popup widget (until it is ready to be shown).
-             		 * Initialization for widgets that will be used as popups
              		 *
-             		 * Also puts widget inside a wrapper DIV (if not already in one)
              		 *
-             		 * If popup widget needs to layout it should
-             		 * do so when it is made visible, and popup._onShow() is called.
              		 */
-             		hide(widget: _WidgetBase): void;
              		/**
-             		 * Compute the closest ancestor popup that's *not* a child of another popup.
-             		 * Ex: For a TooltipDialog with a button that spawns a tree of menus, find the popup of the button.
              		 */
-             		getTopPopup(): _WidgetBase;
              		/**
-             		 * Popup the widget at the specified position
              		 */
-             		open(args: PopupOpenArgs): PlaceLocation;
              		/**
-             		 * Close specified popup and any popups that it parented.
-             		 * If no popup is specified, closes all popups.
              		 */
-             		close(popup?: _WidgetBase): void;
              	}
-             	/* dijit/PopupMenuBarItem */
-             	interface PopupMenuBarItem extends PopupMenuItem { }
-             	interface PopupMenuBarItemConstructor extends _WidgetBaseConstructor<PopupMenuBarItem> { }
-             	/** dijit/PopupMenuItem */
              	/**
-             	 * An item in a Menu that spawn a drop down (usually a drop down menu)
              	 */
-             	interface PopupMenuItem extends MenuItem {
              		/**
-             		 * When Menu is declared in markup, this code gets the menu label and the popup widget from the srcNodeRef.
              		 *
-             		 * srcNodeRef.innerHTML contains both the menu item text and a popup widget
-             		 * The first part holds the menu item text and the second part is the popup
              		 */
-             		_fillContent(source: Element): void;
              		/**
-             		 * Open the popup to the side of/underneath this MenuItem, and optionally focus first item
              		 */
-             		_openPopup(params: { around?: Element; popup?: Function }, focus?: boolean): void;
-             		_closePopup(): void;
              	}
-             	interface PopupMenuItemConstructor extends _WidgetBaseConstructor<PopupMenuItem> { }
-             	/* dijit/registry */
-             	interface Registry {
              		/**
-             		 * Number of registered widgets
              		 */
-             		length: number;
              		/**
-             		 * Add a widget to the registry. If a duplicate ID is detected, a error is thrown.
              		 */
-             		add(widget: _WidgetBase): void;
              		/**
-             		 * Remove a widget from the registry. Does not destroy the widget; simply
-             		 * removes the reference.
              		 */
-             		remove(id: string): void;
              		/**
-             		 * Find a widget by it's id.
-             		 * If passed a widget then just returns the widget.
              		 */
-             		byId(id: string | _WidgetBase): _WidgetBase;
              		/**
-             		 * Returns the widget corresponding to the given DOMNode
              		 */
-             		byNode(node: Element | Node): _WidgetBase;
              		/**
-             		 * Convert registry into a true Array
              		 */
-             		toArray(): _WidgetBase[];
              		/**
-             		 * Generates a unique id for a given widgetType
              		 */
-             		getUniqueId(widgetType: string): string;
              		/**
-             		 * Search subtree under root returning widgets found.
-             		 * Doesn't search for nested widgets (ie, widgets inside other widgets).
              		 */
-             		findWidgets(root: Node, skipNode?: Node): _WidgetBase[];
              		/**
-             		 * Returns the widget whose DOM tree contains the specified DOMNode, or null if
-             		 * the node is not contained within the DOM tree of any widget
              		 */
-             		getEnclosingWidget(node: Element | Node): _WidgetBase;
              	}
-             	/* dijit/TitlePane */
-             	interface TitlePane extends dijit.layout.ContentPane, _TemplatedMixin, _CssStateMixin {
              		/**
-             		 * Whether pane can be opened or closed by clicking the title bar.
              		 */
-             		toggleable: boolean;
              		/**
-             		 * Tabindex setting for the title (so users can tab to the title then use space/enter to open/close the title pane)
              		 */
-             		tabIndex: string;
              		/**
-             		 * Time in milliseconds to fade in/fade out
              		 */
-             		duration: number;
              		/**
-             		 * Don't change this parameter from the default value.
              		 *
-             		 * This ContentPane parameter doesn't make sense for TitlePane, since TitlePane is never a child of a layout container, nor should TitlePane try to control the size of an inner widget.
              		 */
-             		doLayout: boolean;
              		/**
-             		 * Switches between opened and closed state
              		 */
-             		toggle(): void;
              		/**
-             		 * Set the open/close css state for the TitlePane
              		 */
-             		_setCss(): void;
              		/**
-             		 * Handler for when user hits a key
              		 */
-             		_onTitleKey(e: Event): void;
              		/**
-             		 * Handler when user clicks the title bar
              		 */
-             		_onTitleClick(): void;
              		/**
-             		 * Deprecated. Use set('title', ...) instead.
              		 */
-             		setTitle(): void;
              	}
-             	interface TitlePaneConstructor extends _WidgetBaseConstructor<TitlePane> { }
-             	/* dijit/Toolbar */
-             	interface Toolbar extends dijit._Widget, dijit._TemplatedMixin, dijit._KeyNavContainer { }
-             	interface ToolbarConstructor extends _WidgetBaseConstructor<Toolbar> { }
-             	/* dijit/ToolbarSeparator */
-             	interface ToolbarSeparator extends dijit._Widget, dijit._TemplatedMixin { }
-             	interface ToolbarSeparatorConstructor extends _WidgetBaseConstructor<ToolbarSeparator> { }
-             	/* dijit/Tooltip */
-             	interface Tooltip extends _Widget {
              		/**
-             		 * HTML to display in the tooltip.
-             		 * Specified as innerHTML when creating the widget from markup.
              		 */
-             		label: string;
              		/**
-             		 * Number of milliseconds to wait after hovering over/focusing on the object, before
-             		 * the tooltip is displayed.
              		 */
-             		showDelay: number;
              		/**
-             		 * Number of milliseconds to wait after unhovering the object, before
-             		 * the tooltip is hidden.  Note that blurring an object hides the tooltip immediately.
              		 */
-             		hideDelay: number;
              		/**
-             		 * Id of domNode(s) to attach the tooltip to.
-             		 * When user hovers over specified dom node(s), the tooltip will appear.
              		 */
-             		connectId: dojo.NodeOrString | dojo.NodeOrString[];
              		/**
-             		 * See description of `dijit/Tooltip.defaultPosition` for details on position parameter.
              		 */
-             		position: string;
              		/**
-             		 * CSS expression to apply this Tooltip to descendants of connectIds, rather than to
-             		 * the nodes specified by connectIds themselves.    Useful for applying a Tooltip to
-             		 * a range of rows in a table, tree, etc.   Use in conjunction with getContent() parameter.
-             		 * Ex: connectId: myTable, selector: "tr", getContent: function(node){ return ...; }
              		 *
-             		 * The application must require() an appropriate level of dojo/query to handle the selector.
              		 */
-             		selector: string;
              		/**
-             		 * Attach tooltip to specified node if it's not already connected
              		 */
-             		addTarget(node: dojo.NodeOrString): void;
              		/**
-             		 * Detach tooltip from specified node
              		 */
-             		removeTarget(node: dojo.NodeOrString): void;
              		/**
-             		 * User overridable function that return the text to display in the tooltip.
              		 */
-             		getContent(node: Node): Node;
              		/**
-             		 * Display the tooltip; usually not called directly.
              		 */
-             		open(target: Node): void;
              		/**
-             		 * Hide the tooltip or cancel timer for show of tooltip
              		 */
-             		close(): void;
              		/**
-             		 * Called when the tooltip is shown
              		 */
-             		onShow(): void;
              		/**
-             		 * Called when the tooltip is hidden
              		 */
-             		onHide(): void;
              	}
-             	interface TooltipConstructor extends _WidgetBaseConstructor<Tooltip> {
              		/**
-             		 * 	This variable controls the position of tooltips, if the position is not specified to
-             		 * 	the Tooltip widget or *TextBox widget itself.  It's an array of strings with the values
-             		 * 	possible for `dijit/place.around()`.   The recommended values are:
              		 *
-             		 * 	- before-centered: centers tooltip to the left of the anchor node/widget, or to the right
-             		 * 	  in the case of RTL scripts like Hebrew and Arabic
-             		 * 	- after-centered: centers tooltip to the right of the anchor node/widget, or to the left
-             		 * 	  in the case of RTL scripts like Hebrew and Arabic
-             		 * 	- above-centered: tooltip is centered above anchor node
-             		 * 	- below-centered: tooltip is centered above anchor node
              		 *
-             		 * 	The list is positions is tried, in order, until a position is found where the tooltip fits
-             		 * 	within the viewport.
              		 *
-             		 * 	Be careful setting this parameter.  A value of "above-centered" may work fine until the user scrolls
-             		 * 	the screen so that there's no room above the target node.   Nodes with drop downs, like
-             		 * 	DropDownButton or FilteringSelect, are especially problematic, in that you need to be sure
-             		 * 	that the drop down and tooltip don't overlap, even when the viewport is scrolled so that there
-             		 * 	is only room below (or above) the target node, but not both.
              		 */
-             		defaultPosition: [string];
              		/**
-             		 * Static method to display tooltip w/specified contents in specified position.
-             		 * See description of dijit/Tooltip.defaultPosition for details on position parameter.
-             		 * If position is not specified then dijit/Tooltip.defaultPosition is used.
              		 */
-             		show(innerHTML: string, aroundNode: PlaceRectangle, position?: [string], rtl?: boolean, textDir?: string, onMouseEnter?: Function, onMouseLeave?: Function): void;
              		/**
-             		 * Hide the tooltip
              		 */
-             		hide(aroundNode: PlaceRectangle): void;
              	}
-             	/* dijit/TooltipDialog */
-             	interface TooltipDialog extends layout.ContentPane, _TemplatedMixin, form._FormMixin, _DialogMixin {
              		/**
-             		 * Description of tooltip dialog (required for a11y)
              		 */
-             		title: string;
              		/**
-             		 * Don't change this parameter from the default value.
-             		 * This ContentPane parameter doesn't make sense for TooltipDialog, since TooltipDialog
-             		 * is never a child of a layout container, nor can you specify the size of
-             		 * TooltipDialog in order to control the size of an inner widget.
              		 */
-             		doLayout: boolean;
              		/**
-             		 * A Toggle to modify the default focus behavior of a Dialog, which
-             		 * is to focus on the first dialog element after opening the dialog.
-             		 * False will disable autofocusing.  Default: true.
              		 */
-             		autofocus: boolean;
              		/**
-             		 * The pointer to the first focusable node in the dialog.
              		 */
-             		_firstFocusItem: any;
              		/**
-             		 * The pointer to which node has focus prior to our dialog.
              		 */
-             		_lastFocusItem: any;
              		/**
-             		 * Configure widget to be displayed in given position relative to the button.
              		 *
-             		 * This is called from the dijit.popup code, and should not be called directly.
              		 */
-             		orient(node: Node | HTMLElement, aroundCorner: PlaceCorner, tooltipCorner: PlaceCorner): void;
              		/**
-             		 * Focus on first field
              		 */
-             		focus(): void;
              		/**
-             		 * Called when dialog is displayed.
              		 *
-             		 * This is called from the dijit.popup code, and should not be called directly.
              		 */
-             		onOpen(pos: {
-             			aroundCorner: PlaceCorner
-             			aroundNodePos: PlacePosition
-             			corner: PlaceCorner
              			x: number
              			y: number
-             		}): void;
              		/**
-             		 * Handler for keydown events
              		 *
-             		 * Keep keyboard focus in dialog; close dialog on escape key
              		 */
-             		_onKey(evt: KeyboardEvent): void;
              	}
-             	interface TooltipDialogConstructor extends _WidgetBaseConstructor<TooltipDialog> { }
              }

dojo-typings/src/main/typings/dijit/modules.d.ts +3 -3

              /// <reference path="index.d.ts" />
              declare module 'dijit/_Widget' {
              	type _Widget = dijit._Widget;
              	const _Widget: dijit._WidgetBaseConstructor<_Widget>;
              	export = _Widget;
              }
              declare module 'dijit/_WidgetBase' {
-             	type _WidgetBase<A = any> = dijit._WidgetBase<A>;
+             	type _WidgetBase<E extends { [k in keyof E]: Event } = {}> = dijit._WidgetBase<E & GlobalEventHandlersEventMap>;
                  // individual _WidgetBase constructor to keep type parameters
                  interface _WidgetBaseConstructor {
-                     new <A = any>(params?: Partial<_WidgetBase<A> & A>, srcNodeRef?: dojo.NodeOrString): _WidgetBase<A> & dojo._base.DeclareCreatedObject;
-                     prototype: _WidgetBase;
+                     new <A = {}, E extends { [k in keyof E]: Event } = {}>(params?: Partial<_WidgetBase<E> & A>, srcNodeRef?: dojo.NodeOrString): _WidgetBase<E> & dojo._base.DeclareCreatedObject;
+                     prototype: _WidgetBase<any>;
                  }
              	const _WidgetBase: _WidgetBaseConstructor;
              	export = _WidgetBase;
              }
              declare module 'dijit/_AttachMixin' {
              	type _AttachMixin = dijit._AttachMixin;
              	const _AttachMixin: dijit._AttachMixinConstructor;
              	export = _AttachMixin;
              }
              declare module 'dijit/_CssStateMixin' {
              	type _CssStateMixin = dijit._CssStateMixin;
              	const _CssStateMixin: dijit._CssStateMixinConstructor;
              	export = _CssStateMixin;
              }
              declare module 'dijit/_Contained' {
              	type _Contained = dijit._Contained;
              	const _Contained: dijit._ContainedConstructor;
              	export = _Contained;
              }
              declare module 'dijit/_Container' {
              	type _Container = dijit._Container;
              	const _Container: dijit._ContainerConstructor;
              	export = _Container;
              }
              declare module 'dijit/_KeyNavContainer' {
              	type _KeyNavContainer = dijit._KeyNavContainer;
              	const _KeyNavContainer: dijit._KeyNavContainerConstructor;
              	export = _KeyNavContainer;
              }
              declare module 'dijit/_KeyNavMixin' {
              	type _KeyNavMixin = dijit._KeyNavMixin;
              	const _KeyNavMixin: dijit._KeyNavMixinConstructor;
              	export = _KeyNavMixin;
              }
              declare module 'dijit/_MenuBase' {
              	type _MenuBase = dijit._MenuBase;
              	const _MenuBase: dijit._MenuBaseConstructor;
              	export = _MenuBase;
              }
              declare module 'dijit/_TemplatedMixin' {
              	type _TemplatedMixin = dijit._TemplatedMixin;
              	const _TemplatedMixin: dijit._TemplatedMixinConstructor;
              	export = _TemplatedMixin;
              }
              declare module 'dijit/_WidgetsInTemplateMixin' {
              	type _WidgetsInTemplateMixin = dijit._WidgetsInTemplateMixin;
              	const _WidgetsInTemplateMixin: dijit._WidgetsInTemplateMixinConstructor;
              	export = _WidgetsInTemplateMixin;
              }
              declare module 'dijit/ConfirmDialog' {
              	type ConfirmDialog = dijit.ConfirmDialog;
              	const ConfirmDialog: dijit.ConfirmDialogConstructor;
              	export = ConfirmDialog;
              }
              declare module 'dijit/Calendar' {
              	type Calendar = dijit.Calendar;
              	const Calendar: dijit.CalendarConstructor;
              	export = Calendar;
              }
              declare module 'dijit/CalendarLite' {
              	type CalendarLite = dijit.CalendarLite;
              	const CalendarLite: dijit.CalendarLiteConstructor;
              	export = CalendarLite;
              }
              declare module 'dijit/Destroyable' {
              	type Destroyable = dijit.Destroyable;
              	const Destroyable: dijit.DestroyableConstructor;
              	export = Destroyable;
              }
              declare module 'dijit/Dialog' {
              	type Dialog = dijit.Dialog;
              	const Dialog: dijit.DialogConstructor;
              	export = Dialog;
              }
              declare module 'dijit/DropDownMenu' {
              	type DropDownMenu = dijit.DropDownMenu;
              	const DropDownMenu: dijit.DropDownMenuConstructor;
              	export = DropDownMenu;
              }
              declare module 'dijit/Fieldset' {
              	type Fieldset = dijit.Fieldset;
              	const Fieldset: dijit.FieldsetConstructor;
              	export = Fieldset;
              }
              declare module 'dijit/Menu' {
              	type Menu = dijit.Menu;
              	const Menu: dijit.MenuConstructor;
              	export = Menu;
              }
              declare module 'dijit/MenuBar' {
              	type MenuBar = dijit.MenuBar;
              	const MenuBar: dijit.MenuBarConstructor;
              	export = MenuBar;
              }
              declare module 'dijit/MenuBarItem' {
              	type MenuBarItem = dijit.MenuBarItem;
              	const MenuBarItem: dijit.MenuBarItemConstructor;
              	export = MenuBarItem;
              }
              declare module 'dijit/MenuItem' {
              	type MenuItem = dijit.MenuItem;
              	const MenuItem: dijit.MenuItemConstructor;
              	export = MenuItem;
              }
              declare module 'dijit/MenuSeparator' {
              	type MenuSeparator = dijit.MenuSeparator;
              	const MenuSeparator: dijit.MenuSeparatorConstructor;
              	export = MenuSeparator;
              }
              declare module 'dijit/place' {
              	const place: dijit.Place;
              	export = place;
              }
              declare module 'dijit/popup' {
              	const popup: dijit.PopupManager;
              	export = popup;
              }
              declare module 'dijit/PopupMenuBarItem' {
              	type PopupMenuBarItem = dijit.PopupMenuBarItem;
              	const PopupMenuBarItem: dijit.PopupMenuBarItemConstructor;
              	export = PopupMenuBarItem;
              }
              declare module 'dijit/PopupMenuItem' {
              	type PopupMenuItem = dijit.PopupMenuItem;
              	const PopupMenuItem: dijit.PopupMenuItemConstructor;
              	export = PopupMenuItem;
              }
              declare module 'dijit/registry' {
              	const registry: dijit.Registry;
              	export = registry;
              }
              declare module 'dijit/TitlePane' {
              	type TitlePane = dijit.TitlePane;
              	const TitlePane: dijit.TitlePaneConstructor;
              	export = TitlePane;
              }
              declare module 'dijit/Toolbar' {
              	type Toolbar = dijit.Toolbar;
              	const Toolbar: dijit.ToolbarConstructor;
              	export = Toolbar;
              }
              declare module 'dijit/ToolbarSeparator' {
              	type ToolbarSeparator = dijit.ToolbarSeparator;
              	const ToolbarSeparator: dijit.ToolbarSeparatorConstructor;
              	export = ToolbarSeparator;
              }
              declare module 'dijit/Tooltip' {
              	type Tooltip = dijit.Tooltip;
              	const Tooltip: dijit.TooltipConstructor;
              	export = Tooltip;
              }
              declare module 'dijit/TooltipDialog' {
              	type TooltipDialog = dijit.TooltipDialog;
              	const TooltipDialog: dijit.TooltipDialogConstructor;
              	export = TooltipDialog;
              }
              declare module 'dijit/_base/focus' {
              	const focus: dijit._base.Focus;
              	export = focus;
              }
              declare module 'dijit/_base/manager' {
              	const manager: dijit._base.Manager;
              	export = manager;
              }
              declare module 'dijit/_base/place' {
              	const place: dijit._base.Place;
              	export = place;
              }
              declare module 'dijit/_base/popup' {
              	const popup: dijit._base.Popup;
              	export = popup;
              }
              declare module 'dijit/_base/scroll' {
              	const scroll: dijit._base.Scroll;
              	export = scroll;
              }
              declare module 'dijit/_base/sniff' {
              	const sniff: dijit._base.Sniff;
              	export = sniff;
              }
              declare module 'dijit/_base/typematic' {
              	const typematic: dijit._base.Typematic;
              	export = typematic;
              }
              declare module 'dijit/_base/wai' {
              	const wai: dijit._base.Wai;
              	export = wai;
              }
              declare module 'dijit/_base/window' {
              	const window: dijit._base.Window;
              	export = window;
              }
              declare module 'dijit/form/_FormMixin' {
              	type _FormMixin = dijit.form._FormMixin;
              	const _FormMixin: dijit.form._FormMixinConstructor;
              	export = _FormMixin;
              }
              declare module 'dijit/form/_FormValueWidget' {
              	type _FormValueWidget = dijit.form._FormValueWidget;
              	const _FormValueWidget: dijit.form._FormValueWidgetConstructor;
              	export = _FormValueWidget;
              }
              declare module 'dijit/form/_FormWidget' {
              	type _FormWidget = dijit.form._FormWidget;
              	const _FormWidget: dijit.form._FormWidgetConstructor;
              	export = _FormWidget;
              }
              declare module 'dijit/form/Button' {
              	type Button = dijit.form.Button;
              	const Button: dijit.form.ButtonConstructor;
              	export = Button;
              }
              declare module 'dijit/form/CheckBox' {
              	type CheckBox = dijit.form.CheckBox;
              	const CheckBox: dijit.form.CheckBoxConstructor;
              	export = CheckBox;
              }
              declare module 'dijit/form/ComboBox' {
              	type ComboBox = dijit.form.TextBox;
              	const ComboBox: dijit.form.ComboBoxConstructor;
              	export = ComboBox;
              }
              declare module 'dijit/form/ComboBoxMixin' {
              	type ComboBoxMixin<T, U extends dojo.store.api.BaseQueryType, V> = dijit.form.ComboBoxMixin<T, U, V>;
              	const ComboBoxMixin: dijit.form.ComboBoxConstructor;
              	export = ComboBoxMixin;
              }
              declare module 'dijit/form/CurrencyTextBox' {
              	type CurrencyTextBox = dijit.form.CurrencyTextBox;
              	const CurrencyTextBox: dijit.form.CurrencyTextBoxConstructor;
              	export = CurrencyTextBox;
              }
              declare module 'dijit/form/DataList' {
              	type DataList<T> = dijit.form.DataList<T>;
              	const DataList: dijit.form.DataListConstructor;
              	export = DataList;
              }
              declare module 'dijit/form/DateTextBox' {
              	type DateTextBox = dijit.form.DateTextBox;
              	const DateTextBox: dijit.form.DateTextBoxConstructor;
              	export = DateTextBox;
              }
              declare module 'dijit/form/DropDownButton' {
              	type DropDownButton<T extends dijit._WidgetBase> = dijit.form.DropDownButton<T>;
              	const DropDownButton: dijit.form.DropDownButtonConstructor;
              	export = DropDownButton;
              }
              declare module 'dijit/form/FilteringSelect' {
              	type FilteringSelect<C extends dijit.form.Constraints, T extends Object, Q extends string | Object | Function, O extends dojo.store.api.QueryOptions> = dijit.form.FilteringSelect<C, T, Q, O>;
              	const FilteringSelect: dijit.form.FilteringSelectConstructor;
              	export = FilteringSelect;
              }
              declare module 'dijit/form/Form' {
              	type Form = dijit.form.Form;
              	const Form: dijit.form.FormConstructor;
              	export = Form;
              }
              declare module 'dijit/form/HorizontalRule' {
              	type HorizontalRule = dijit.form.HorizontalRule;
              	const HorizontalRule: dijit.form.HorizontalRuleConstructor;
              	export = HorizontalRule;
              }
              declare module 'dijit/form/HorizontalRuleLabels' {
              	type HorizontalRuleLabels = dijit.form.HorizontalRuleLabels;
              	const HorizontalRuleLabels: dijit.form.HorizontalRuleLabelsConstructor;
              	export = HorizontalRuleLabels;
              }
              declare module 'dijit/form/HorizontalSlider' {
              	type HorizontalSlider = dijit.form.HorizontalSlider;
              	const HorizontalSlider: dijit.form.HorizontalSliderConstructor;
              	export = HorizontalSlider;
              }
              declare module 'dijit/form/MappedTextBox' {
              	type MappedTextBox<C extends dijit.form.Constraints> = dijit.form.MappedTextBox<C>;
              	const MappedTextBox: dijit.form.MappedTextBoxConstructor;
              	export = MappedTextBox;
              }
              declare module 'dijit/form/NumberSpinner' {
              	type NumberSpinner = dijit.form.NumberSpinner;
              	const NumberSpinner: dijit.form.NumberSpinnerConstructor;
              	export = NumberSpinner;
              }
              declare module 'dijit/form/NumberTextBox' {
              	type NumberTextBox = dijit.form.NumberTextBox;
              	const NumberTextBox: dijit.form.NumberTextBoxConstructor;
              	export = NumberTextBox;
              }
              declare module 'dijit/form/RadioButton' {
              	type RadioButton = dijit.form.RadioButton;
              	const RadioButton: dijit.form.RadioButtonConstructor;
              	export = RadioButton;
              }
              declare module 'dijit/form/RangeBoundTextBox' {
              	type RangeBoundTextBox = dijit.form.RangeBoundTextBox;
              	const RangeBoundTextBox: dijit.form.RangeBoundTextBoxConstructor;
              	export = RangeBoundTextBox;
              }
              declare module 'dijit/form/Select' {
              	type Select<T, Q extends dojo.store.api.BaseQueryType, O, U extends dijit._WidgetBase> = dijit.form.Select<T, Q, O, U>;
              	const Select: dijit.form.SelectConstructor;
              	export = Select;
              }
              declare module 'dijit/form/SimpleTextarea' {
              	type SimpleTextarea = dijit.form.SimpleTextarea;
              	const SimpleTextarea: dijit.form.SimpleTextareaConstructor;
              	export = SimpleTextarea;
              }
              declare module 'dijit/form/Textarea' {
              	type Textarea = dijit.form.Textarea;
              	const Textarea: dijit.form.TextareaConstructor;
              	export = Textarea;
              }
              declare module 'dijit/form/TextBox' {
              	type TextBox = dijit.form.TextBox;
              	const TextBox: dijit.form.TextBoxConstructor;
              	export = TextBox;
              }
              declare module 'dijit/form/ToggleButton' {
              	type ToggleButton = dijit.form.ToggleButton;
              	const ToggleButton: dijit.form.ToggleButtonConstructor;
              	export = ToggleButton;
              }
              declare module 'dijit/form/ValidationTextBox' {
              	type ValidationTextBox<C extends dijit.form.Constraints> = dijit.form.ValidationTextBox<C>;
              	const ValidationTextBox: dijit.form.ValidationTextBoxConstructor;
              	export = ValidationTextBox;
              }
              declare module 'dijit/layout/_LayoutWidget' {
              	type _LayoutWidget = dijit.layout._LayoutWidget;
              	const _LayoutWidget: dijit.layout._LayoutWidgetConstructor;
              	export = _LayoutWidget;
              }
              declare module 'dijit/layout/AccordionContainer' {
              	type AccordionContainer = dijit.layout.AccordionContainer;
              	const AccordionContainer: dijit.layout.AccordionContainerConstructor;
              	export = AccordionContainer;
              }
              declare module 'dijit/layout/AccordionPane' {
              	type AccordionPane = dijit.layout.AccordionPane;
              	const AccordionPane: dijit.layout.AccordionPaneConstructor;
              	export = AccordionPane;
              }
              declare module 'dijit/layout/ContentPane' {
              	type ContentPane = dijit.layout.ContentPane;
              	const ContentPane: dijit.layout.ContentPaneConstructor;
              	export = ContentPane;
              }
              declare module 'dijit/layout/_ContentPaneResizeMixin' {
              	type _ContentPaneResizeMixin = dijit.layout._ContentPaneResizeMixin;
              	const _ContentPaneResizeMixin: dijit.layout._ContentPaneResizeMixinConstructor;
              	export = _ContentPaneResizeMixin;
              }
              declare module 'dijit/layout/BorderContainer' {
              	type BorderContainer = dijit.layout.BorderContainer;
              	const BorderContainer: dijit.layout.BorderContainerConstructor;
              	export = BorderContainer;
              }
              declare module 'dijit/layout/LayoutContainer' {
              	type LayoutContainer = dijit.layout.LayoutContainer;
              	const LayoutContainer: dijit.layout.LayoutContainerConstructor;
              	export = LayoutContainer;
              }
              declare module 'dijit/layout/LinkPane' {
              	type LinkPane = dijit.layout.LinkPane;
              	const LinkPane: dijit.layout.LinkPaneConstructor;
              	export = LinkPane;
              }
              declare module 'dijit/layout/ScrollingTabController' {
              	type ScrollingTabController = dijit.layout.ScrollingTabController;
              	const ScrollingTabController: dijit.layout.ScrollingTabControllerConstructor;
              	export = ScrollingTabController;
              }
              declare module 'dijit/layout/StackContainer' {
              	type StackContainer = dijit.layout.StackContainer;
              	const StackContainer: dijit.layout.StackContainerConstructor;
              	export = StackContainer;
              }
              declare module 'dijit/layout/StackController' {
              	type StackController = dijit.layout.StackController;
              	const StackController: dijit.layout.StackControllerConstructor;
              	export = StackController;
              }
              declare module 'dijit/layout/TabContainer' {
              	type TabContainer = dijit.layout.TabContainer;
              	const TabContainer: dijit.layout.TabContainerConstructor;
              	export = TabContainer;
              }
              declare module 'dijit/layout/TabController' {
              	type TabController = dijit.layout.TabController;
              	const TabController: dijit.layout.TabControllerConstructor;
              	export = TabController;
              }

dojo-typings/src/main/typings/dojo/dojo.d.ts +1 -1

              /// <reference path="index.d.ts" />
              /// <reference path="../doh/doh.d.ts" />
              declare namespace dojo {
              	/* general implied types */
              	type NodeOrString = Node | string;
              	type ElementOrString = Element | string;
              	type NodeFragmentOrString = NodeOrString | DocumentFragment;
              	interface GenericConstructor<T> {
              		new (...args: any[]): T;
              		prototype: T;
              	}
              	interface GenericObject {
              		[id: string]: any;
              	}
              	interface GenericFunction<T> {
              		(...args: any[]): T;
              	}
              	interface Handle {
              		remove(): void;
              	}
              	interface EventListener {
              		(evt: any): void;
              	}
              	interface BuildProfile {
              		resourceTags: { [tag: string]: (filename: string, mid?: string) => boolean; };
              	}
              	interface Package {
              		location?: string;
              		main?: string;
              		name?: string;
              	}
              	export interface ModuleMap extends ModuleMapItem {
              		[ sourceMid: string ]: ModuleMapReplacement;
              	}
              	export interface ModuleMapItem {
              		[ mid: string ]: /* ModuleMapReplacement | ModuleMap */ any;
              	}
              	export interface ModuleMapReplacement extends ModuleMapItem {
              		[ findMid: string ]: /* replaceMid */ string;
              	}
              	/* dojo/AdapterRegistry */
              	interface AdapterRegistry {
              		/**
              		 * register a check function to determine if the wrap function or
              		 * object gets selected
              		 */
              		register(name: string, check: (...args: any[]) => boolean, wrap: Function, directReturn?: boolean, override?: boolean): void;
              		/**
              		 * Find an adapter for the given arguments. If no suitable adapter
              		 * is found, throws an exception. match() accepts any number of
              		 * arguments, all of which are passed to all matching functions
              		 * from the registered pairs.
              		 */
              		match(...args: any[]): any;
              		/**
              		 * Remove a named adapter from the registry
              		 */
              		unregister(name: string): boolean;
              	}
              	interface AdapterRegistryConstructor {
              		new (returnWrappers?: boolean): AdapterRegistry;
              		prototype: AdapterRegistry;
              	}
              	/* dojo/aspect */
              	interface AfterAdvice<T> {
              		(result: T, ...args: any[]): T;
              	}
              	interface AroundAdvice<T> {
              		(origFn: GenericFunction<T>): (...args: any[]) => T;
              	}
              	interface BeforeAdvice {
              		(...args: any[]): any[] | void;
              	}
              	interface Aspect {
              		/**
              		 * The "before" export of the aspect module is a function that can be used to attach
              		 * "before" advice to a method. This function will be executed before the original attach
              		 * is executed. This function will be called with the arguments used to call the mattach
              		 * This function may optionally return an array as the new arguments to use tattach
              		 * the original method (or the previous, next-to-execute before advice, if one exattach
              		 * If the before method doesn't return anything (returns undefined) the original argattach
              		 * will be presattach
              		 * If there are multiple "before" advisors, they are executed in the reverse order they were registered.
              		 */
              		before<T>(target: GenericObject, methodName: string, advice: BeforeAdvice | Function): Handle;
              		/**
              		 * The "around" export of the aspect module is a function that can be used to attach
              		 * "around" advice to a method. The advisor function is immediately executeattach
              		 * the around() is called, is passed a single argument that is a function that attach
              		 * called to continue execution of the original method (or the next around advattach
              		 * The advisor function should return a function, and this function will be called whattach
              		 * the method is called. It will be called with the arguments used to call the mattach
              		 * Whatever this function returns will be returned as the result of the method call (unless after advise changes it).
              		 */
              		around<T>(target: GenericObject, methodName: string, advice: AroundAdvice<T> | Function): Handle;
              		/**
              		 * The "after" export of the aspect module is a function that can be used to attach
              		 * "after" advice to a method. This function will be executed after the original method
              		 * is executed. By default the function will be called with a single argument, the return
              		 * value of the original method, or the the return value of the last executed advice (if a previous one exists).
              		 * The fourth (optional) argument can be set to true to so the function receives the original
              		 * arguments (from when the original method was called) rather than the return value.
              		 * If there are multiple "after" advisors, they are executed in the order they were registered.
              		 */
              		after<T>(target: GenericObject, methodName: string, advice: AfterAdvice<T> | Function, receiveArguments?: boolean): Handle;
              	}
              	/* dojo/back */
              	interface BackArgs {
              		back?: GenericFunction<void>;
              		forward?: GenericFunction<void>;
              		changeUrl?: boolean | string;
              	}
              	interface Back {
              		getHash(): string;
              		setHash(h: string): void;
              		/**
              		 * private method. Do not call this directly.
              		 */
              		goBack(): void;
              		/**
              		 * private method. Do not call this directly.
              		 */
              		goForward(): void;
              		/**
              		 * Initializes the undo stack. This must be called from a <script>
              		 * block that lives inside the `<body>` tag to prevent bugs on IE.
              		 * Only call this method before the page's DOM is finished loading. Otherwise
              		 * it will not work. Be careful with xdomain loading or djConfig.debugAtAllCosts scenarios,
              		 * in order for this method to work, dojo/back will need to be part of a build layer.
              		 */
              		init(): void;
              		/**
              		 * Sets the state object and back callback for the very first page
              		 * that is loaded.
              		 * It is recommended that you call this method as part of an event
              		 * listener that is registered via dojo/ready.
              		 */
              		setInitialState(args: BackArgs): void;
              		/**
              		 * adds a state object (args) to the history list.
              		 */
              		addToHistory(args: BackArgs): void;
              		/**
              		 * private method. Do not call this directly.
              		 */
              		_iframeLoaded(evt: Event, ifrLoc: Location): void;
              	}
              	/* dojo/behavior */
              	interface Behavior {
              		_behaviors: { [selector: string]: any };
              		/**
              		 * Add the specified behavior to the list of behaviors, ignoring existing
              		 * matches.
              		 */
              		add(behaviorObject: { [selector: string]: any }): void;
              		/**
              		 * Applies all currently registered behaviors to the document.
              		 */
              		apply(): void;
              	}
              	/* dojo/cookie */
              	interface CookieProps {
              		expires?: Date | string | number;
              		path?: string;
              		domain?: string;
              		secure?: boolean;
              	}
              	interface Cookie {
              		/* Get or set a cookie. */
              		(name: string, value?: string, props?: CookieProps): string;
              		/**
              		 * Use to determine if the current browser supports cookies or not.
              		 */
              		isSupported(): boolean;
              	}
              	/* dojo/currency */
              	interface CurrencyFormatOptions extends NumberFormatOptions {
              		/**
              		 * Should not be set.  Value is assumed to be "currency".
              		 */
              		type?: string;
              		/**
              		 * localized currency symbol. The default will be looked up in table of supported currencies in `dojo.cldr`
              		 * A [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code will be used if not found.
              		 */
              		symbol?: string;
              		/**
              		 * an [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code, a three letter sequence like "USD".
              		 * For use with dojo.currency only.
              		 */
              		currency?: string;
              		/**
              		 * number of decimal places to show.  Default is defined based on which currency is used.
              		 */
              		places?: number;
              	}
              	interface CurrencyParseOptions extends NumberParseOptions {
              		/**
              		 * Should not be set.  Value is assumed to be "currency".
              		 */
              		type?: string;
              		/**
              		 * localized currency symbol. The default will be looked up in table of supported currencies in `dojo.cldr`
              		 * A [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code will be used if not found.
              		 */
              		symbol?: string;
              		/**
              		 * an [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code, a three letter sequence like "USD".
              		 * For use with dojo.currency only.
              		 */
              		currency?: string;
              		/**
              		 * number of decimal places to show.  Default is defined based on which currency is used.
              		 */
              		places?: number;
              		/**
              		 * Whether to include the fractional portion, where the number of decimal places are implied by the currency
              		 * or explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.
              		 * By default for currencies, it the fractional portion is optional.
              		 */
              		fractional?: boolean | [boolean, boolean];
              	}
              	interface Currency {
              		_mixInDefaults(options: NumberFormatOptions): CurrencyFormatOptions;
              		/**
              		 * Format a Number as a currency, using locale-specific settings
              		 */
              		format(value: number, options?: CurrencyFormatOptions): string;
              		/**
              		 * Builds the regular needed to parse a currency value
              		 */
              		regexp(options?: NumberRegexpOptions): string;
              		/**
              		 * Convert a properly formatted currency string to a primitive Number,
              		 * using locale-specific settings.
              		 */
              		parse(expression: string, options?: CurrencyParseOptions): number;
              	}
              	/* dojo/debounce */
              	interface Debounce {
              		/**
              		 * Create a function that will only execute after `wait` milliseconds
              		 */
              		<T extends Function>(cb: T, wait: number): T;
              		<T extends Function>(cb: Function, wait: number, ...args: any[]): T;
              	}
              	/* dojo/Deferred */
              	interface Deferred<T> {
              		/**
              		 * The public promise object that clients can add callbacks to.
              		 */
              		promise: promise.Promise<T>;
              		/**
              		 * Checks whether the deferred has been resolved.
              		 */
              		isResolved(): boolean;
              		/**
              		 * Checks whether the deferred has been rejected.
              		 */
              		isRejected(): boolean;
              		/**
              		 * Checks whether the deferred has been resolved or rejected.
              		 */
              		isFulfilled(): boolean;
              		/**
              		 * Checks whether the deferred has been canceled.
              		 */
              		isCanceled(): boolean;
              		/**
              		 * Emit a progress update on the deferred.
              		 */
              		progress(update: any, strict?: boolean): promise.Promise<T>;
              		/**
              		 * Resolve the deferred.
              		 */
              		resolve(value?: T, strict?: boolean): promise.Promise<T>;
              		/**
              		 * Reject the deferred.
              		 */
              		reject(error?: any, strict?: boolean): promise.Promise<T>;
              		/**
              		 * Add new callbacks to the deferred.
              		 */
              		then<U>(callback?: promise.PromiseCallback<T, U>, errback?: promise.PromiseErrback<U>, progback?: promise.PromiseProgback): promise.Promise<U>;
              		/**
              		 * Inform the deferred it may cancel its asynchronous operation.
              		 */
              		cancel(reason?: any, strict?: boolean): any;
              		/**
              		 * Returns `[object Deferred]`.
              		 */
              		toString(): string;
              	}
              	interface DeferredConstructor {
              		/**
              		 * Creates a new deferred. This API is preferred over
              		 * `dojo/_base/Deferred`.
              		 */
              		new <T>(canceller?: (reason: any) => void): Deferred<T>;
              		prototype: Deferred<any>;
              	}
              	/* dojo/DeferredList */
              	interface DeferredList<T> extends Deferred<T[]> {
              		/**
              		 * Gathers the results of the deferreds for packaging
              		 * as the parameters to the Deferred Lists' callback
              		 */
              		gatherResults<T>(deferredList: DeferredList<any>): DeferredList<T>;
              	}
              	interface DeferredListConstructor {
              		/**
              		 * Deprecated, use dojo/promise/all instead.
              		 * Provides event handling for a group of Deferred objects.
              		 */
              		new <T>(list: T[], fireOnOneCallback?: boolean, fireOnOneErrback?: boolean, consumeErrors?: boolean, canceller?: (reason: any) => void): DeferredList<T>;
              		prototype: DeferredList<any>;
              	}
              	/* dojo/dojo */
              	interface RequireTrace {
              		(group: string, args: any[]): void;
              		on: boolean | number;
              		group: GenericObject;
              		set(group: string | GenericObject, value: any): void;
              	}
              	interface Require {
              		(config: GenericObject, dependencies: string[], callback?: GenericFunction<void>): Require;
              		(dependencies: string[], callback: GenericFunction<void>): Require;
              		async: number| boolean;
              		has: dojo.Has;
              		isXdurl(url: string): boolean;
              		initSyncLoader(dojoRequirePlugin: any, checkDojoRequirePlugin: any, transformToAmd: any): GenericObject;
              		getXhr(): XMLHttpRequest | ActiveXObject;
              		getText(url: string, async?: boolean, onLoad?: (responseText: string, async?: boolean) => void): string;
              		eval(text: string, hint?: string): any;
              		signal(type: string, args: any[]): void;
              		on(type: string, listener: (...args: any[]) => void): Handle;
              		map: { [id: string]: any };
              		waitms?: number;
              		legacyMode: boolean;
              		rawConfig: dojo._base.Config;
              		baseUrl: string;
              		combo?: {
              			add: () => void;
              			done(callback: (mids: string[], url?: string) => void, req: Require): void;
              			plugins?: GenericObject;
              		};
              		idle(): boolean;
              		toAbsMid(mid: string, referenceModule?: string): string;
              		toUrl(name: string, referenceModule?: string): string;
              		undef(moduleId: string, referenceModule?: string): void;
              		pageLoaded: number | boolean;
              		injectUrl(url: string, callback?: () => void, owner?: HTMLScriptElement): HTMLScriptElement;
              		log(...args: any[]): void;
              		trace: RequireTrace;
              		boot?: [string[], Function] | number;
              	}
              	interface Define {
              		(mid: string, dependencies?: string[], factory?: any): void;
              		(dependencies: string[], factory?: any): void;
              		amd: string;
              	}
              	/* dojo/dom */
              	interface Dom {
              		/**
              		 * Returns DOM node with matching `id` attribute or falsy value (ex: null or undefined)
              		 * if not found. Internally if `id` is not a string then `id` returned.
              		 */
              		byId<E extends Element>(id: string | E, doc?: Document): E;
              		/**
              		 * Returns true if node is a descendant of ancestor
              		 */
              		isDescendant(node: NodeOrString, ancestor: NodeOrString): boolean;
              		/**
              		 * Enable or disable selection on a node
              		 */
              		setSelectable(node: ElementOrString, selectable?: boolean): void;
              	}
              	/* dojo/dom-attr */
              	interface DomAttr {
              		/**
              		 * Returns true if the requested attribute is specified on the
              		 * given element, and false otherwise.
              		 */
              		has(node: NodeOrString, name: string): boolean;
              		/**
              		 * Gets an attribute on an HTML element.
              		 * Because sometimes this uses node.getAttribute, it should be a string,
              		 * but it can also get any other attribute on a node, therefore it is unsafe
              		 * to type just a string.
              		 */
              		get(node: ElementOrString, name: string): any;
              		/**
              		 * Sets an attribute on an HTML element.
              		 */
              		set(node: ElementOrString, name: string, value: any): Element;
              		set(node: ElementOrString, map: GenericObject): Element;
              		/**
              		 * Removes an attribute from an HTML element.
              		 */
              		remove(node: NodeOrString, name: string): void;
              		/**
              		 * Returns an effective value of a property or an attribute.
              		 */
              		getNodeProp(node: NodeOrString, name: string): any;
              	}
              	/* dojo/dom-class */
              	interface DomClass {
              		/**
              		 * Returns whether or not the specified classes are a portion of the
              		 * class list currently applied to the node.
              		 */
              		contains(node: NodeOrString, classStr: string): boolean;
              		/**
              		 * Adds the specified classes to the end of the class list on the
              		 * passed node. Will not re-apply duplicate classes.
              		 */
              		add(node: NodeOrString, classStr: string | string[]): void;
              		/**
              		 * Removes the specified classes from node. No `contains()`
              		 * check is required.
              		 */
              		remove(node: NodeOrString, classStr?: string | string[]): void;
              		/**
              		 * Replaces one or more classes on a node if not present.
              		 * Operates more quickly than calling dojo.removeClass and dojo.addClass
              		 */
              		replace(node: NodeOrString, addClassStr: string | string[], removeClassStr?: string | string[]): void;
              		/**
              		 * Adds a class to node if not present, or removes if present.
              		 * Pass a boolean condition if you want to explicitly add or remove.
              		 * Returns the condition that was specified directly or indirectly.
              		 */
              		toggle(node: NodeOrString, classStr: string | string[], condition?: boolean): boolean;
              	}
              	/* dojo/dom-construct */
              	/* TODO implement for TS 1.8 */
              	/* type PosString = 'first' | 'after' | 'before' | 'last' | 'replace' | 'only'; */
              	interface DomConstruct {
              		/**
              		 * instantiates an HTML fragment returning the corresponding DOM.
              		 */
              		toDom(frag: string, doc?: Document): DocumentFragment | Node;
              		/**
              		 * Attempt to insert node into the DOM, choosing from various positioning options.
              		 * Returns the first argument resolved to a DOM node.
              		 */
              		place(node: NodeFragmentOrString, refNode: NodeOrString, position?: string /* PosString */ | number): HTMLElement;
              		/**
              		 * Create an element, allowing for optional attribute decoration
              		 * and placement.
              		 */
              		create(tag: NodeOrString, attrs?: GenericObject, refNode?: NodeOrString, pos?: string /* PosString */ | number): HTMLElement;
              		/**
              		 * safely removes all children of the node.
              		 */
              		empty(node: NodeOrString): void;
              		/**
              		 * Removes a node from its parent, clobbering it and all of its
              		 * children.
              		 */
              		destroy(node: NodeOrString): void;
              	}
              	/* dojo/dom-form */
              	interface DomForm {
              		/**
              		 * Serialize a form field to a JavaScript object.
              		 */
              		fieldToObject(inputNode: NodeOrString): GenericObject;
              		/**
              		 * Serialize a form node to a JavaScript object.
              		 */
              		toObject(fromNode: HTMLFormElement | string): GenericObject;
              		/**
              		 * Returns a URL-encoded string representing the form passed as either a
              		 * node or string ID identifying the form to serialize
              		 */
              		toQuery(fromNode: HTMLFormElement | string): string;
              		/**
              		 * Create a serialized JSON string from a form node or string
              		 * ID identifying the form to serialize
              		 */
              		toJson(formNode: HTMLFormElement | string, prettyPrint?: boolean): string;
              	}
              	/* dojo/dom-geometry */
              	interface DomGeometryWidthHeight {
              		w?: number;
              		h?: number;
              	}
              	interface DomGeometryBox extends DomGeometryWidthHeight {
              		l?: number;
              		t?: number;
              	}
              	interface DomGeometryBoxExtents extends DomGeometryBox {
              		r?: number;
              		b?: number;
              	}
              	interface Point {
              		x: number;
              		y: number;
              	}
              	interface DomGeometryXYBox extends DomGeometryWidthHeight, Point {
              	}
              	interface DomGeometry {
              		boxModel: string; /* TODO: string literal 'border-box' | 'content-box' */
              		/**
              		 * Returns object with special values specifically useful for node
              		 * fitting.
              		 */
              		getPadExtents(node: Element, computedStyle?: DomComputedStyle): DomGeometryBoxExtents;
              		/**
              		 * returns an object with properties useful for noting the border
              		 * dimensions.
              		 */
              		getBorderExtents(node: Element, computedStyle?: DomComputedStyle): DomGeometryBoxExtents;
              		/**
              		 * Returns object with properties useful for box fitting with
              		 * regards to padding.
              		 */
              		getPadBorderExtents(node: Element, computedStyle?: DomComputedStyle): DomGeometryBoxExtents;
              		/**
              		 * returns object with properties useful for box fitting with
              		 * regards to box margins (i.e., the outer-box).
              		 * - l/t = marginLeft, marginTop, respectively
              		 * - w = total width, margin inclusive
              		 * - h = total height, margin inclusive
              		 * The w/h are used for calculating boxes.
              		 * Normally application code will not need to invoke this
              		 * directly, and will use the ...box... functions instead.
              		 */
              		getMarginExtents(node: Element, computedStyle?: DomComputedStyle): DomGeometryBoxExtents;
              		/**
              		 * returns an object that encodes the width, height, left and top
              		 * positions of the node's margin box.
              		 */
              		getMarginBox(node: Element, computedStyle?: DomComputedStyle): DomGeometryBox;
              		/**
              		 * Returns an object that encodes the width, height, left and top
              		 * positions of the node's content box, irrespective of the
              		 * current box model.
              		 */
              		getContentBox(node: Element, computedStyle?: DomComputedStyle): DomGeometryBox;
              		/**
              		 * Sets the size of the node's contents, irrespective of margins,
              		 * padding, or borders.
              		 */
              		setContentSize(node: Element, box: DomGeometryWidthHeight, computedStyle?: DomComputedStyle): void;
              		/**
              		 * sets the size of the node's margin box and placement
              		 * (left/top), irrespective of box model. Think of it as a
              		 * passthrough to setBox that handles box-model vagaries for
              		 * you.
              		 */
              		setMarginBox(node: Element, box: DomGeometryBox, computedStyle?: DomComputedStyle): void;
              		/**
              		 * Returns true if the current language is left-to-right, and false otherwise.
              		 */
              		isBodyLtr(doc?: Document): boolean;
              		/**
              		 * Returns an object with {node, x, y} with corresponding offsets.
              		 */
              		docScroll(doc?: Document): Point;
              		/**
              		 * Deprecated method previously used for IE6-IE7.  Now, just returns `{x:0, y:0}`.
              		 */
              		getIeDocumentElementOffset(doc: Document): Point;
              		/**
              		 * In RTL direction, scrollLeft should be a negative value, but IE
              		 * returns a positive one. All codes using documentElement.scrollLeft
              		 * must call this function to fix this error, otherwise the position
              		 * will offset to right when there is a horizontal scrollbar.
              		 */
              		fixIeBiDiScrollLeft(scrollLeft: number, doc?: Document): number;
              		/**
              		 * Gets the position and size of the passed element relative to
              		 * the viewport (if includeScroll==false), or relative to the
              		 * document root (if includeScroll==true).
              		 */
              		position(node: Element, includeScroll?: boolean): DomGeometryXYBox;
              		/**
              		 * returns an object that encodes the width and height of
              		 * the node's margin box
              		 */
              		getMarginSize(node: Element, computedStyle?: DomComputedStyle): DomGeometryWidthHeight;
              		/**
              		 * Normalizes the geometry of a DOM event, normalizing the pageX, pageY,
              		 * offsetX, offsetY, layerX, and layerX properties
              		 */
              		normalizeEvent(event: Event): void;
              	}
              	/* dojo/dom-prop */
              	interface DomProp {
              		/**
              		 * Gets a property on an HTML element.
              		 */
              		get(node: ElementOrString, name: string): any;
              		/**
              		 * Sets a property on an HTML element.
              		 */
              		set(node: ElementOrString, name: string | GenericObject, value?: any): Element;
              	}
              	/* dojo/dom-style */
              	// TODO move over the most common properties from CSSStyleDeclaration
              	interface DomComputedStyle {
              		position?: string;
              		width?: string;
              		height?: string;
              		[id: string]: any;
              	}
              	interface DomStyle {
              		/**
              		 * Returns a "computed style" object.
              		 */
              		getComputedStyle(node: Node): DomComputedStyle;
              		/**
              		 * Accesses styles on a node.
              		 */
              		get(node: ElementOrString): DomComputedStyle;
              		get(node: ElementOrString, name: string): string | number;
              		/**
              		 * Sets styles on a node.
              		 */
              		set(node: ElementOrString, name: DomComputedStyle): DomComputedStyle;
              		set(node: ElementOrString, name: string, value: string | number): DomComputedStyle;
              		/**
              		 * converts style value to pixels on IE or return a numeric value.
              		 */
              		toPixelValue(element: Element, value: string): number;
              	}
              	/* dojo/domReady */
              	interface DomReady {
              		/**
              		 * Plugin to delay require()/define() callback from firing until the DOM has finished
              		 */
              		(callback: Function): void;
              		load(id: string, parentRequire: Function, loaded: Function): void; /* TODO: Align with loader api */
              		_Q: Function[];
              		_onEmpty(): void;
              	}
              	/* dojo/Evented */
              	interface Evented {
              		on(type: string | ExtensionEvent, listener: EventListener | Function): Handle;
              		emit(type: string | ExtensionEvent, ...events: any[]): boolean;
              	}
              	interface EventedConstructor extends _base.DeclareConstructor<Evented> {
              		new (params?: Object): Evented;
              	}
              	/* dojo/fx */
              	/* dojo/fx augments the dojo/_base/fx, therefore it is typed in fx.d.ts and not referenced from
              	  index.d.ts or module.d.ts and is self contained typings for dojo/fx and dojo/fx/* */
              	/* dojo/gears */
              	/* This is long-ago deprecated by Google, so just doing a minimal typing */
              	interface Gears {
              		_gearsObject(): any;
              		available: boolean;
              	}
              	/* dojo/has */
              	interface HasCache {
              		[feature: string]: any;
              	}
              	interface HasTestFunction {
              		/* TypeScript has no way of referring to the global scope see Microsoft/TypeScript#983 */
              		(global?: any, doc?: Document, element?: Element): any;
              	}
              	interface Has {
              		/**
              		 * Return the current value of the named feature.
              		 * @param {string | number} name The name (if a string) or identifier (if an integer) of the feature to test.
              		 */
              		(name: string | number): any;
              		(name: 'host-browser'): boolean;
              		(name: 'host-node'): any;
              		(name: 'host-rhino'): boolean;
              		(name: 'dom'): boolean;
              		(name: 'dojo-dom-ready-api'): 1;
              		(name: 'dojo-sniff'): 1;
              		// if host-browser is true
              		(name: 'dom-addeventlistener'): void | boolean;
              		(name: 'touch'): void | boolean;
              		(name: 'touch-events'): void | boolean;
              		(name: 'pointer-events'): void | boolean;
              		(name: 'MSPointer'): void | boolean;
              		(name: 'device-width'): void | number;
              		(name: 'dom-attributes-explicit'): void | boolean;
              		(name: 'dom-attributes-specified-flag'): void | boolean;
              		// dojo/_base/browser
              		(name: 'config-selectorEngine'): string;
              		cache: HasCache;
              		/**
              		 * Register a new feature test for some named feature.
              		 */
              		add(name: string | number, test: HasTestFunction, now?: boolean, force?: boolean): any;
              		add<T extends (Object | string | number | boolean | null | void)>(name: string | number, test: T, now?: boolean, force?: boolean): any;
              		/**
              		 * Deletes the contents of the element passed to test functions.
              		 */
              		clearElement(element: HTMLElement): HTMLElement;
              		/**
              		 * Resolves id into a module id based on possibly-nested tenary expression that branches on has feature test value(s).
              		 */
              		normalize(id: string, toAbsMid: Function): string; /* TODO: Align with loader api */
              		/**
              		 * Conditional loading of AMD modules based on a has feature test value.
              		 */
              		load(id: string, parentRequire: Function, loaded: Function): void; /* TODO: Align with loader api */
              	}
              	/* dojo/hash */
              	interface Hash {
              		(hash?: string, replace?: boolean): string;
              	}
              	/* dojo/hccss */
              	/* this only does has.add and re-exports the has interface */
              	interface Has {
              		(name: 'highcontrast'): void | boolean;
              	}
              	/* dojo/html */
              	type ContentSetterContent = string | Node | ArrayLike<Node>;
              	interface ContentSetterParams {
              		node?: NodeOrString;
              		content?: ContentSetterContent;
              		id?: string;
              		cleanContent?: boolean;
              		extractContent?: boolean;
              		parseContent?: boolean;
              		parserScope?: boolean;
              		startup?: boolean;
              		onBegin?: Function;
              		onEnd?: Function;
              		tearDown?: Function;
              		onContentError?: Function;
              		onExecError?: Function;
              	}
              	interface ContentSetter {
              		/**
              		 * An node which will be the parent element that we set content into
              		 */
              		node: NodeOrString;
              		/**
              		 * The content to be placed in the node. Can be an HTML string, a node reference, or a enumerable list of nodes
              		 */
              		content: ContentSetterContent;
              		/**
              		 * Usually only used internally, and auto-generated with each instance
              		 */
              		id: string;
              		/**
              		 * Should the content be treated as a full html document,
              		 * and the real content stripped of <html>, <body> wrapper before injection
              		 */
              		cleanContent: boolean;
              		/**
              		 * Should the content be treated as a full html document,
              		 * and the real content stripped of `<html> <body>` wrapper before injection
              		 */
              		extractContent: boolean;
              		/**
              		 * Should the node by passed to the parser after the new content is set
              		 */
              		parseContent: boolean;
              		/**
              		 * Flag passed to parser.	Root for attribute names to search for.	  If scopeName is dojo,
              		 * will search for data-dojo-type (or dojoType).  For backwards compatibility
              		 * reasons defaults to dojo._scopeName (which is "dojo" except when
              		 * multi-version support is used, when it will be something like dojo16, dojo20, etc.)
              		 */
              		parserScope: string;
              		/**
              		 * Start the child widgets after parsing them.	  Only obeyed if parseContent is true.
              		 */
              		startup: boolean;
              		/**
              		 * front-end to the set-content sequence
              		 */
              		set(cont?: ContentSetterContent, params?: ContentSetterParams): promise.Promise<Node> | Node;
              		/**
              		 * sets the content on the node
              		 */
              		setContent(): void;
              		/**
              		 * cleanly empty out existing content
              		 */
              		empty(): void;
              		/**
              		 * Called after instantiation, but before set();
              		 * It allows modification of any of the object properties -
              		 * including the node and content provided - before the set operation actually takes place
              		 */
              		onBegin(): Node;
              		/**
              		 * Called after set(), when the new content has been pushed into the node
              		 * It provides an opportunity for post-processing before handing back the node to the caller
              		 * This default implementation checks a parseContent flag to optionally run the dojo parser over the new content
              		 */
              		onEnd(): Node;
              		/**
              		 * manually reset the Setter instance if its being re-used for example for another set()
              		 */
              		tearDown(): void;
              		onContentError(): string;
              		onExecError(): string;
              		_mixin(params: ContentSetterParams): void;
              		parseDeferred: Deferred<any[]>;
              		/**
              		 * runs the dojo parser over the node contents, storing any results in this.parseResults
              		 */
              		_parse(): void;
              		/**
              		 * shows user the string that is returned by on[type]Error
              		 * override/implement on[type]Error and return your own string to customize
              		 */
              		_onError(type: string, err: Error, consoleText?: string): void;
              	}
              	interface ContentSetterConstructor extends _base.DeclareConstructor<ContentSetter> {
              		new (params?: ContentSetterParams, node?: NodeOrString): ContentSetter;
              	}
              	interface Html {
              		/**
              		 * removes !DOCTYPE and title elements from the html string.
              		 *
              		 * khtml is picky about dom faults, you can't attach a style or `<title>` node as child of body
              		 * must go into head, so we need to cut out those tags
              		 */
              		_secureForInnerHtml(cont: string): string;
              		/**
              		 * Deprecated, should use dojo/dom-constuct.empty() directly, remove in 2.0.
              		 */
              		_emptyNode(node: NodeOrString): void;
              		/**
              		 * inserts the given content into the given node
              		 */
              		_setNodeContent<T extends Node>(node: Node, cont: string | Node | ArrayLike<T>): Node;
              		_ContentSetter: ContentSetterConstructor;
              		/**
              		 * inserts (replaces) the given content into the given node. dojo/dom-construct.place(cont, node, "only")
              		 * may be a better choice for simple HTML insertion.
              		 */
              		set(node: Node, cont?: ContentSetterContent, params?: ContentSetterParams): promise.Promise<Node> | Node;
              	}
              	/* dojo/i18n */
              	interface I18n {
              		getLocalization(moduleName: string, bundleName: string, locale?: string): any;
              		dynamic: boolean;
              		/**
              		 * Resolves id into a module id based on possibly-nested tenary expression that branches on has feature test value(s).
              		 */
              		normalize(id: string, toAbsMid: Function): string; /* TODO: Align with loader api */
              		normalizeLocale(locale?: string): string;
              		/**
              		 * Conditional loading of AMD modules based on a has feature test value.
              		 */
              		load(id: string, parentRequire: Function, loaded: Function): void; /* TODO: Align with loader api */
              		cache: { [bundle: string]: any };
              		getL10nName(moduleName: string, bundleName: string, locale?: string): string;
              	}
              	/* dojo/io-query */
              	interface IoQuery {
              		/**
              		 * takes a name/value mapping object and returns a string representing
              		 * a URL-encoded version of that object.
              		 */
              		objectToQuery(map: GenericObject): string;
              		/**
              		 * Create an object representing a de-serialized query section of a
              		 * URL. Query keys with multiple values are returned in an array.
              		 */
              		queryToObject(str: string): GenericObject;
              	}
              	/* dojo/json */
              	interface Json {
              		/**
              		 * Parses a [JSON](http://json.org) string to return a JavaScript object.
              		 */
              		parse(str: string, strict?: boolean): any;
              		/**
              		 * Returns a [JSON](http://json.org) serialization of an object.
              		 */
              		stringify(value: any, replacer?: (key: string, value: any) => any| any[], space?: string | number): string;
              	}
              	/* dojo/keys */
              	interface Keys {
              		BACKSPACE: number;
              		TAB: number;
              		CLEAR: number;
              		ENTER: number;
              		SHIFT: number;
              		CTRL: number;
              		ALT: number;
              		META: number;
              		PAUSE: number;
              		CAPS_LOCK: number;
              		ESCAPE: number;
              		SPACE: number;
              		PAGE_UP: number;
              		PAGE_DOWN: number;
              		END: number;
              		HOME: number;
              		LEFT_ARROW: number;
              		UP_ARROW: number;
              		RIGHT_ARROW: number;
              		DOWN_ARROW: number;
              		INSERT: number;
              		DELETE: number;
              		HELP: number;
              		LEFT_WINDOW: number;
              		RIGHT_WINDOW: number;
              		SELECT: number;
              		NUMPAD_0: number;
              		NUMPAD_1: number;
              		NUMPAD_2: number;
              		NUMPAD_3: number;
              		NUMPAD_4: number;
              		NUMPAD_5: number;
              		NUMPAD_6: number;
              		NUMPAD_7: number;
              		NUMPAD_8: number;
              		NUMPAD_9: number;
              		NUMPAD_MULTIPLY: number;
              		NUMPAD_PLUS: number;
              		NUMPAD_ENTER: number;
              		NUMPAD_MINUS: number;
              		NUMPAD_PERIOD: number;
              		NUMPAD_DIVIDE: number;
              		F1: number;
              		F2: number;
              		F3: number;
              		F4: number;
              		F5: number;
              		F6: number;
              		F7: number;
              		F8: number;
              		F9: number;
              		F10: number;
              		F11: number;
              		F12: number;
              		F13: number;
              		F14: number;
              		F15: number;
              		NUM_LOCK: number;
              		SCROLL_LOCK: number;
              		UP_DPAD: number;
              		DOWN_DPAD: number;
              		LEFT_DPAD: number;
              		RIGHT_DPAD: number;
              		copyKey: number;
              	}
              	/* dojo/loadInit */
              	interface LoadInit {
              		dynamic: number;
              		/**
              		 * Resolves id into a module id based on possibly-nested tenary expression that branches on has feature test value(s).
              		 */
              		normalize(id: string, toAbsMid: Function): string; /* TODO: Align with loader api */
              		/**
              		 * Conditional loading of AMD modules based on a has feature test value.
              		 */
              		load(id: string, parentRequire: Function, loaded: Function): void; /* TODO: Align with loader api */
              	}
              	/* dojo/mouse */
              	interface Mouse {
              		_eventHandler(type: string, selectHandler?: (evt: MouseEvent, listener: EventListener) => void): MouseEvent;
              		/**
              		 * This is an extension event for the mouseenter that IE provides, emulating the
              		 * behavior on other browsers.
              		 */
              		enter: MouseEvent;
              		/**
              		 * This is an extension event for the mouseleave that IE provides, emulating the
              		 * behavior on other browsers.
              		 */
              		leave: MouseEvent;
              		/**
              		 * This is an extension event for the mousewheel that non-Mozilla browsers provide,
              		 * emulating the behavior on Mozilla based browsers.
              		 */
              		wheel: string | ExtensionEvent;
              		/**
              		 * Test an event object (from a mousedown event) to see if the left button was pressed.
              		 */
              		isLeft(e: MouseEvent): boolean;
              		/**
              		 * Test an event object (from a mousedown event) to see if the middle button was pressed.
              		 */
              		isMiddle(e: MouseEvent): boolean;
              		/**
              		 * Test an event object (from a mousedown event) to see if the right button was pressed.
              		 */
              		isRight(e: MouseEvent): boolean;
              	}
              	/* dojo/node */
              	/* should only be used for re-exporting CommonJS modules */
              	/* dojo/NodeList */
              	/* Just proxies dojo/query::NodeList */
              	/* dojo/NodeList-* are included as seperate .d.ts files */
              	/* dojo/number */
              	interface NumberFormatOptions {
              		/**
              		 * override [formatting pattern](http://www.unicode.org/reports/tr35/#Number_Format_Patterns)
              		 * with this string.  Default value is based on locale.  Overriding this property will defeat
              		 * localization.  Literal characters in patterns are not supported.
              		 */
              		pattern?: string;
              		/**
              		 * choose a format type based on the locale from the following:
              		 * decimal, scientific (not yet supported), percent, currency. decimal by default.
              		 */
              		type?: string;
              		/**
              		 * fixed number of decimal places to show.  This overrides any
              		 * information in the provided pattern.
              		 */
              		places?: number;
              		/**
              		 * 5 rounds to nearest .5; 0 rounds to nearest whole (default). -1
              		 * means do not round.
              		 */
              		round?: number;
              		/**
              		 * override the locale used to determine formatting rules
              		 */
              		locale?: string;
              		/**
              		 * If false, show no decimal places, overriding places and pattern settings.
              		 */
              		fractional?: boolean | [ boolean, boolean ];
              	}
              	interface NumberFormatAbsoluteOptions {
              		/**
              		 * the decimal separator
              		 */
              		decimal?: string;
              		/**
              		 * the group separator
              		 */
              		group?: string;
              		/**
              		 * number of decimal places.  the range "n,m" will format to m places.
              		 */
              		places?: number | string;
              		/**
              		 * 5 rounds to nearest .5; 0 rounds to nearest whole (default). -1
              		 * means don't round.
              		 */
              		round?: number;
              	}
              	interface NumberRegexpOptions {
              		/**
              		 * override [formatting pattern](http://www.unicode.org/reports/tr35/#Number_Format_Patterns)
              		 * with this string.  Default value is based on locale.  Overriding this property will defeat
              		 * localization.
              		 */
              		pattern?: string;
              		/**
              		 * choose a format type based on the locale from the following:
              		 * decimal, scientific (not yet supported), percent, currency. decimal by default.
              		 */
              		type?: string;
              		/**
              		 * override the locale used to determine formatting rules
              		 */
              		locacle?: string;
              		/**
              		 * strict parsing, false by default.  Strict parsing requires input as produced by the format() method.
              		 * Non-strict is more permissive, e.g. flexible on white space, omitting thousands separators
              		 */
              		strict?: boolean;
              		/**
              		 * number of decimal places to accept: Infinity, a positive number, or
              		 * a range "n,m".  Defined by pattern or Infinity if pattern not provided.
              		 */
              		places?: number | string;
              	}
              	interface NumberParseOptions {
              		/**
              		 * override [formatting pattern](http://www.unicode.org/reports/tr35/#Number_Format_Patterns)
              		 * with this string.  Default value is based on locale.  Overriding this property will defeat
              		 * localization.  Literal characters in patterns are not supported.
              		 */
              		pattern?: string;
              		/**
              		 * choose a format type based on the locale from the following:
              		 * decimal, scientific (not yet supported), percent, currency. decimal by default.
              		 */
              		type?: string;
              		/**
              		 * override the locale used to determine formatting rules
              		 */
              		locale?: string;
              		/**
              		 * strict parsing, false by default.  Strict parsing requires input as produced by the format() method.
              		 * Non-strict is more permissive, e.g. flexible on white space, omitting thousands separators
              		 */
              		strict?: boolean;
              		/**
              		 * Whether to include the fractional portion, where the number of decimal places are implied by pattern
              		 * or explicit 'places' parameter.  The value [true,false] makes the fractional portion optional.
              		 */
              		fractional?: boolean | [boolean, boolean];
              	}
              	interface RealNumberRegexpFlags {
              		/**
              		 * The integer number of decimal places or a range given as "n,m".  If
              		 * not given, the decimal part is optional and the number of places is
              		 * unlimited.
              		 */
              		places?: number;
              		/**
              		 * A string for the character used as the decimal point.  Default
              		 * is ".".
              		 */
              		decimal?: string;
              		/**
              		 * Whether decimal places are used.  Can be true, false, or [true,
              		 * false].  Default is [true, false] which means optional.
              		 */
              		fractional?: boolean | [boolean, boolean];
              		/**
              		 * Express in exponential notation.  Can be true, false, or [true,
              		 * false]. Default is [true, false], (i.e. will match if the
              		 * exponential part is present are not).
              		 */
              		exponent?: boolean | [boolean, boolean];
              		/**
              		 * The leading plus-or-minus sign on the exponent.  Can be true,
              		 * false, or [true, false].  Default is [true, false], (i.e. will
              		 * match if it is signed or unsigned).  flags in regexp.integer can be
              		 * applied.
              		 */
              		eSigned?: boolean | [boolean, boolean];
              	}
              	interface IntegerRegexpFlags {
              		/**
              		 * The leading plus-or-minus sign. Can be true, false, or `[true,false]`.
              		 * Default is `[true, false]`, (i.e. will match if it is signed
              		 * or unsigned).
              		 */
              		signed?: boolean;
              		/**
              		 * The character used as the thousands separator. Default is no
              		 * separator. For more than one symbol use an array, e.g. `[",", ""]`,
              		 * makes ',' optional.
              		 */
              		separator?: string;
              		/**
              		 * group size between separators
              		 */
              		groupSize?: number;
              		/**
              		 * second grouping, where separators 2..n have a different interval than the first separator (for India)
              		 */
              		groupSize2?: number;
              	}
              	interface Number {
              		/**
              		 * Format a Number as a String, using locale-specific settings
              		 */
              		format(value: number, options?: NumberFormatOptions): string;
              		/**
              		 * not precise, but good enough
              		 */
              		_numberPatternRE: RegExp;
              		/**
              		 * Apply pattern to format value as a string using options. Gives no
              		 * consideration to local customs.
              		 */
              		_applyPattern(value: number, pattern: string, options?: NumberFormatOptions): string;
              		/**
              		 * Rounds to the nearest value with the given number of decimal places, away from zero
              		 */
              		round(value: number, places?: number, increment?: number): number;
              		/**
              		 * Apply numeric pattern to absolute value using options. Gives no
              		 * consideration to local customs.
              		 */
              		_formatAbsolute(value: number, pattern: string, options?: NumberFormatAbsoluteOptions): string;
              		/**
              		 * Builds the regular needed to parse a number
              		 */
              		regexp(options?: NumberRegexpOptions): string;
              		_parseInfo(options?: any): { regexp: string, group: string, decimal: string, factor: number };
              		/**
              		 * Convert a properly formatted string to a primitive Number, using
              		 * locale-specific settings.
              		 */
              		parse(expression: string, options?: NumberParseOptions): number;
              		/**
              		 * Builds a regular expression to match a real number in exponential
              		 * notation
              		 */
              		_realNumberRegexp(flags: RealNumberRegexpFlags): string;
              		/**
              		 * Builds a regular expression that matches an integer
              		 */
              		_integerRegexp(flags: IntegerRegexpFlags): string;
              	}
              	/* dojo/on */
              	interface ExtensionEvent {
              		(target: Element | GenericObject, listener: EventListener): Handle;
              	}
              	interface PauseHandle extends Handle {
              		pause(): void;
              		resume(): void;
              	}
              	interface MatchesTarget {
              		matches(node: Element, selector: string, context?: any): any[];
              		[id: string]: any;
              	}
              	interface On {
              		/**
              		 * A function that provides core event listening functionality. With this function
              		 * you can provide a target, event type, and listener to be notified of
              		 * future matching events that are fired.
              		 */
              		(target: Element | GenericObject, type: string | ExtensionEvent, listener: EventListener | Function, dontFix?: boolean): Handle;
              		/**
              		 * This function acts the same as on(), but with pausable functionality. The
              		 * returned signal object has pause() and resume() functions. Calling the
              		 * pause() method will cause the listener to not be called for future events.
              		 */
              		pausable(target: Element | GenericObject, type: string | ExtensionEvent, listener: EventListener | Function, dontFix?: boolean): PauseHandle;
              		/**
              		 * This function acts the same as on(), but will only call the listener once. The
              		 * listener will be called for the first
              		 * event that takes place and then listener will automatically be removed.
              		 */
              		once(target: Element | GenericObject, type: string | ExtensionEvent, listener: EventListener | Function, dontFix?: boolean): Handle;
              		parse(target: Element | GenericObject, type: string | ExtensionEvent, listener: EventListener | Function, dontFix: boolean, matchesTarget: Element | GenericObject): Handle;
              		/**
              		 * Check if a node match the current selector within the constraint of a context
              		 */
              		matches(node: Element, selector: string, context: Element, children: boolean, matchesTarget?: MatchesTarget): Element | boolean;
              		/**
              		 * Creates a new extension event with event delegation. This is based on
              		 * the provided event type (can be extension event) that
              		 * only calls the listener when the CSS selector matches the target of the event.
              		 *
              		 * The application must require() an appropriate level of dojo/query to handle the selector.
              		 */
              		selector(selector: string, type: string | ExtensionEvent, children?: boolean): ExtensionEvent;
              		/**
              		 * Fires an event on the target object.
              		 */
              		emit(target: Element | GenericObject, type: string | ExtensionEvent, event?: any): boolean;
              		/**
              		 * normalizes properties on the event object including event
              		 * bubbling methods, keystroke normalization, and x/y positions
              		 */
              		_fixEvent(evt: any, sender: any): any;
              	}
              	/* dojo/parser */
              	interface ParserOptions { }
              	interface ParserObjects {
              		ctor?: GenericConstructor<any>;
              		types?: string[];
              		node: Node;
              		scripts?: HTMLScriptElement[];
              		inherited?: { [prop: string]: any; };
              	}
              	interface InstancesArray extends Array<any>, promise.Promise<any> {}
              	interface Parser {
              		/**
              		 * Clear cached data.   Used mainly for benchmarking.
              		 */
              		_clearCache(): void;
              		/**
              		 * Convert a `<script type="dojo/method" args="a, b, c"> ... </script>`
              		 * into a function
              		 */
              		_functionFromScript(node: HTMLScriptElement, attrData: string): Function;
              		/**
              		 * Takes array of nodes, and turns them into class instances and
              		 * potentially calls a startup method to allow them to connect with
              		 * any children.
              		 */
              		instantiate(nodes: Node[], mixin?: Object, options?: ParserOptions): any[];
              		/**
              		 * Takes array of objects representing nodes, and turns them into class instances and
              		 * potentially calls a startup method to allow them to connect with
              		 * any children.
              		 */
              		_instantiate(nodes: ParserObjects[], mixin?: Object, options?: ParserOptions, returnPromise?: boolean): any[] | promise.Promise<any[]>;
              		/**
              		 * Calls new ctor(params, node), where params is the hash of parameters specified on the node,
              		 * excluding data-dojo-type and data-dojo-mixins.   Does not call startup().
              		 */
              		construct<T>(
              			ctor: GenericConstructor<T>,
              			node: Node, mixin?: Object,
              			options?: ParserOptions,
              			scripts?: HTMLScriptElement[],
              			inherited?: { [prop: string]: any; }
              		): promise.Promise<T> | T;
              		/**
              		 * Scan a DOM tree and return an array of objects representing the DOMNodes
              		 * that need to be turned into widgets.
              		 */
              		scan(root?: Node, options?: ParserOptions): promise.Promise<ParserObjects[]>;
              		/**
              		 * Helper for _scanAMD().  Takes a `<script type=dojo/require>bar: "acme/bar", ...</script>` node,
              		 * calls require() to load the specified modules and (asynchronously) assign them to the specified global
              		 * variables, and returns a Promise for when that operation completes.
              		 *
              		 * In the example above, it is effectively doing a require(["acme/bar", ...], function(a){ bar = a; }).
              		 */
              		_require(script: HTMLScriptElement, options: ParserOptions): promise.Promise<any>;
              		/**
              		 * Scans the DOM for any declarative requires and returns their values.
              		 */
              		_scanAmd(root?: Node, options?: ParserOptions): promise.Promise<boolean>;
              		/**
              		 * Scan the DOM for class instances, and instantiate them.
              		 */
              		parse(rootNode?: Node, options?: ParserOptions): InstancesArray;
              	}
              	/* dojo/query */
              	interface NodeListFilterCallback<T extends Node> {
              		(item: T, idx: number, nodeList: this): boolean;
              	}
              	type NodeListFilter<T extends Node> = string | NodeListFilterCallback<T>;
              	interface NodeList<T extends Node> extends ArrayLike<T> {
              		/**
              		 * decorate an array to make it look like a `dojo/NodeList`.
              		 */
              		_wrap<U extends Node, V extends Node>(a: U[], parent?: NodeList<V>, NodeListCtor?: NodeListConstructor): NodeList<U>;
              		_NodeListCtor: NodeListConstructor;
              		toString(): string;
              		/**
              		 * private function to hold to a parent NodeList. end() to return the parent NodeList.
              		 */
              		_stash(parent: Node): this;
              		/**
              		 * Listen for events on the nodes in the NodeList.
              		 */
              		on(eventName: string, listener: EventListener): Handle[];
              		/**
              		 * Ends use of the current `NodeList` by returning the previous NodeList
              		 * that generated the current NodeList.
              		 */
              		end<U extends Node>(): NodeList<U>;
              		/**
              		 * Returns a new NodeList, maintaining this one in place
              		 */
              		slice(begin: number, end?: number): this;
              		/**
              		 * Returns a new NodeList, manipulating this NodeList based on
              		 * the arguments passed, potentially splicing in new elements
              		 * at an offset, optionally deleting elements
              		 */
              		splice(index: number, howmany?: number, ...items: T[]): this;
              		/**
              		 * see `dojo/_base/array.indexOf()`. The primary difference is that the acted-on
              		 * array is implicitly this NodeList
              		 */
              		indexOf(value: T, fromIndex?: number, findLast?: boolean): number;
              		/**
              		 * see `dojo/_base/array.lastIndexOf()`. The primary difference is that the
              		 * acted-on array is implicitly this NodeList
              		 */
              		lastIndexOf(value: T, fromIndex?: number): number;
              		/**
              		 * see `dojo/_base/array.every()` and the [Array.every
              		 * docs](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every).
              		 * Takes the same structure of arguments and returns as
              		 * dojo/_base/array.every() with the caveat that the passed array is
              		 * implicitly this NodeList
              		 */
              		every(callback: (item: T, idx: number, nodeList: this) => boolean | string, thisObj?: Object): boolean;
              		/**
              		 * Takes the same structure of arguments and returns as
              		 * `dojo/_base/array.some()` with the caveat that the passed array as
              		 * implicitly this NodeList.  See `dojo/_base/array.some()` and Mozillaas
              		 * [Array.soas
              		 * documentation](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some).
              		 */
              		some(callback: (item: T, idx: number, nodeList: this) => boolean | string, thisObj?: Object): boolean;
              		/**
              		 * Returns a new NodeList comprised of items in this NodeList
              		 * as well as items passed in as parameters
              		 */
              		concat(...items: T[]): this;
              		/**
              		 * see `dojo/_base/array.map()`. The primary difference is that the acted-on
              		 * array is implicitly this NodeList and the return is a
              		 * NodeList (a subclass of Array)
              		 */
              		map<U extends Node>(func: (item: T, idx: number, nodeList: this) => U, obj?: Object): NodeList<U>;
              		/**
              		 * see `dojo/_base/array.forEach()`. The primary difference is that the acted-on
              		 * array is implicitly this NodeList. If you want the option to break out
              		 * of the forEach loop, use every() or some() instead.
              		 */
              		forEach(callback: (item: T, idx: number, nodeList: this) => void, thisObj?: Object): this;
              		/**
              		 * "masks" the built-in javascript filter() method (supported
              		 * in Dojo via `dojo/_base/array.filter`) to support passing a simple
              		 * string filter in addition to supporting filtering function
              		 * objects.
              		 */
              		filter<U extends Node>(filter: NodeListFilter<T>, thisObj?: Object): NodeList<U>;
              		/**
              		 * Create a new instance of a specified class, using the
              		 * specified properties and each node in the NodeList as a
              		 * srcNodeRef.
              		 */
              		instantiate(declaredClass: string | GenericConstructor<any>, properties?: Object): this;
              		/**
              		 * Returns a new NodeList comprised of items in this NodeList
              		 * at the given index or indices.
              		 */
              		at(...indices: number[]): this;
              	}
              	interface NodeListConstructor {
              		new <T extends Node>(array: number | Array<T>): NodeList<T>;
              		new <T extends Node>(...args: T[]): NodeList<T>;
              		<T extends Node>(array: number | Array<T>): NodeList<T>;
              		<T extends Node>(...args: T[]): NodeList<T>;
              		prototype: NodeList<any>;
              		/**
              		 * decorate an array to make it look like a `dojo/NodeList`.
              		 */
              		_wrap<U extends Node, V extends Node>(a: U[], parent?: NodeList<V>, NodeListCtor?: NodeListConstructor): NodeList<U>;
              		/**
              		 * adapts a single node function to be used in the map-type
              		 * actions. The return is a new array of values, as via `dojo/_base/array.map`
              		 */
              		_adaptAsMap<T extends Node, U extends Node>(f: (node: T) => U, o?: Object): NodeList<U>;
              		/**
              		 * adapts a single node function to be used in the forEach-type
              		 * actions. The initial object is returned from the specialized
              		 * function.
              		 */
              		_adaptAsForEach<T extends Node>(f: (node: T) => void, o?: Object): this;
              		/**
              		 * adapts a single node function to be used in the filter-type actions
              		 */
              		_adaptAsFilter<T extends Node>(f: (node: T) => boolean, o?: Object): this;
              		/**
              		 * adapts a single node function to be used in the map-type
              		 * actions, behaves like forEach() or map() depending on arguments
              		 */
              		_adaptWithCondition<T extends Node, U extends Node>(f: (node: T) => U | void, g: (...args: any[]) => boolean, o?: Object): NodeList<U> | this;
              	}
              	interface Query {
              		/**
              		 * Returns nodes which match the given CSS selector, searching the
              		 * entire document by default but optionally taking a node to scope
              		 * the search by. Returns an instance of NodeList.
              		 */
              		<T extends Node>(query: string, root?: NodeOrString): NodeList<T>;
              		/**
              		 * Test to see if a node matches a selector
              		 */
              		matches(node: Node, selector: string, root?: NodeOrString): boolean;
              		/**
              		 * Filters an array of nodes. Note that this does not guarantee to return a NodeList, just an array.
              		 */
              		filter<T extends Node>(nodes: NodeList<T> | T[], select: string, root?: NodeOrString): T[] | NodeList<T>;
              		/**
              		 * can be used as AMD plugin to conditionally load new query engine
              		 */
              		load(id: string, parentRequire: Function, loaded: Function): void; /* TODO: Align with loader api */
              	}
              	/* dojo/ready */
              	interface Ready {
              		/**
              		 * Add a function to execute on DOM content loaded and all requested modules have arrived and been evaluated.
              		 * In most cases, the `domReady` plug-in should suffice and this method should not be needed.
              		 *
              		 * When called in a non-browser environment, just checks that all requested modules have arrived and been
              		 * evaluated.
              		 */
              		(callback: Function): void;
              		(context: Object, callback: Function | string): void;
              		(priority: number, callback: Function): void;
              		(priority: number, context: Object, callback: Function | string): void;
              	}
              	/* dojo/regexp */
              	interface RegExpModule {
              		/**
              		 * Adds escape sequences for special characters in regular expressions
              		 */
              		escapeString(str: string, except?: string): string;
              		/**
              		 * Builds a regular expression that groups subexpressions
              		 */
              		buildGroupRE(arr: any[] | Object, re: (item: any) => string, nonCapture?: boolean): string;
              		/**
              		 * adds group match to expression
              		 */
              		group(expression: string, nonCapture?: boolean): string;
              	}
              	/* dojo/request */
              	/* This is contained in request.d.ts */
              	/* dojo/require */
              	interface RequirePlugin {
              		dynamic: number;
              		normalize(id: string): string;
              		load(mid: string, require: any, loaded: (...modules: any[]) => void): void;
              	}
              	/* dojo/robot */
              	interface Robot extends doh.Robot {
              		_resolveNode(n: NodeOrString | (() => Node)): Node;
              		_scrollIntoView(n: Node): void;
              		_position(n: Node): DomGeometryBoxExtents;
              		_getWindowChain(n: Node): Window[];
              		/**
              		 * Scroll the passed node into view, if it is not.
              		 */
              		scrollIntoView(node: NodeOrString | (() => Node), delay?: number): void;
              		/**
              		 * Moves the mouse over the specified node at the specified relative x,y offset.
              		 */
              		mouseMoveAt(
              			node: NodeOrString | (() => Node),
              			delay?: number,
              			duration?: number,
              			offsetX?: number,
              			offsetY?: number
              		): void;
              	}
              	/* dojo/robotx */
              	interface RobotX extends Robot {
              		/**
              		 * Called every time a new page is loaded into the iframe, to setup variables
              		 * Point dojo.global, dojo.publish, etc. to refer to iframe.
              		 * Remove for 2.0?
              		 */
              		_updateDocument(): void;
              		/**
              		 * Opens the application at the specified URL for testing, redirecting dojo to point to the application
              		 * environment instead of the test environment.
              		 */
              		initRobot(url: string): void;
              		/**
              		 * Notifies DOH that the doh.robot is about to make a page change in the application it is driving,
              		 * returning a doh.Deferred object the user should return in their runTest function as part of a DOH test.
              		 */
              		waitForPageToLoad(submitActions: () => void): any;
              	}
              	/* dojo/router */
              	/* Module just exports instance of dojo.router.BaseRouter */
              	/* dojo/sniff */
              	interface Has {
              		(name: 'air'): boolean;
              		(name: 'wp'): void | number;
              		(name: 'msapp'): void | number;
              		(name: 'khtml'): void | number;
              		(name: 'edge'): void | number;
              		(name: 'opr'): void | number;
              		(name: 'webkit'): void | number;
              		(name: 'chrome'): void | number;
              		(name: 'android'): void | number;
              		(name: 'safari'): void | number;
              		(name: 'mac'): boolean;
              		(name: 'quirks'): boolean;
              		(name: 'iphone'): void | number;
              		(name: 'ipod'): void | number;
              		(name: 'ipad'): void | number;
              		(name: 'ios'): void | number;
              		(name: 'bb'): void | number | boolean;
              		(name: 'trident'): void | number;
              		(name: 'svg'): boolean;
              		(name: 'opera'): void | number;
              		(name: 'mozilla'): void | number;
              		(name: 'ff'): void | number;
              		(name: 'ie'): void | number;
              		(name: 'wii'): boolean | any;
              	}
              	/* Just rexports has after adding features */
              	/* dojo/Stateful */
              	interface WatchHandle extends Handle {
              		unwatch(): void;
              	}
              	interface Stateful<T = any> {
              		/**
              		 * Used across all instances a hash to cache attribute names and their getter
              		 * and setter names.
              		 */
              		_attrPairNames: { [attr: string]: string };
              		/**
              		 * Helper function for get() and set().
              		 * Caches attribute name values so we don't do the string ops every time.
              		 */
              		_getAttrNames(name: string): string;
              		/**
              		 * Automatic setting of params during construction
              		 */
              		postscript(params?: Object): void;
              		/**
              		 * Get a property on a Stateful instance.
              		 */
              		get<K extends keyof T & string>(name: K): T[K];
              		/**
              		 * Set a property on a Stateful instance
              		 */
              		set<K extends keyof T & string>(name: K, value: T[K]): this;
              		set<K extends { [p in keyof T]: T[p] extends any[] ? p : never; }[keyof T & string] >(name: K, ...values: T[K]): this;
              		set(values: Partial<T>): this;
              		/**
              		 * Internal helper for directly changing an attribute value.
              		 */
              		_changeAttrValue(name: string, value: any): this;
              		/**
              		 * Watches a property for changes
              		 */
-             		watch(callback: <K extends keyof T>(prop: K, oldValue: T[K], newValue: T[K]) => void): WatchHandle;
+             		watch(callback:(prop: keyof any, oldValue: any, newValue: any) => void): WatchHandle;
              		watch<K extends keyof T>(name: K, callback: (prop: K, oldValue: T[K], newValue: T[K]) => void): WatchHandle;
              	}
              	interface StatefulConstructor extends _base.DeclareConstructor<Stateful> {
              		new <T>(params?: Partial<T>): Stateful<T>;
              	}
              	/* dojo/string */
              	interface String {
              		/**
              		 * Efficiently escape a string for insertion into HTML (innerHTML or attributes), replacing &, <, >, ", ', and / characters.
              		 */
              		escape(str: string): string;
              		/**
              		 * Efficiently replicate a string `n` times.
              		 */
              		rep(str: string, num: number): string;
              		/**
              		 * Pad a string to guarantee that it is at least `size` length by
              		 * filling with the character `ch` at either the start or end of the
              		 * string. Pads at the start, by default.
              		 */
              		pad(text: string, size: number, ch?: string, end?: boolean): string;
              		/**
              		 * Performs parameterized substitutions on a string. Throws an
              		 * exception if any parameter is unmatched.
              		 */
              		substitute(template: string, map: Object | any[], transform?: (value: any, key: string) => any, thisObject?: Object): string;
              		/**
              		 * Trims whitespace from both sides of the string
              		 */
              		trim(str: string): string;
              	}
              	/* dojo/text */
              	/**
              	 * A getter and setter for storing the string content associated with the
              	 * module and url arguments.
              	 */
              	interface Cache {
              		(module: string | GenericObject, url: string, value?: string | { value: string, sanitize?: boolean }): string;
              	}
              	interface Text {
              		/**
              		 * the dojo/text caches it's own resources because of dojo.cache
              		 */
              		dynamic: boolean;
              		normalize(id: string, toAbsMid: Function): string; /* TODO: Align with loader api */
              		load(id: string, parentRequire: Function, loaded: Function): void; /* TODO: Align with loader api */
              	}
              	/* dojo/throttle */
              	interface Throttle {
              		<T extends Function>(cb: T, wait: number): T;
              	}
              	/* dojo/topic */
              	interface Topic {
              		/**
              		 * Publishes a message to a topic on the pub/sub hub. All arguments after
              		 * the first will be passed to the subscribers, so any number of arguments
              		 * can be provided (not just event).
              		 */
              		publish(topic: string | ExtensionEvent, ...event: any[]): boolean;
              		/**
              		 * Subscribes to a topic on the pub/sub hub
              		 */
              		subscribe(topic: string | ExtensionEvent, listener: EventListener | Function): Handle;
              	}
              	/* dojo/touch */
              	interface Touch {
              		press: ExtensionEvent;
              		move: ExtensionEvent;
              		release: ExtensionEvent;
              		cancel: ExtensionEvent;
              		over: ExtensionEvent;
              		out: ExtensionEvent;
              		enter: ExtensionEvent;
              		leave: ExtensionEvent;
              	}
              	/* dojo/uacss */
              	/* rexports has after adding classes to dom */
              	/* dojo/when */
              	interface When {
              		/**
              		 * Transparently applies callbacks to values and/or promises.
              		 */
              		<T>(value: T | dojo.promise.Promise<T>): dojo.promise.Promise<T>;
              		<T>(value: T | dojo.promise.Promise<T>,
              			callback?: dojo.promise.PromiseCallback<T, T>,
              			errback?: dojo.promise.PromiseErrback<T>,
              			progress?: dojo.promise.PromiseProgback): T | dojo.promise.Promise<T>;
              		<T, U>(value: T | dojo.promise.Promise<T>,
              			callback?: dojo.promise.PromiseCallback<T, U>,
              			errback?: dojo.promise.PromiseErrback<U>,
              			progress?: dojo.promise.PromiseProgback): U | dojo.promise.Promise<U>;
              	}
              	/* dojo/window */
              	interface WindowModule {
              		/**
              		 * Returns the dimensions and scroll position of the viewable area of a browser window
              		 */
              		getBox(doc?: Document): DomGeometryBox;
              		/**
              		 * Get window object associated with document doc.
              		 */
              		get(doc?: Document): Window;
              		/**
              		 * Scroll the passed node into view using minimal movement, if it is not already.
              		 */
              		scrollIntoView(node: Element, pos?: DomGeometryXYBox): void;
              	}
              }

dojo-typings/src/main/typings/dojo/modules.d.ts +1 -1

              /// <reference path="index.d.ts" />
              declare module 'dojo/_base/array' {
              	const dojoArray: dojo._base.Array;
              	export = dojoArray;
              }
              declare module 'dojo/_base/browser' {
              	const ready: dojo.Ready;
              	export = ready;
              }
              declare module 'dojo/_base/Color' {
              	type Color = dojo._base.Color;
              	const Color: dojo._base.ColorConstructor;
              	export = Color;
              }
              declare module 'dojo/_base/config' {
              	const config: dojo._base.Config;
              	export = config;
              }
              declare module 'dojo/_base/connect' {
              	const connect: dojo._base.Connect;
              	export = connect;
              }
              declare module 'dojo/_base/declare' {
              	const dojoDeclare: dojo._base.Declare;
              	export = dojoDeclare;
              }
              declare module 'dojo/_base/Deferred' {
              	type Deferred<T> = dojo._base.Deferred<T>;
              	const Deferred: dojo._base.DeferredConstructor;
              	export = Deferred;
              }
              declare module 'dojo/_base/event' {
              	const event: dojo._base.EventModule;
              	export = event;
              }
              declare module 'dojo/_base/fx' {
              	const fx: dojo._base.Fx;
              	export = fx;
              }
              declare module 'dojo/_base/html' {
              	const dojo: dojo._base.Dojo;
              	export = dojo;
              }
              declare module 'dojo/_base/json' {
              	const dojo: dojo._base.Dojo;
              	export = dojo;
              }
              declare module 'dojo/_base/kernel' {
              	const dojo: dojo._base.Dojo;
              	export = dojo;
              }
              declare module 'dojo/_base/lang' {
              	const lang: dojo._base.Lang;
              	export = lang;
              }
              declare module 'dojo/_base/loader' {
              	const loader: dojo._base.Loader;
              	export = loader;
              }
              declare module 'dojo/_base/NodeList' {
              	type NodeList<T extends Node> = dojo.NodeList<T>;
              	const NodeList: dojo.NodeListConstructor;
              	export = NodeList;
              }
              declare module 'dojo/_base/query' {
              	const query: dojo.Query;
              	export = query;
              }
              declare module 'dojo/_base/sniff' {
              	const has: dojo.Has;
              	export = has;
              }
              declare module 'dojo/_base/unload' {
              	const unload: dojo._base.Unload;
              	export = unload;
              }
              declare module 'dojo/_base/url' {
              	type Url = dojo._base.Url;
              	const Url: dojo._base.UrlConstructor;
              	export = Url;
              }
              declare module 'dojo/_base/window' {
              	const window: dojo._base.Window;
              	export = window;
              }
              declare module 'dojo/_base/xhr' {
              	const xhr: dojo._base.Xhr;
              	export = xhr;
              }
              declare module 'dojo/AdapterRegistry' {
              	type AdapterRegistry = dojo.AdapterRegistry;
              	const AdapterRegistry: dojo.AdapterRegistryConstructor;
              	export = AdapterRegistry;
              }
              declare module 'dojo/aspect' {
              	const aspect: dojo.Aspect;
              	export = aspect;
              }
              declare module 'dojo/back' {
              	const back: dojo.Back;
              	export = back;
              }
              declare module 'dojo/behavior' {
              	const behavior: dojo.Behavior;
              	export = behavior;
              }
              declare module 'dojo/cache' {
              	const cache: dojo.Cache;
              	export = cache;
              }
              declare module 'dojo/cldr/monetary' {
              	const monetary: dojo.cldr.Monetary;
              	export = monetary;
              }
              declare module 'dojo/cldr/supplemental' {
              	const supplemental: dojo.cldr.Supplemental;
              	export = supplemental;
              }
              declare module 'dojo/colors' {
              	type Color = dojo._base.Color;
              	const Color: dojo._base.ColorConstructor;
              	export = Color;
              }
              declare module 'dojo/cookie' {
              	const cookie: dojo.Cookie;
              	export = cookie;
              }
              declare module 'dojo/currency' {
              	const currency: dojo.Currency;
              	export = currency;
              }
              declare module 'dojo/data/api/Identity' {
              	type Identity<T> = dojo.data.api.Identity<T>;
              	const Identity: dojo.data.api.IdentityConstructor;
              	export = Identity;
              }
              declare module 'dojo/data/api/Item' {
              	type Item = dojo.data.api.Item;
              	const Item: dojo.data.api.ItemConstructor;
              	export = Item;
              }
              declare module 'dojo/data/api/Notification' {
              	type Notification<T> = dojo.data.api.Notification<T>;
              	const Notification: dojo.data.api.NotificationConstructor;
              	export = Notification;
              }
              declare module 'dojo/data/api/Read' {
              	type Read<T> = dojo.data.api.Read<T>;
              	const Read: dojo.data.api.ReadConstructor;
              	export = Read;
              }
              declare module 'dojo/data/api/Request' {
              	type Request = dojo.data.api.Request;
              	const Request: dojo.data.api.RequestConstructor;
              	export = Request;
              }
              declare module 'dojo/data/api/Write' {
              	type Write<T> = dojo.data.api.Write<T>;
              	const Write: dojo.data.api.WriteConstructor;
              	export = Write;
              }
              declare module 'dojo/data/util/filter' {
              	const filter: dojo.data.util.Filter;
              	export = filter;
              }
              declare module 'dojo/data/util/simpleFetch' {
              	const simpleFetch: dojo.data.util.SimpleFetch;
              	export = simpleFetch;
              }
              declare module 'dojo/data/util/sorter' {
              	const sorter: dojo.data.util.Sorter;
              	export = sorter;
              }
              declare module 'dojo/data/ItemFileReadStore' {
              	type ItemFileReadStore<T> = dojo.data.ItemFileReadStore<T>;
              	const ItemFileReadStore: dojo.data.ItemFileReadStoreConstructor;
              	export = ItemFileReadStore;
              }
              declare module 'dojo/data/ItemFileWriteStore' {
              	type ItemFileWriteStore<T> = dojo.data.ItemFileWriteStore<T>;
              	const ItemFileWriteStore: dojo.data.ItemFileWriteStoreConstructor;
              	export = ItemFileWriteStore;
              }
              declare module 'dojo/data/ObjectStore' {
              	type ObjectStore<T> = dojo.data.ObjectStore<T>;
              	const ObjectStore: dojo.data.ObjectStoreConstructor;
              	export = ObjectStore;
              }
              declare module 'dojo/date' {
              	const date: dojo.date.DateBase;
              	export = date;
              }
              declare module 'dojo/date/locale' {
              	const dateLocale: dojo.date.DateLocale;
              	export = dateLocale;
              }
              declare module 'dojo/date/stamp' {
              	const stamp: dojo.date.Stamp;
              	export = stamp;
              }
              declare module 'dojo/debounce' {
              	const debounce: dojo.Debounce;
              	export = debounce;
              }
              declare module 'dojo/Deferred' {
              	type Deferred<T> = dojo.Deferred<T>;
              	const Deferred: dojo.DeferredConstructor;
              	export = Deferred;
              }
              declare module 'dojo/DeferredList' {
              	type DeferredList<T> = dojo.DeferredList<T>;
              	const DeferredList: dojo.DeferredListConstructor;
              	export = DeferredList;
              }
              declare module 'dojo/dnd/autoscroll' {
              	const autoscroll: dojo.dnd.AutoScroll;
              	export = autoscroll;
              }
              declare module 'dojo/dnd/AutoSource' {
              	const AutoSource: dojo.dnd.AutoSourceConstructor;
              	export = AutoSource;
              }
              declare module 'dojo/dnd/Avatar' {
              	type Avatar = dojo.dnd.Avatar;
              	const Avatar: dojo.dnd.AvatarConstructor;
              	export = Avatar;
              }
              declare module 'dojo/dnd/common' {
              	const common: dojo.dnd.Common;
              	export = common;
              }
              declare module 'dojo/dnd/Container' {
              	type Container = dojo.dnd.Container;
              	const Container: dojo.dnd.ContainerConstructor;
              	export = Container;
              }
              declare module 'dojo/dnd/Manager' {
              	type Manager = dojo.dnd.Manager;
              	const Manager: dojo.dnd.ManagerConstructor;
              	export = Manager;
              }
              declare module 'dojo/dnd/move' {
              	const Move: dojo.dnd.Move;
              	export = Move;
              }
              declare module 'dojo/dnd/Moveable' {
              	type Moveable = dojo.dnd.Moveable;
              	const Moveable: dojo.dnd.Moveable;
              	export = Moveable;
              }
              declare module 'dojo/dnd/Mover' {
              	type Mover = dojo.dnd.Mover;
              	const Mover: dojo.dnd.MoverConstructor;
              	export = Mover;
              }
              declare module 'dojo/dnd/Selector' {
              	type Selector = dojo.dnd.Selector;
              	const Selector: dojo.dnd.SelectorConstructor;
              	export = Selector;
              }
              declare module 'dojo/dnd/Source' {
              	type Source = dojo.dnd.Source;
              	const Source: dojo.dnd.SourceConstructor;
              	export = Source;
              }
              declare module 'dojo/dnd/Target' {
              	type Target = dojo.dnd.Target;
              	const Target: dojo.dnd.TargetConstructor;
              	export = Target;
              }
              declare module 'dojo/dnd/TimedMoveable' {
              	type TimedMoveable = dojo.dnd.TimedMoveable;
              	const TimedMoveable: dojo.dnd.TimedMoveableConstructor;
              	export = TimedMoveable;
              }
              declare module 'dojo/dojo' {
              	const require: dojo.Require;
              	export = require;
              }
              declare module 'require' {
              	const require: dojo.Require;
              	export = require;
              }
              declare module 'dojo/dom' {
              	const dom: dojo.Dom;
              	export = dom;
              }
              declare module 'dojo/dom-attr' {
              	const domAttr: dojo.DomAttr;
              	export = domAttr;
              }
              declare module 'dojo/dom-class' {
              	const domClass: dojo.DomClass;
              	export = domClass;
              }
              declare module 'dojo/dom-construct' {
              	const domConstruct: dojo.DomConstruct;
              	export = domConstruct;
              }
              declare module 'dojo/dom-form' {
              	const domForm: dojo.DomForm;
              	export = domForm;
              }
              declare module 'dojo/dom-geometry' {
              	const domGeom: dojo.DomGeometry;
              	export = domGeom;
              }
              declare module 'dojo/dom-prop' {
              	const domProp: dojo.DomProp;
              	export = domProp;
              }
              declare module 'dojo/dom-style' {
              	const domStyle: dojo.DomStyle;
              	export = domStyle;
              }
              declare module 'dojo/domReady' {
              	const domReady: dojo.DomReady;
              	export = domReady;
              }
              declare module 'dojo/domReady!' {
              	const callback: any;
              	export = callback;
              }
              declare module 'dojo/errors/CancelError' {
              	type CancelError = dojo.errors.CancelError;
              	const CancelError: dojo.errors.CancelErrorConstructor;
              	export = CancelError;
              }
              declare module 'dojo/errors/create' {
              	const create: dojo.errors.Create;
              	export = create;
              }
              declare module 'dojo/errors/RequestError' {
              	type RequestError = dojo.errors.RequestError;
              	const RequestError: dojo.errors.RequestErrorConstructor;
              	export = RequestError;
              }
              declare module 'dojo/errors/RequestTimeoutError' {
              	type RequestTimeoutError = dojo.errors.RequestError;
              	const RequestTimeoutError: dojo.errors.RequestTimeoutErrorConstructor;
              	export = RequestTimeoutError;
              }
              declare module 'dojo/Evented' {
              	type Evented = dojo.Evented;
              	const Evented: dojo.EventedConstructor;
              	export = Evented;
              }
              declare module 'dojo/gears' {
              	const gears: dojo.Gears;
              	export = gears;
              }
              declare module 'dojo/has' {
              	const has: dojo.Has;
              	export = has;
              }
              declare module 'dojo/hash' {
              	const hash: dojo.Hash;
              	export = hash;
              }
              declare module 'dojo/hccss' {
              	const hccss: dojo.Has;
              	export = hccss;
              }
              declare module 'dojo/html' {
              	const html: dojo.Html;
              	export = html;
              }
              declare module 'dojo/i18n' {
              	const i18n: dojo.I18n;
              	export = i18n;
              }
              declare module 'dojo/io/iframe' {
              	const iframe: dojo.io.IFrame;
              	export = iframe;
              }
              declare module 'dojo/io/script' {
              	const script: dojo.io.Script;
              	export = script;
              }
              declare module 'dojo/io-query' {
              	const ioQuery: dojo.IoQuery;
              	export = ioQuery;
              }
              declare module 'dojo/json' {
              	const json: dojo.Json;
              	export = json;
              }
              declare module 'dojo/keys' {
              	const keys: dojo.Keys;
              	export = keys;
              }
              declare module 'dojo/loadInit' {
              	const loadInit: dojo.LoadInit;
              	export = loadInit;
              }
              declare module 'dojo/loadInit!' {
              	const loadInit: (mid: string, require: any, loaded: (...modules: any[]) => void) => void;
              	export = loadInit;
              }
              declare module 'dojo/main' {
              	const main: dojo._base.Dojo;
              	export = main;
              }
              declare module 'dojo/mouse' {
              	const mouse: dojo.Mouse;
              	export = mouse;
              }
              declare module 'dojo/NodeList' {
              	type NodeList<T extends Node> = dojo.NodeList<T>;
              	const NodeList: dojo.NodeListConstructor;
              	export = NodeList;
              }
              declare module 'dojo/number' {
              	const value: dojo.Number;
              	export = value;
              }
              declare module 'dojo/on' {
              	const on: dojo.On;
              	export = on;
              }
              declare module 'dojo/on/asyncEventListener' {
              	const asyncEventListener: dojo.on.AsyncEventListener;
              	export = asyncEventListener;
              }
              declare module 'dojo/on/debounce' {
              	const debounce: dojo.on.Debounce;
              	export = debounce;
              }
              declare module 'dojo/on/throttle' {
              	const throttle: dojo.on.Throttle;
              	export = throttle;
              }
              declare module 'dojo/parser' {
              	const parser: dojo.Parser;
              	export = parser;
              }
              declare module 'dojo/promise/all' {
              	const all: dojo.promise.All;
              	export = all;
              }
              declare module 'dojo/promise/first' {
              	const first: dojo.promise.First;
              	export = first;
              }
              declare module 'dojo/promise/instrumentation' {
              	const instrumentation: dojo.promise.Instrumentation;
              	export = instrumentation;
              }
              declare module 'dojo/promise/Promise' {
              	type Promise<T> = dojo.promise.Promise<T>;
              	const Promise: dojo.promise.PromiseConstructor;
              	export = Promise;
              }
              declare module 'dojo/promise/tracer' {
              	const tracer: dojo.promise.Tracer;
              	export = tracer;
              }
              declare module 'dojo/query' {
              	const query: dojo.Query;
              	export = query;
              }
              /* modules for included selector engines */
              declare module 'dojo/query!acme' {
              	const query: dojo.Query;
              	export = query;
              }
              declare module 'dojo/query!lite' {
              	const query: dojo.Query;
              	export = query;
              }
              declare module 'dojo/ready' {
              	const ready: dojo.Ready;
              	export = ready;
              }
              declare module 'dojo/regexp' {
              	const regexp: dojo.RegExpModule;
              	export = regexp;
              }
              declare module 'dojo/request' {
              	const request: dojo.request.Request;
              	export = request;
              }
              declare module 'dojo/request/default' {
              	const def: dojo.request.Default;
              	export = def;
              }
              declare module 'dojo/request/default!' {
              	const def: dojo.request.Request;
              	export = def;
              }
              declare module 'dojo/request/handlers' {
              	const handlers: dojo.request.Handlers;
              	export = handlers;
              }
              declare module 'dojo/request/iframe' {
              	const iframe: dojo.request.IFrame;
              	export = iframe;
              }
              declare module 'dojo/request/node' {
              	const node: dojo.request.Node;
              	export = node;
              }
              declare module 'dojo/request/registry' {
              	const registry: dojo.request.Registry;
              	export = registry;
              }
              declare module 'dojo/request/script' {
              	const script: dojo.request.Script;
              	export = script;
              }
              declare module 'dojo/request/util' {
              	const util: dojo.request.Util;
              	export = util;
              }
              declare module 'dojo/request/watch' {
              	const watch: dojo.request.Watch;
              	export = watch;
              }
              declare module 'dojo/request/xhr' {
              	const xhr: dojo.request.Xhr;
              	export = xhr;
              }
              declare module 'dojo/require' {
              	const require: dojo.RequirePlugin;
              	export = require;
              }
              declare module 'dojo/robot' {
              	const robot: dojo.Robot;
              	export = robot;
              }
              declare module 'dojo/robotx' {
              	const robotx: dojo.RobotX;
              	export = robotx;
              }
              declare module 'dojo/router' {
              	const router: dojo.router.RouterBase;
              	export = router;
              }
              declare module 'dojo/router/RouterBase' {
              	type RouterBase = dojo.router.RouterBase;
              	const RouterBase: dojo.router.RouterBaseConstructor;
              	export = RouterBase;
              }
              declare module 'dojo/rpc/JsonpService' {
              	type JsonpService<T> = dojo.rpc.JsonpService<T>;
              	const JsonpService: dojo.rpc.JsonpServiceConstructor;
              	export = JsonpService;
              }
              declare module 'dojo/rpc/JsonService' {
              	type JsonService<T> = dojo.rpc.JsonService<T>;
              	const JsonService: dojo.rpc.JsonServiceConstructor;
              	export = JsonService;
              }
              declare module 'dojo/rpc/RpcService' {
              	type RpcService<T> = dojo.rpc.RpcService<T>;
              	const RpcService: dojo.rpc.RpcServiceConstructor;
              	export = RpcService;
              }
              declare module 'dojo/selector/_loader' {
              	const loader: dojo.selector.Loader;
              	export = loader;
              }
              declare module 'dojo/selector/_loader!' {
              	const lite: dojo.selector.LiteQueryEnegine;
              	export = lite;
              }
              declare module 'dojo/selector/_loader!acme' {
              	const acme: dojo.selector.AcmeQueryEngine;
              	export = acme;
              }
              declare module 'dojo/selector/_loader!lite' {
              	const lite: dojo.selector.LiteQueryEnegine;
              	export = lite;
              }
              declare module 'dojo/selector/acme' {
              	const acme: dojo.selector.AcmeQueryEngine;
              	export = acme;
              }
              declare module 'dojo/selector/lite' {
              	const lite: dojo.selector.LiteQueryEnegine;
              	export = lite;
              }
              declare module 'dojo/sniff' {
              	const sniff: dojo.Has;
              	export = sniff;
              }
              declare module 'dojo/Stateful' {
-             	type Stateful<T = any> = dojo.Stateful<any>;
+             	type Stateful<T = any> = dojo.Stateful<T>;
              	const Stateful: dojo.StatefulConstructor;
              	export = Stateful;
              }
              declare module 'dojo/store/api/Store' {
              	type Store<T extends Object, Q extends string | Object | Function, O extends dojo.store.api.QueryOptions>  = dojo.store.api.Store<T, Q, O>;
              	const Store: dojo.store.api.StoreConstructor;
              	export = Store;
              }
              declare module 'dojo/store/util/QueryResults' {
              	const QueryResults: dojo.store.util.QueryResultsFunction;
              	export = QueryResults;
              }
              declare module 'dojo/store/util/SimpleQueryEngine' {
              	const SimpleQueryEngine: dojo.store.util.SimpleQueryEngine;
              	export = SimpleQueryEngine;
              }
              declare module 'dojo/store/Cache' {
              	const Cache: dojo.store.Cache;
              	export = Cache;
              }
              declare module 'dojo/store/DataStore' {
              	type DataStore<T extends Object> = dojo.store.DataStore<T>;
              	const DataStore: dojo.store.DataStoreConstructor;
              	export = DataStore;
              }
              declare module 'dojo/store/JsonRest' {
              	type JsonRest<T extends object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.JsonRestQueryOptions> = dojo.store.JsonRest<T, Q, O>;
              	const JsonRest: dojo.store.JsonRestConstructor;
              	export = JsonRest;
              }
              declare module 'dojo/store/Memory' {
              	type Memory<T extends Object> = dojo.store.Memory<T>;
              	const Memory: dojo.store.MemoryConstructor;
              	export = Memory;
              }
              declare module 'dojo/store/Observable' {
              	const Observerable: dojo.store.Observable;
              	export = Observerable;
              }
              declare module 'dojo/string' {
              	const value: dojo.String;
              	export = value;
              }
              declare module 'dojo/text' {
              	const text: dojo.Text;
              	export = text;
              }
              declare module 'dojo/throttle' {
              	const throttle: dojo.Throttle;
              	export = throttle;
              }
              declare module 'dojo/topic' {
              	const hub: dojo.Topic;
              	export = hub;
              }
              declare module 'dojo/touch' {
              	const touch: dojo.Touch;
              	export = touch;
              }
              declare module 'dojo/uacss' {
              	const uacss: dojo.Has;
              	export = uacss;
              }
              declare module 'dojo/when' {
              	const when: dojo.When;
              	export = when;
              }
              declare module 'dojo/window' {
              	const window: dojo.WindowModule;
              	export = window;
              }
              declare module 'dojo/i18n!*' {
              	const value: any;
              	export = value;
              }
              declare module 'dojo/text!*' {
              	const content: string;
              	export = content;
              }

dojo-typings/src/test/ts/StatefulTests.ts +7 -2

-             import Stateful = require("dojo/Stateful");
+             import * as Stateful from "dojo/Stateful";
+             import { StatefulAttrs, watch } from "./traits";
              interface ScheduleAttrs {
                  title: string;
                  duration: number;
              }
              declare class Schedule extends Stateful<ScheduleAttrs> {
                  title: string;
              }
              const model = new Schedule({duration: 10, title: "Test event"});
              model.get("title");
              model.get("duration");
-             model.set("duration", 12);
  No newline at end of file
+             model.set("duration", 12);
+             watch(model, "duration", v => v);
+             declare const o : StatefulAttrs<Schedule>;
  No newline at end of file

dojo-typings/src/test/ts/StoreTests.ts +2 -4

-             import Memory = require("dojo/store/Memory");
-             import Observable = require("dojo/store/Observable");
+             import * as Memory from "dojo/store/Memory";
+             import * as Observable from "dojo/store/Observable";
              interface Schedule {
                  id?: string;
                  title: string;
                  duration: number;
              }
              declare const store: dojo.store.api.Store<Schedule>;
              const observable = new Observable(store);
              const mem = new Memory<Schedule>();
-             (async () => {
-                 observable.query().observe(() => {});
-                 store.query().forEach(() => {});
-                 const total = await store.query().total;
-                 const result = await store.query();
-                 mem.query();
-                 mem.add({duration: 10, title: "Test event"});
-             })();
  No newline at end of file

dojo-typings/src/test/ts/_WidgetTests.ts +30 -6

-             import _WidgetBase = require("dijit/_WidgetBase");
+             import * as _WidgetBase from "dijit/_WidgetBase";
+             import { watch } from "./traits";
              interface ScheduleWidgetAttrs {
                  data: string[];
              }
-             declare const w0: _WidgetBase<ScheduleWidgetAttrs>;
+             interface ScheduleWidgetEvents {
+                 "scheduled": Event & {
+                     detail: {
+                         startDate: Date,
+                         endDate: Date
+                     }
+                 };
+             }
-             w0.get("data");
-             declare class ScheduleWidget extends _WidgetBase {
+             declare class ScheduleWidget extends _WidgetBase<ScheduleWidgetAttrs, ScheduleWidgetEvents> {
                  data: string[];
              }
              const w = new ScheduleWidget({title: "Year schedule", data: ["a", "b"] });
-             w.get("data");
  No newline at end of file
+             w.get("data");
+             w.watch((p, o, n) => [p,o,n]);
+             w.watch("data", (p, o, n) => [p,o,n]);
+             watch(w, "title", v => String(v) );
+             watch(w, "data", v => String(v) );
+             w.emit("scheduled", { detail: { startDate: new Date(), endDate: new Date()} });
+             w.emit("click", {} );
+             w.emit("click", {} );
+             w.emit("some-extra-event", {});
+             w.on("click", e => e);
+             w.on("some-extra-event", e => e);

dojo-typings/src/test/tsconfig.json +3 -1

              {
                  "extends": "../tsconfig",
                  "compilerOptions": {
                      "baseUrl": ".",
                      "rootDir": "ts",
                      "rootDirs": [
                          "ts",
+                         "typings",
                          "../main/ts"
                      ],
                      "types": [
                          "requirejs",
                          "../main/typings/dojo/modules",
                          "../main/typings/dijit/modules"
                      ],
-                     "module": "amd"
+                     "module": "ESNext",
+                     "target": "ESNext"
                  },
                  "include": [
                      "typings/**/*.ts",
                      "ts/**/*.ts",
                      "ts/**/*.tsx"
                  ]
              }
  No newline at end of file

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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