Project: dojo

Revision: 15173

Author: doughays

Date: 08 Sep 2008 10:08:51

Diff at Trac: http://trac.dojotoolkit.org/changeset/15173

• /dijit/trunk/_editor/RichText.js

  ......	@@ -547,21 +547,10 @@
  547	547
  548	548	var _iframeInitialized = false;
  549	549	// console.debug(this.iframe);
  550		// var contentDoc = this.iframe.contentWindow.document;
  551
  552	550
  553	551	// note that on Safari lower than 420+, we have to get the iframe
  554	552	// by ID in order to get something w/ a contentDocument property
  555	553
  556		var contentDoc = this.iframe.contentDocument;
  557		contentDoc.open();
  558		if(dojo.isAIR){
  559		contentDoc.body.innerHTML = html;
  560		}else{
  561		contentDoc.write(this._getIframeDocTxt(html));
  562		}
  563		contentDoc.close();
  564
  565	554	// now we wait for onload. Janky hack!
  566	555	var ifrFunc = dojo.hitch(this, function(){
  567	556	if(!_iframeInitialized){
  ......	@@ -586,6 +575,15 @@
  586	575	return;
  587	576	}
  588	577
  	578	var contentDoc = this.document;
  	579	contentDoc.open();
  	580	if(dojo.isAIR){
  	581	contentDoc.body.innerHTML = html;
  	582	}else{
  	583	contentDoc.write(this._getIframeDocTxt(html));
  	584	}
  	585	contentDoc.close();
  	586
  589	587	dojo._destroyElement(tmpContent);
  590	588	this.onLoad();
  591	589	}else{