@@ -170,10 +170,10 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
170
170
* A message handler invoked on a `'before-attach'` message.
171
171
*/
172
172
protected onBeforeAttach ( msg : Message ) : void {
173
- this . node . addEventListener ( 'p -dragenter' , this ) ;
174
- this . node . addEventListener ( 'p -dragleave' , this ) ;
175
- this . node . addEventListener ( 'p -dragover' , this ) ;
176
- this . node . addEventListener ( 'p -drop' , this ) ;
173
+ this . node . addEventListener ( 'lm -dragenter' , this ) ;
174
+ this . node . addEventListener ( 'lm -dragleave' , this ) ;
175
+ this . node . addEventListener ( 'lm -dragover' , this ) ;
176
+ this . node . addEventListener ( 'lm -drop' , this ) ;
177
177
this . node . addEventListener ( 'mousedown' , this ) ;
178
178
179
179
crdebug ( "Ribbon onBeforeAttach will run autoAdjustRibbonTailLength" ) ;
@@ -183,34 +183,34 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
183
183
* A message handler invoked on an `'after-detach'` message.
184
184
*/
185
185
protected onAfterDetach ( msg : Message ) : void {
186
- this . node . removeEventListener ( 'p -dragenter' , this ) ;
187
- this . node . removeEventListener ( 'p -dragleave' , this ) ;
188
- this . node . removeEventListener ( 'p -dragover' , this ) ;
189
- this . node . removeEventListener ( 'p -drop' , this ) ;
186
+ this . node . removeEventListener ( 'lm -dragenter' , this ) ;
187
+ this . node . removeEventListener ( 'lm -dragleave' , this ) ;
188
+ this . node . removeEventListener ( 'lm -dragover' , this ) ;
189
+ this . node . removeEventListener ( 'lm -drop' , this ) ;
190
190
this . node . removeEventListener ( 'mousedown' , this ) ;
191
191
this . _releaseMouse ( ) ;
192
192
}
193
193
194
194
/**
195
- * handling DOM & phosphor events
195
+ * handling DOM & phosphor(lumino) events
196
196
* @param event DOM event
197
197
*
198
- * the p -* are the ones used to move patches around, they are from
199
- * phosphorjs and have the different type and more data
198
+ * the lm -* are the ones used to move patches around, they are from
199
+ * phosphorjs(now lumino) and have the different type and more data
200
200
*/
201
201
handleEvent ( event : Event ) : void {
202
202
// crdebug("patch handlin event:", event);
203
203
switch ( event . type ) {
204
- case 'p -dragenter' :
204
+ case 'lm -dragenter' :
205
205
this . _evtDragEnter ( event as IDragEvent ) ;
206
206
break ;
207
- case 'p -dragleave' :
207
+ case 'lm -dragleave' :
208
208
this . _evtDragLeave ( event as IDragEvent ) ;
209
209
break ;
210
- case 'p -dragover' :
210
+ case 'lm -dragover' :
211
211
this . _evtDragOver ( event as IDragEvent ) ;
212
212
break ;
213
- case 'p -drop' :
213
+ case 'lm -drop' :
214
214
this . _evtDrop ( event as IDragEvent ) ;
215
215
break ;
216
216
case 'dragenter' :
@@ -231,6 +231,9 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
231
231
// If the factory mime type is present, mark the event as
232
232
// handled in order to get the rest of the drag events.
233
233
if ( event . mimeData . hasData ( 'application/vnd.phosphor.widget-factory' ) ) {
234
+ console . error ( "CR: received a phosphor (NOT lumino) factory in event data!" , event ) ;
235
+ }
236
+ if ( event . mimeData . hasData ( 'application/vnd.lumino.widget-factory' ) ) {
234
237
event . preventDefault ( ) ;
235
238
event . stopPropagation ( ) ;
236
239
}
@@ -242,8 +245,8 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
242
245
event . stopPropagation ( ) ;
243
246
244
247
// The new target might be a descendant, so we might still handle the drop.
245
- // Hide asynchronously so that if a p -dragover event bubbles up to us, the
246
- // hide is cancelled by the p -dragover handler's show overlay logic.
248
+ // Hide asynchronously so that if a lm -dragover event bubbles up to us, the
249
+ // hide is cancelled by the lm -dragover handler's show overlay logic.
247
250
this . overlay . hide ( 1 ) ;
248
251
}
249
252
@@ -292,7 +295,7 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
292
295
293
296
// Bail if the factory mime type has invalid data.
294
297
let mimeData = event . mimeData ;
295
- let factory = mimeData . getData ( 'application/vnd.phosphor .widget-factory' ) ;
298
+ let factory = mimeData . getData ( 'application/vnd.lumino .widget-factory' ) ;
296
299
if ( typeof factory !== 'function' ) {
297
300
event . dropAction = 'none' ;
298
301
return ;
@@ -452,7 +455,7 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
452
455
// Setup the mime data for the drag operation.
453
456
let mimeData = new MimeData ( ) ;
454
457
let factory = ( ) => title . owner ;
455
- mimeData . setData ( 'application/vnd.phosphor .widget-factory' , factory ) ;
458
+ mimeData . setData ( 'application/vnd.lumino .widget-factory' , factory ) ;
456
459
457
460
// Create the drag image for the drag operation.
458
461
let dragImage = tab . cloneNode ( true ) as HTMLElement ;
@@ -470,7 +473,7 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
470
473
// Create the cleanup callback.
471
474
let cleanup = ( ( ) => {
472
475
this . _drag = null ;
473
- tab . classList . remove ( 'p -mod-hidden' ) ;
476
+ tab . classList . remove ( 'lm -mod-hidden' ) ;
474
477
} ) ;
475
478
476
479
// Start the drag operation and cleanup when done.
@@ -1008,7 +1011,7 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
1008
1011
return this . tracker . currentWidget ;
1009
1012
}
1010
1013
1011
- // NOTE === phosphor DockPanel API compatility section === NOTE //
1014
+ // NOTE === phosphor(now lumino) DockPanel API compatility section === NOTE //
1012
1015
// we might want to split this into a `ImprovedBoxPanel` class instead?
1013
1016
// this section is because phosphor's BoxPanel has only a tiny fraction of the
1014
1017
// features that DockPanel has, and they're expected by Theia
@@ -1139,7 +1142,7 @@ export class CodeRibbonTheiaRibbonPanel extends BoxPanel implements EventListene
1139
1142
return this . _layoutModified ;
1140
1143
}
1141
1144
1142
- // overriding BoxPanel's p -BoxPanel-child
1145
+ // overriding BoxPanel's lm -BoxPanel-child
1143
1146
override onChildAdded ( msg : Widget . ChildMessage ) {
1144
1147
msg . child . addClass ( "cr-RibbonPanel-child" ) ;
1145
1148
0 commit comments