mirror of
https://git.proxmox.com/git/proxmox-widget-toolkit
synced 2025-08-08 20:04:30 +00:00
update IFrame class to ExtJS 7.0 implantation
To get rid of some outdated event handlers like `beforeunload` which Chromium based browsers are deprecating this year [0]. For those wondering about why we do not use ExtJS implementation directly here it might be worth adding that the `Ext.ux` name space is build to a separate file that has a (minified!) size of almost 160 KiB, and we only use a handful of those, so copying is a lot cheaper. [0]: https://developer.chrome.com/docs/web-platform/deprecating-unload Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
da210b58a7
commit
4a5dd69899
@ -756,6 +756,11 @@ Ext.onReady(function() {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// add allowfullscreen to render template to allow the noVNC/xterm.js embedded UIs to go fullscreen
|
||||||
|
//
|
||||||
|
// The rest is the same as in the separate ux package (extjs/build/packages/ux/classic/ux-debug.js),
|
||||||
|
// which we do not load as it's rather big and most of the widgets there are not useful for our UIs
|
||||||
Ext.define('Ext.ux.IFrame', {
|
Ext.define('Ext.ux.IFrame', {
|
||||||
extend: 'Ext.Component',
|
extend: 'Ext.Component',
|
||||||
|
|
||||||
@ -766,8 +771,10 @@ Ext.define('Ext.ux.IFrame', {
|
|||||||
src: 'about:blank',
|
src: 'about:blank',
|
||||||
|
|
||||||
renderTpl: [
|
renderTpl: [
|
||||||
|
// eslint-disable-next-line max-len
|
||||||
'<iframe src="{src}" id="{id}-iframeEl" data-ref="iframeEl" name="{frameName}" width="100%" height="100%" frameborder="0" allowfullscreen="true"></iframe>',
|
'<iframe src="{src}" id="{id}-iframeEl" data-ref="iframeEl" name="{frameName}" width="100%" height="100%" frameborder="0" allowfullscreen="true"></iframe>',
|
||||||
],
|
],
|
||||||
|
|
||||||
childEls: ['iframeEl'],
|
childEls: ['iframeEl'],
|
||||||
|
|
||||||
initComponent: function() {
|
initComponent: function() {
|
||||||
@ -778,6 +785,7 @@ Ext.define('Ext.ux.IFrame', {
|
|||||||
|
|
||||||
initEvents: function() {
|
initEvents: function() {
|
||||||
let me = this;
|
let me = this;
|
||||||
|
|
||||||
me.callParent();
|
me.callParent();
|
||||||
me.iframeEl.on('load', me.onLoad, me);
|
me.iframeEl.on('load', me.onLoad, me);
|
||||||
},
|
},
|
||||||
@ -791,6 +799,7 @@ Ext.define('Ext.ux.IFrame', {
|
|||||||
|
|
||||||
getBody: function() {
|
getBody: function() {
|
||||||
let doc = this.getDoc();
|
let doc = this.getDoc();
|
||||||
|
|
||||||
return doc.body || doc.documentElement;
|
return doc.body || doc.documentElement;
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -805,73 +814,22 @@ Ext.define('Ext.ux.IFrame', {
|
|||||||
getWin: function() {
|
getWin: function() {
|
||||||
let me = this,
|
let me = this,
|
||||||
name = me.frameName,
|
name = me.frameName,
|
||||||
win = Ext.isIE
|
win = Ext.isIE ? me.iframeEl.dom.contentWindow : window.frames[name];
|
||||||
? me.iframeEl.dom.contentWindow
|
|
||||||
: window.frames[name];
|
|
||||||
return win;
|
return win;
|
||||||
},
|
},
|
||||||
|
|
||||||
getFrame: function() {
|
getFrame: function() {
|
||||||
let me = this;
|
let me = this;
|
||||||
|
|
||||||
return me.iframeEl.dom;
|
return me.iframeEl.dom;
|
||||||
},
|
},
|
||||||
|
|
||||||
beforeDestroy: function() {
|
|
||||||
this.cleanupListeners(true);
|
|
||||||
this.callParent();
|
|
||||||
},
|
|
||||||
|
|
||||||
cleanupListeners: function(destroying) {
|
|
||||||
let doc, prop;
|
|
||||||
|
|
||||||
if (this.rendered) {
|
|
||||||
try {
|
|
||||||
doc = this.getDoc();
|
|
||||||
if (doc) {
|
|
||||||
Ext.get(doc).un(this._docListeners);
|
|
||||||
if (destroying && doc.hasOwnProperty) {
|
|
||||||
for (prop in doc) {
|
|
||||||
if (Object.prototype.hasOwnProperty.call(doc, prop)) {
|
|
||||||
delete doc[prop];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// do nothing
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
onLoad: function() {
|
onLoad: function() {
|
||||||
let me = this,
|
let me = this,
|
||||||
doc = me.getDoc(),
|
doc = me.getDoc();
|
||||||
fn = me.onRelayedEvent;
|
|
||||||
|
|
||||||
if (doc) {
|
if (doc) {
|
||||||
try {
|
|
||||||
// These events need to be relayed from the inner document (where they stop
|
|
||||||
// bubbling) up to the outer document. This has to be done at the DOM level so
|
|
||||||
// the event reaches listeners on elements like the document body. The effected
|
|
||||||
// mechanisms that depend on this bubbling behavior are listed to the right
|
|
||||||
// of the event.
|
|
||||||
Ext.get(doc).on(
|
|
||||||
me._docListeners = {
|
|
||||||
mousedown: fn, // menu dismisal (MenuManager) and Window onMouseDown (toFront)
|
|
||||||
mousemove: fn, // window resize drag detection
|
|
||||||
mouseup: fn, // window resize termination
|
|
||||||
click: fn, // not sure, but just to be safe
|
|
||||||
dblclick: fn, // not sure again
|
|
||||||
scope: me,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
} catch (e) {
|
|
||||||
// cannot do this xss
|
|
||||||
}
|
|
||||||
|
|
||||||
// We need to be sure we remove all our events from the iframe on unload or we're going to LEAK!
|
|
||||||
Ext.get(this.getWin()).on('beforeunload', me.cleanupListeners, me);
|
|
||||||
|
|
||||||
this.el.unmask();
|
this.el.unmask();
|
||||||
this.fireEvent('load', this);
|
this.fireEvent('load', this);
|
||||||
} else if (me.src) {
|
} else if (me.src) {
|
||||||
@ -880,29 +838,6 @@ Ext.define('Ext.ux.IFrame', {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
onRelayedEvent: function(event) {
|
|
||||||
// relay event from the iframe's document to the document that owns the iframe...
|
|
||||||
|
|
||||||
let iframeEl = this.iframeEl,
|
|
||||||
|
|
||||||
// Get the left-based iframe position
|
|
||||||
iframeXY = iframeEl.getTrueXY(),
|
|
||||||
originalEventXY = event.getXY(),
|
|
||||||
|
|
||||||
// Get the left-based XY position.
|
|
||||||
// This is because the consumer of the injected event will
|
|
||||||
// perform its own RTL normalization.
|
|
||||||
eventXY = event.getTrueXY();
|
|
||||||
|
|
||||||
// the event from the inner document has XY relative to that document's origin,
|
|
||||||
// so adjust it to use the origin of the iframe in the outer document:
|
|
||||||
event.xy = [iframeXY[0] + eventXY[0], iframeXY[1] + eventXY[1]];
|
|
||||||
|
|
||||||
event.injectEvent(iframeEl); // blame the iframe for the event...
|
|
||||||
|
|
||||||
event.xy = originalEventXY; // restore the original XY (just for safety)
|
|
||||||
},
|
|
||||||
|
|
||||||
load: function(src) {
|
load: function(src) {
|
||||||
let me = this,
|
let me = this,
|
||||||
text = me.loadMask,
|
text = me.loadMask,
|
||||||
|
Loading…
Reference in New Issue
Block a user