Skip to content

Commit 166e85d

Browse files
davidbrochartdavidbrochart
committed
Rename lmWidget to luminoWidget
1 parent bcac4af commit 166e85d

File tree

12 files changed

+85
-85
lines changed

12 files changed

+85
-85
lines changed

‎examples/web3/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'codemirror/lib/codemirror.css';
33
import 'codemirror/mode/python/python';
44
import 'font-awesome/css/font-awesome.css';
55
import { WidgetManager } from './manager';
6-
import * as lmWidget from '@lumino/widgets';
6+
import * as luminoWidget from '@lumino/widgets';
77

88
import {
99
KernelManager,
@@ -63,7 +63,7 @@ document.addEventListener('DOMContentLoaded', async function(event) {
6363
const model = await manager.get_model(widgetData.model_id);
6464
if (model !== undefined) {
6565
const view = await manager.create_view(model);
66-
lmWidget.Widget.attach(view.pWidget, widgetarea);
66+
luminoWidget.Widget.attach(view.pWidget, widgetarea);
6767
}
6868
}
6969
}

‎packages/base/src/widget.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -882,10 +882,10 @@ export class DOMWidgetView extends WidgetView {
882882
* Getter for backward compatibility.
883883
*
884884
* pWidget is deprecated and will be removed in the future,
885-
* please use lmWidget instead.
885+
* please use luminoWidget instead.
886886
*/
887887
get pWidget(): Widget {
888-
return this.lmWidget;
888+
return this.luminoWidget;
889889
}
890890

891891
setLayout(layout: LayoutModel, oldLayout?: LayoutModel): void {
@@ -906,12 +906,12 @@ export class DOMWidgetView extends WidgetView {
906906
// Post (asynchronous) so layout changes can take
907907
// effect first.
908908
MessageLoop.postMessage(
909-
this.lmWidget,
909+
this.luminoWidget,
910910
Widget.ResizeMessage.UnknownSize
911911
);
912912
});
913913
MessageLoop.postMessage(
914-
this.lmWidget,
914+
this.luminoWidget,
915915
Widget.ResizeMessage.UnknownSize
916916
);
917917
return view;
@@ -1036,21 +1036,21 @@ export class DOMWidgetView extends WidgetView {
10361036
}
10371037

10381038
_setElement(el: HTMLElement): void {
1039-
if (this.lmWidget) {
1040-
this.lmWidget.dispose();
1039+
if (this.luminoWidget) {
1040+
this.luminoWidget.dispose();
10411041
}
10421042

10431043
this.$el = el instanceof $ ? el : $(el);
10441044
this.el = this.$el[0];
1045-
this.lmWidget = new JupyterLuminoWidget({
1045+
this.luminoWidget = new JupyterLuminoWidget({
10461046
node: el,
10471047
view: this
10481048
});
10491049
}
10501050

10511051
remove(): any {
1052-
if (this.lmWidget) {
1053-
this.lmWidget.dispose();
1052+
if (this.luminoWidget) {
1053+
this.luminoWidget.dispose();
10541054
}
10551055
return super.remove();
10561056
}
@@ -1065,9 +1065,9 @@ export class DOMWidgetView extends WidgetView {
10651065

10661066
private _comm_live_update(): void {
10671067
if (this.model.comm_live) {
1068-
this.lmWidget.removeClass('jupyter-widgets-disconnected');
1068+
this.luminoWidget.removeClass('jupyter-widgets-disconnected');
10691069
} else {
1070-
this.lmWidget.addClass('jupyter-widgets-disconnected');
1070+
this.luminoWidget.addClass('jupyter-widgets-disconnected');
10711071
}
10721072
}
10731073

@@ -1083,7 +1083,7 @@ export class DOMWidgetView extends WidgetView {
10831083
}
10841084
el: HTMLElement; // Override typing
10851085
'$el': any;
1086-
lmWidget: Widget;
1086+
luminoWidget: Widget;
10871087
layoutPromise: Promise<any>;
10881088
stylePromise: Promise<any>;
10891089
}

‎packages/controls/src/widget_audio.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class AudioView extends DOMWidgetView {
3535
* Called when view is rendered.
3636
*/
3737
super.render();
38-
this.lmWidget.addClass('jupyter-widgets');
38+
this.luminoWidget.addClass('jupyter-widgets');
3939
this.update(); // Set defaults.
4040
}
4141

‎packages/controls/src/widget_box.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ export class VBoxModel extends BoxModel {
6060

6161
export class BoxView extends DOMWidgetView {
6262
_createElement(tagName: string): HTMLElement {
63-
this.lmWidget = new JupyterLuminoPanelWidget({ view: this });
64-
return this.lmWidget.node;
63+
this.luminoWidget = new JupyterLuminoPanelWidget({ view: this });
64+
return this.luminoWidget.node;
6565
}
6666

6767
_setElement(el: HTMLElement): void {
68-
if (this.el || el !== this.lmWidget.node) {
68+
if (this.el || el !== this.luminoWidget.node) {
6969
// Boxes don't allow setting the element beyond the initial creation.
7070
throw new Error('Cannot reset the DOM element.');
7171
}
7272

73-
this.el = this.lmWidget.node;
74-
this.$el = $(this.lmWidget.node);
73+
this.el = this.luminoWidget.node;
74+
this.$el = $(this.luminoWidget.node);
7575
}
7676

7777
initialize(parameters: WidgetView.IInitializeParameters): void {
@@ -80,9 +80,9 @@ export class BoxView extends DOMWidgetView {
8080
this.listenTo(this.model, 'change:children', this.update_children);
8181
this.listenTo(this.model, 'change:box_style', this.update_box_style);
8282

83-
this.lmWidget.addClass('jupyter-widgets');
84-
this.lmWidget.addClass('widget-container');
85-
this.lmWidget.addClass('widget-box');
83+
this.luminoWidget.addClass('jupyter-widgets');
84+
this.luminoWidget.addClass('widget-container');
85+
this.luminoWidget.addClass('widget-box');
8686
}
8787

8888
render(): void {
@@ -98,7 +98,7 @@ export class BoxView extends DOMWidgetView {
9898
// Notify all children that their sizes may have changed.
9999
views.forEach(view => {
100100
MessageLoop.postMessage(
101-
view.lmWidget,
101+
view.luminoWidget,
102102
Widget.ResizeMessage.UnknownSize
103103
);
104104
});
@@ -117,13 +117,13 @@ export class BoxView extends DOMWidgetView {
117117
// we insert a dummy element so the order is preserved when we add
118118
// the rendered content later.
119119
const dummy = new Widget();
120-
this.lmWidget.addWidget(dummy);
120+
this.luminoWidget.addWidget(dummy);
121121

122122
return this.create_child_view(model)
123123
.then((view: DOMWidgetView) => {
124124
// replace the dummy widget with the new one.
125-
const i = ArrayExt.firstIndexOf(this.lmWidget.widgets, dummy);
126-
this.lmWidget.insertWidget(i, view.lmWidget);
125+
const i = ArrayExt.firstIndexOf(this.luminoWidget.widgets, dummy);
126+
this.luminoWidget.insertWidget(i, view.luminoWidget);
127127
dummy.dispose();
128128
return view;
129129
})
@@ -137,7 +137,7 @@ export class BoxView extends DOMWidgetView {
137137

138138
children_views: ViewList<DOMWidgetView> | null;
139139
pWidget: JupyterLuminoPanelWidget;
140-
lmWidget: JupyterLuminoPanelWidget;
140+
luminoWidget: JupyterLuminoPanelWidget;
141141

142142
static class_map = {
143143
success: ['alert', 'alert-success'],
@@ -153,7 +153,7 @@ export class HBoxView extends BoxView {
153153
*/
154154
initialize(parameters: WidgetView.IInitializeParameters): void {
155155
super.initialize(parameters);
156-
this.lmWidget.addClass('widget-hbox');
156+
this.luminoWidget.addClass('widget-hbox');
157157
}
158158
}
159159

@@ -163,7 +163,7 @@ export class VBoxView extends BoxView {
163163
*/
164164
initialize(parameters: WidgetView.IInitializeParameters): void {
165165
super.initialize(parameters);
166-
this.lmWidget.addClass('widget-vbox');
166+
this.luminoWidget.addClass('widget-vbox');
167167
}
168168
}
169169

@@ -173,9 +173,9 @@ export class GridBoxView extends BoxView {
173173
*/
174174
initialize(parameters: WidgetView.IInitializeParameters): void {
175175
super.initialize(parameters);
176-
this.lmWidget.addClass('widget-gridbox');
176+
this.luminoWidget.addClass('widget-gridbox');
177177
// display needn't be set to flex and grid
178-
this.lmWidget.removeClass('widget-box');
178+
this.luminoWidget.removeClass('widget-box');
179179
}
180180
}
181181

‎packages/controls/src/widget_controller.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,18 +329,18 @@ export class ControllerModel extends CoreDOMWidgetModel {
329329
*/
330330
export class ControllerView extends DOMWidgetView {
331331
_createElement(tagName: string): HTMLElement {
332-
this.lmWidget = new JupyterLuminoPanelWidget({ view: this });
333-
return this.lmWidget.node;
332+
this.luminoWidget = new JupyterLuminoPanelWidget({ view: this });
333+
return this.luminoWidget.node;
334334
}
335335

336336
_setElement(el: HTMLElement): void {
337-
if (this.el || el !== this.lmWidget.node) {
337+
if (this.el || el !== this.luminoWidget.node) {
338338
// Boxes don't allow setting the element beyond the initial creation.
339339
throw new Error('Cannot reset the DOM element.');
340340
}
341341

342-
this.el = this.lmWidget.node;
343-
this.$el = $(this.lmWidget.node);
342+
this.el = this.luminoWidget.node;
343+
this.$el = $(this.luminoWidget.node);
344344
}
345345

346346
initialize(parameters: WidgetView.IInitializeParameters): void {
@@ -367,11 +367,11 @@ export class ControllerView extends DOMWidgetView {
367367

368368
this.axis_box = new Panel();
369369
this.axis_box.node.style.display = 'flex';
370-
this.lmWidget.addWidget(this.axis_box);
370+
this.luminoWidget.addWidget(this.axis_box);
371371

372372
this.button_box = new Panel();
373373
this.button_box.node.style.display = 'flex';
374-
this.lmWidget.addWidget(this.button_box);
374+
this.luminoWidget.addWidget(this.button_box);
375375

376376
this.button_views.update(this.model.get('buttons'));
377377
this.axis_views.update(this.model.get('axes'));
@@ -393,7 +393,7 @@ export class ControllerView extends DOMWidgetView {
393393
.then((view: ControllerButtonView) => {
394394
// replace the dummy widget with the new one.
395395
const i = ArrayExt.firstIndexOf(this.button_box.widgets, dummy);
396-
this.button_box.insertWidget(i, view.lmWidget);
396+
this.button_box.insertWidget(i, view.luminoWidget);
397397
dummy.dispose();
398398
return view;
399399
})
@@ -410,7 +410,7 @@ export class ControllerView extends DOMWidgetView {
410410
.then((view: ControllerAxisView) => {
411411
// replace the dummy widget with the new one.
412412
const i = ArrayExt.firstIndexOf(this.axis_box.widgets, dummy);
413-
this.axis_box.insertWidget(i, view.lmWidget);
413+
this.axis_box.insertWidget(i, view.luminoWidget);
414414
dummy.dispose();
415415
return view;
416416
})
@@ -430,5 +430,5 @@ export class ControllerView extends DOMWidgetView {
430430
button_box: Panel;
431431
model: ControllerModel;
432432
pWidget: JupyterLuminoPanelWidget;
433-
lmWidget: JupyterLuminoPanelWidget;
433+
luminoWidget: JupyterLuminoPanelWidget;
434434
}

‎packages/controls/src/widget_image.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export class ImageView extends DOMWidgetView {
3434
* Called when view is rendered.
3535
*/
3636
super.render();
37-
this.lmWidget.addClass('jupyter-widgets');
38-
this.lmWidget.addClass('widget-image');
37+
this.luminoWidget.addClass('jupyter-widgets');
38+
this.luminoWidget.addClass('widget-image');
3939
this.update(); // Set defaults.
4040
}
4141

‎packages/controls/src/widget_int.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ export class ProgressView extends DescriptionView {
716716
initialize(parameters: WidgetView.IInitializeParameters): void {
717717
super.initialize(parameters);
718718
this.listenTo(this.model, 'change:bar_style', this.update_bar_style);
719-
this.lmWidget.addClass('jupyter-widgets');
719+
this.luminoWidget.addClass('jupyter-widgets');
720720
}
721721

722722
render(): void {

0 commit comments

Comments
 (0)