Merge "Simplified iframe initialization"

This commit is contained in:
jenkins-bot 2013-04-18 22:41:40 +00:00 committed by Gerrit Code Review
commit bed8e8a17a

View file

@ -68,25 +68,30 @@ ve.inheritClass( ve.ui.Frame, ve.EventEmitter );
* @emits initialize
*/
ve.ui.Frame.prototype.onLoad = function () {
var win = this.$.prop( 'contentWindow' ),
var interval, rules,
win = this.$.prop( 'contentWindow' ),
doc = win.document,
stylesheets = this.config.stylesheets,
style = doc.createElement( 'style' ),
initialize = ve.bind( function () {
this.initialized = true;
this.emit( 'initialize' );
}, this );
// Initialize contents
win.setup = function () {
var interval, rules,
style = doc.createElement( 'style' );
doc.open();
doc.write(
'<body style="padding:0;margin:0;">' +
'<div class="ve-ui-frame-content"></div>' +
'</body>'
);
doc.close();
// Import all stylesheets
style.textContent = '@import "' + stylesheets.join( '";\n@import "' ) + '";';
style.textContent = '@import "' + this.config.stylesheets.join( '";\n@import "' ) + '";';
doc.body.appendChild( style );
// Poll for access to stylesheet content
interval = setInterval( function () {
interval = setInterval( ve.bind( function () {
try {
// MAGIC: only accessible when the stylesheet is loaded
rules = style.sheet.cssRules;
@ -97,15 +102,7 @@ ve.ui.Frame.prototype.onLoad = function () {
initialize();
}
} catch ( e ) { }
} );
};
doc.open();
doc.write(
'<body style="padding:0;margin:0;">' +
'<div class="ve-ui-frame-content"></div><script>setup();</script>' +
'</body>'
);
doc.close();
}, this ), 10 );
// Properties
this.$$ = ve.ui.get$$( doc, this );