implab/implabjs-djx Commit - r36:a1a1ef050ecc

fixes to css, nls to support requirejs optimizer

cin -

r36:a1a1ef050ecc 1.0.0-rc17 default

parent child

Context file:

r36:a1a1ef050ecc

src/main/ts/css.ts +12 -11

@@ -1,16 +1,17
1	import inject = ~~require~~("./dom-inject");	1	import inject from "./dom-inject";
2	import { id as mid} from "module";	2
3	import { TraceSource } from "@implab/core-amd/log/TraceSource";	3	interface OnLoad {
4	const log = TraceSource.get(mid);	4	(result?: any): void;
		5	error(err: any): void;
		6	}
5		7
6	const plugin = {	8	const plugin = {
7	load: ~~async~~ (id: string, require: Require, cb: (~~param~~: any) => ~~void~~) => {	9	load: (id: string, require: Require, cb: OnLoad, config: { isBuild?: boolean }) => {
8	const url = require.toUrl(id);	10	if (config.isBuild) {
9	~~try~~ {	11	cb();
10	await inject.injectStylesheet(url);	12	} else {
11	cb({ url });	13	const url = require.toUrl(id);
12	} catch (e) {	14	inject.injectStylesheet(url).then(() => cb({ url }), e => cb.error(e));
13	log.error("CSS plugin failed to load {0} ({1}): {2}", id, url, e);
14	}	15	}
15	}	16	}
16	};	17	};

src/main/ts/dom-inject.ts +7 -4

             }
             class DomInject {
-                injectionPoint = document.head;
+                injectionPoint?: HTMLElement;
-                injectBefore = document.head.firstChild;
+                injectBefore?: HTMLElement;
                 _map: MapOf<Promise<NodeLoadResult>> = {};
                         mixin(node, attr);
-                        this.injectionPoint.insertBefore(node, this.injectBefore);
+                        const _injectionPoint = this.injectionPoint || document.head;
+                        const _injectBefore = this.injectBefore || _injectionPoint.firstChild;
+                        _injectionPoint.insertBefore(node, _injectBefore);
                     });
                 }
             };
             const instance = new DomInject();
-            export = instance;
  No newline at end of file
+            export default instance;

src/main/ts/i18n.ts +14 -5

             import { NlsBundle } from "./NlsBundle";
             import { isPromise } from "@implab/core-amd/safe";
+            interface OnLoad {
+                (result?: any): void;
+                error(err: any): void;
+            }
             export function bundle<T extends object>(nls: T, locales?: MapOf<any>) {
                 const nlsBundle = new NlsBundle(nls, locales);
                 fn.define = (pack: Partial<T>) => pack;
                 fn.default = nlsBundle.default;
-                fn.load = async (id: string, require: Require, cb: { (): void; error: (arg0: any) => void; }) => {
+                fn.load = async (id: string, require: Require, cb: OnLoad, config: any) => {
-                    try {
+                    if (config.isBuild) {
-                        await nlsBundle.getLocale(id);
                         cb();
-                    } catch (e) {
+                    } else {
-                        cb.error(e);
+                        try {
+                            await nlsBundle.getLocale(id);
+                            cb();
+                        } catch (e) {
+                            cb.error(e);
+                        }
                     }
                 };

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