implab/implabjs-djx Commit - r79:e5bb5e80ce96

djx/.eslintrc.json created 644 +25 0

@@ -0,0 +1,25
	1	{
	2	"env": {
	3	"browser": true,
	4	"amd": true
	5	},
	6	"parserOptions": {
	7	"ecmaFeatures": {
	8	"jsx": true
	9	},
	10	"sourceType": "script"
	11	},
	12	"extends": "eslint:recommended",
	13	"rules": {
	14	"no-const-assign": "warn",
	15	"no-this-before-super": "warn",
	16	"no-undef": "error",
	17	"no-unreachable": "warn",
	18	"no-unused-vars": "warn",
	19	"constructor-super": "warn",
	20	"valid-typeof": "warn",
	21	"semi" : "warn",
	22	"no-invalid-this" : "error",
	23	"no-console": "off"
	24	}
	25	} No newline at end of file

djx/tslint.json created 644 +48 0

@@ -0,0 +1,48
	1	{
	2	"extends": "tslint:recommended",
	3	"defaultSeverity": "warn",
	4	"rules": {
	5	"align": [
	6	true,
	7	"parameters",
	8	"statements"
	9	],
	10	"interface-name": [
	11	false
	12	],
	13	"max-line-length": [
	14	true,
	15	185
	16	],
	17	"quotemark": [true, "double", "avoid-escape"],
	18	"member-access": false,
	19	"semicolon": [true, "always", "ignore-bound-class-methods"],
	20	"no-bitwise": false,
	21	"no-empty": false,
	22	"no-namespace": false,
	23	"ordered-imports": false,
	24	"no-return-await": true,
	25	"no-floating-promises": true,
	26	"one-line": [
	27	true,
	28	"check-open-brace",
	29	"check-catch",
	30	"check-whitespace"
	31	],
	32	"object-literal-sort-keys": false,
	33	"trailing-comma": [
	34	true,
	35	{
	36	"singleline": "never",
	37	"multiline": "never"
	38	}
	39	],
	40	"variable-name": false,
	41	"curly": false,
	42	"array-type": false,
	43	"arrow-parens": [
	44	true,
	45	"ban-single-arg-parens"
	46	]
	47	}
	48	} No newline at end of file

djx/build.gradle +1 0

                     module = "amd"
                     it.target = "es5"
                     experimentalDecorators = true
+                    noUnusedLocals = true
                     jsx = "react"
                     jsxFactory = "createElement"
                     moduleResolution = "node"

djx/src/main/ts/NlsBundle.ts 0 -8

             import { MapOf, PromiseOrValue } from "@implab/core-amd/interfaces";
             import { argumentNotEmptyString, isPromise, mixin } from "@implab/core-amd/safe";
-            import { id as mid } from "module";
-            import { TraceSource } from "@implab/core-amd/log/TraceSource";
-            const trace = TraceSource.get(mid);
             export type LocaleProvider<T> = () => PromiseOrValue<T | { default: T }>;
                 return typeof v === "function";
             }
-            function defaultResolver(module: string) {
-                return import(module).then(x => x && x.default ? x.default : x);
             function chainObjects<T extends object>(o1: T, o2: T) {
                 if (!o1)
                     return o2;

djx/src/main/ts/declare.ts +1 -4

             import declare = require("dojo/_base/declare");
             import { each } from "@implab/core-amd/safe";
             import { Constructor } from "@implab/core-amd/interfaces";
-            import dojo = require("dojo/_base/kernel");
             // declare const declare: any;
                 // проверка того, что класс унаследован от специальной заглушки
                 if (isMockConstructor(bc)) {
-                    // t - базовый класс, объявленный при помощи dojo/_base/declare
+                    // bc.bases - базовый класс, объявленный при помощи dojo/_base/declare
-                    const t = bc.bases;
                     const cls = declare<any>(bc.bases, target.prototype);
                     // bc - базовый класс, bc.prototype используется как super

djx/src/main/ts/dom-inject.ts +1 -1

                         throw e;
                     }
                 }
-            };
             const instance = new DomInject();
             export default instance;

djx/src/main/ts/tsx/BuildContextBase.ts +4 -4

             /**
              * @deprecated use RenditionBase instead
              */
-             export type BuildContextBase<TNode extends Node> = RenditionBase<TNode>;
+            export type BuildContextBase<TNode extends Node> = RenditionBase<TNode>;
              /**
-             * @deprecated use RenditionBase instead
+              * @deprecated use RenditionBase instead
-             */
+              */
-             export const BuildContextBase = RenditionBase;
+            export const BuildContextBase = RenditionBase;

djx/src/main/ts/tsx/DjxFragment.ts +1 -1

             /** Special functional component used to create a document fragment */
-            export function DjxFragment({children}: {children?: Node | Node[]}){
+            export function DjxFragment({ children }: { children?: Node | Node[] }) {
                 const fragment = document.createDocumentFragment();
                 if (children)
                     (children instanceof Array ? children : [children]).forEach(child => fragment.appendChild(child));

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

-            import { AbstractConstructor, djbase, djclass } from "../declare";
+            import { djbase, djclass } from "../declare";
             import _WidgetBase = require("dijit/_WidgetBase");
             import _AttachMixin = require("dijit/_AttachMixin");
-            import { Rendition, isNode, startupWidgets } from "./traits";
+            import { Rendition, isNode } from "./traits";
             import registry = require("dijit/registry");
             // type Handle = dojo.Handle;
             type _super = {
                 startup(): void;
+            };
             @djclass
             export abstract class DjxWidgetBase<Attrs = {}, Events = {}> extends djbase<_super, _AttachMixin>(_WidgetBase, _AttachMixin) {

djx/src/main/ts/tsx/RenditionBase.ts +3 -3

                             items.push(collection[i]);
                         }
                         return items;
+                    };
                     const startup = (node: Node) => {
                         if (node.parentNode) {
                         }
                         if (isInPage(node))
                             startupWidgets(node);
+                    };
-                    const startupPending = isDocumentFragmentNode(domNode) ? collect(domNode.children) : [domNode]
+                    const startupPending = isDocumentFragmentNode(domNode) ? collect(domNode.children) : [domNode];
                     dom.place(domNode, refNode, position);

djx/src/main/ts/tsx/WidgetRendition.ts +1 -1

                         // fix the dojo startup behavior when the widget is placed
                         // directly to the document and doesn't have any enclosing widgets
                         const parentWidget = instance.domNode.parentNode ?
-                            registry.getEnclosingWidget(instance.domNode.parentNode) : null
+                            registry.getEnclosingWidget(instance.domNode.parentNode) : null;
                         if (!parentWidget && isInPage(instance.domNode) && typeof instance.startup === "function")
                             instance.startup();
                     } else {

djx/src/main/ts/tsx/traits.ts +3 -3

                 cleanupOrOwner: { own: CleanFn } | CleanFn = () => { }
             ) {
                 let rendition = new FunctionRendition(() => render(target.get(prop)));
-                const _own = cleanupOrOwner instanceof Function ? cleanupOrOwner : (x: IRemovable) => cleanupOrOwner.own(x)
+                const _own = cleanupOrOwner instanceof Function ? cleanupOrOwner : (x: IRemovable) => cleanupOrOwner.own(x);
                 _own(target.watch(prop, (_name, oldValue, newValue) => {
                     if (oldValue !== newValue) {
                         const newRendition = new FunctionRendition(() => render(newValue));
              * ```
              */
             export const on = <E extends string>(eventName: E) =>
-                <K extends keyof T,
+                <K extends string,
                     T extends DjxWidgetBase<any, { [p in E]: EV }>,
                     EV extends Event
                 >(
                     target: T,
                     key: K,
-                    descriptor: TypedPropertyDescriptor<(eventObj: EV) => void> | TypedPropertyDescriptor<() => void>
+                    _descriptor: TypedPropertyDescriptor<(eventObj: EV) => void> | TypedPropertyDescriptor<() => void>
                 ): any => {
                     target._eventHandlers.push({ eventName, handlerMethod: key });
                 };

djx/src/test/ts/DeclareTests.ts +2 0

             import { Baz } from "./mock/Baz";
+            // tslint:disable-next-line: no-console
             console.log("Declare tests");
             const baz = new Baz();
             const data: string[] = [];
             baz.writeHello(data);
+            // tslint:disable-next-line: no-console
             console.log(data.join("\n"));

djx/src/test/ts/dummy.ts 0 -1

             import { test } from "./TestTraits";
             import { delay } from "@implab/core-amd/safe";
             import { assert } from "chai";
-            import css = require("@implab/djx/css!my.css");
             test("simple", (ok, fail, log) => {
                 setTimeout(() => {

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

                 }
                 @on("click")
-                _onClick() {
+                protected _onClick() {
                 }
             }

djx/src/tsconfig.json +2 -1

                     "target": "ES5",
                     //"skipLibCheck": true,
                     "jsx": "react",
-                    "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"]
+                    "lib": ["es5", "es2015.promise", "es2015.symbol", "es2015.iterable", "dom", "scripthost"],
+                    "noUnusedLocals": true
                 }
             }

	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