Skip to content
This repository has been archived by the owner on Jul 30, 2018. It is now read-only.

use the global precedence when checking to invalidate #687

Merged
merged 1 commit into from
Sep 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/RegistryHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class RegistryHandler extends Evented {
}
else if (registeredLabels.indexOf(label) === -1) {
const handle = registry.on(label, (event: RegistryEventObject) => {
if (event.action === 'loaded' && (this as any)[getFunctionName](label) === event.item) {
if (event.action === 'loaded' && (this as any)[getFunctionName](label, globalPrecedence) === event.item) {
this.emit({ type: 'invalidate' });
}
});
Expand Down
3 changes: 1 addition & 2 deletions src/WidgetBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import '@dojo/shim/Promise'; // Imported for side-effects
import WeakMap from '@dojo/shim/WeakMap';
import { Handle } from '@dojo/interfaces/core';
import { isWNode, v, isHNode } from './d';
import { auto, ignore } from './diff';
import { auto } from './diff';
import {
AfterRender,
BeforeProperties,
Expand Down Expand Up @@ -122,7 +122,6 @@ const boundAuto = auto.bind(null);
/**
* Main widget base for all widgets to extend
*/
@diffProperty('registry', ignore)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need this special diffProperty for registry now it is not a supported property.

export class WidgetBase<P = WidgetProperties, C extends DNode = DNode> extends Evented implements WidgetBaseInterface<P, C> {

/**
Expand Down
29 changes: 29 additions & 0 deletions tests/unit/RegistryHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,20 @@ registerSuite({
registry.define('widget', GlobalWidget);
assert.strictEqual(invalidateCount, 1);
},
'no `invalidate` events emitted once the with registry with the highest precedence has loaded - with global'() {
const registryHandler = new RegistryHandler();
const registry = new Registry();
registryHandler.base = registry;
let invalidateCount = 0;
registryHandler.on('invalidate', () => {
invalidateCount++;
});
registryHandler.get('widget', true);
registry.define('widget', GlobalWidget);
assert.strictEqual(invalidateCount, 1);
registryHandler.define('widget', LocalWidget);
assert.strictEqual(invalidateCount, 1);
},
'ignores unknown event actions'() {
const registryHandler = new RegistryHandler();
const registry = new Registry();
Expand Down Expand Up @@ -245,6 +259,21 @@ registerSuite({
registry.defineInjector('injector', globalInjector);
assert.strictEqual(invalidateCount, 1);
},
'no `invalidate` events emitted once the with registry with the highest precedence has loaded - with global'() {
const registryHandler = new RegistryHandler();
const registry = new Registry();
registryHandler.base = registry;
const localInjector = new Injector({});
let invalidateCount = 0;
registryHandler.on('invalidate', () => {
invalidateCount++;
});
registryHandler.getInjector('injector', true);
registry.defineInjector('injector', globalInjector);
assert.strictEqual(invalidateCount, 1);
registryHandler.defineInjector('injector', localInjector);
assert.strictEqual(invalidateCount, 1);
},
'ignores unknown event actions'() {
const registryHandler = new RegistryHandler();
const registry = new Registry();
Expand Down