implab/implabjs-djx Commit - r85:35a7b6319ebe

@on decorator registers handlers directry on domNode, added support to multiple events in one decorator...

cin -

r85:35a7b6319ebe v1.2.6 default

parent child

Context file:

r85:35a7b6319ebe

djx/src/main/ts/tsx/DjxWidgetBase.ts +2 -1

             import _AttachMixin = require("dijit/_AttachMixin");
             import { Rendition, isNode } from "./traits";
             import registry = require("dijit/registry");
+            import on = require("dojo/on");
             // type Handle = dojo.Handle;
                         this._eventHandlers.forEach(({ eventName, handlerMethod }) => {
                             const handler = this[handlerMethod as keyof this];
                             if (typeof handler === "function")
-                                this.on(eventName, handler.bind(this));
+                                on(this.domNode, eventName, handler.bind(this));
                         });
                 }

djx/src/main/ts/tsx/traits.ts +4 -6

             }
             export function isRendition(v: any): v is Rendition {
-                return typeof v === "object" && typeof v.getDomElement === "function";
+                return typeof v && typeof v.getDomElement === "function";
             }
             /**
              *  }
              * ```
              */
-            export const on = <E extends string>(eventName: E) =>
+            export const on = <E extends string>(...eventNames: E[]) =>
                 <K extends string,
                     T extends DjxWidgetBase<any, { [p in E]: EV }>,
                     EV extends Event
                     key: K,
                     _descriptor: TypedPropertyDescriptor<(eventObj: EV) => void> | TypedPropertyDescriptor<() => void>
                 ): any => {
-                    if(!target._eventHandlers)
+                    const handlers = eventNames.map(eventName => ({ eventName, handlerMethod: key }))
-                        target._eventHandlers = [{ eventName, handlerMethod: key }];
+                    target._eventHandlers = target._eventHandlers ? target._eventHandlers.concat(handlers) : handlers;
-                    else
-                        target._eventHandlers.push({ eventName, handlerMethod: key });
                 };

djx/src/test/ts/view/MyWidget.tsx +2 -2

                 _onCounterInc(evt: Event & { detail: number; x?: number; }) {
                 }
-                @on("click")
+                @on("click", "keydown")
-                protected _onClick() {
+                protected _onClick(event: MouseEvent | KeyboardEvent) {
                 }
             }

General Comments 0

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

No TODOs yet

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