Skip to content

Commit a260fbc

Browse files
committed
#9005 class names and cleanup
1 parent a9366d0 commit a260fbc

3 files changed

Lines changed: 16 additions & 11 deletions

File tree

src/app/SharedCanvas.mjs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,33 +171,38 @@ class SharedCanvas extends Canvas {
171171
async initAsync() {
172172
await super.initAsync();
173173

174-
if (this.rendererImportPath) {
174+
let me = this;
175+
176+
if (me.rendererImportPath) {
175177
// Ensure Canvas Worker is running
176-
await Neo.worker.Manager.startWorker({name: 'canvas'});
178+
await Neo.worker.Manager.startWorker({
179+
name : 'canvas',
180+
windowId: me.windowId
181+
});
177182

178183
// Wait for the Canvas Worker remote to be available.
179184
let i = 0;
180185

181186
while (!Neo.ns('Neo.worker.Canvas.loadModule') && i < 40) {
182-
await this.timeout(50);
187+
await me.timeout(50);
183188
i++
184189
}
185190

186191
if (Neo.ns('Neo.worker.Canvas.loadModule')) {
187192
// Load the specific renderer module for this component
188193
await Neo.worker.Canvas.loadModule({
189-
path: this.rendererImportPath
194+
path: me.rendererImportPath
190195
});
191196

192197
// Wait for the remote stub to be created
193198
let j = 0;
194-
while (!this.renderer && j < 40) {
195-
await this.timeout(50);
199+
while (!me.renderer && j < 40) {
200+
await me.timeout(50);
196201
j++
197202
}
198203

199-
if (!this.renderer) {
200-
console.error('Renderer Remote Stub not found:', this.rendererClassName)
204+
if (!me.renderer) {
205+
console.error('Renderer Remote Stub not found:', me.rendererClassName)
201206
}
202207
} else {
203208
console.error('Neo.component.CanvasShared: Canvas Worker failed to register remote methods.')

src/app/header/Toolbar.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Controller from './ToolbarController.mjs';
44

55
/**
66
* @class Neo.app.header.Toolbar
7-
* @extends Neo.container.Base
7+
* @extends Neo.toolbar.Base
88
*/
99
class Toolbar extends Base {
1010
static config = {

src/app/header/ToolbarController.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import Component from '../../controller/Component.mjs';
1+
import Controller from '../../controller/Component.mjs';
22

33
/**
44
* @class Neo.app.header.ToolbarController
55
* @extends Neo.controller.Component
66
*/
7-
class ToolbarController extends Component {
7+
class ToolbarController extends Controller {
88
static config = {
99
/**
1010
* @member {String} className='Neo.app.header.ToolbarController'

0 commit comments

Comments
 (0)