Changeset 13382

Timestamp:

04/22/08 08:28:57 (7 months ago)

Author:

liucougar

Message:

refs #6582: detect useIframe correctly when styleSheets or useIframe is explicitly specified
refs #6584: fix broken auto-expand when iframe is used
refs #6583: enable alwaysshowtoolbar plugin for editor when iframe is used (which is needed to support auto-expand)

Location:

dijit/trunk/_editor

Files:

• plugins/AlwaysShowToolbar.js (modified) (2 diffs)
• RichText.js (modified) (10 diffs)

dijit/trunk/_editor/plugins/AlwaysShowToolbar.js

@@ -5 +5 @@
         _handleScroll: true,
         setEditor: function(e){
-                console.log('Port AlwaysShowToolbar plugin to work with Editor without iframe');
-                return;
+                if(!e.iframe){
+                        console.log('Port AlwaysShowToolbar plugin to work with Editor without iframe');
+                        return;
+                }
+
                 this.editor = e;
-//              setTimeout(dojo.hitch(this,this.enable), 10000);
+
                 e.onLoadDeferred.addCallback(dojo.hitch(this, this.enable));
-//              this.scrollInterval = setInterval(dojo.hitch(this, "globalOnScrollHandler"), 100);
         },
         enable: function(d){
@@ -46 +48 @@
                         // this.editorObject.style.height = this._lastHeight + "px";
                         dojo.marginBox(e.iframe, { h: this._lastHeight });
-//                      this.iframe.height=this._lastHeight+10+'px';
-//                      this.iframe.style.height=this._lastHeight+'px';
                 }
         },

dijit/trunk/_editor/RichText.js

@@ -151 +151 @@
                 if(!this.iframe){
                         var ifr = this.iframe = dojo.doc.createElement("iframe");
-                        ifr.id=this.id;
+                        ifr.id=this.id+'_iframe';
                         // this.iframe.src = "about:blank";
                         // document.body.appendChild(this.iframe);
@@ -332 +332 @@
 
         setDisabled: function(/*Boolean*/ disabled){
-                if(disabled){
-                        //AP:
-                        //              why isn't this set in the constructor, or put in
-                        //              mozSettingProps as a hash?
-                        this._mozSettings = [ false, this.blockNodeForEnter==='BR' ];
+                if(!dojo.isMoz){
+                        dijit._editor.RichText.prototype.setDisabled.call(this, disabled);
+                        return;
                 }
                 this.document.designMode = disabled ? 'off' : 'on';
-                if(!disabled && this._mozSettings){
-                        dojo.forEach(this._mozSettingProps, function(s,i){
-                                this.document.execCommand(s,false,this._mozSettings[i]);
-                        },this);
+                if(!disabled && this._mozSettingProps){
+                        var ps=this._mozSettingProps;
+                        for(var n in ps){
+                                if(ps.hasOwnProperty(n)){
+                                        try{
+                                                this.document.execCommand(n,false,ps[n]);
+                                        }catch(e){}
+                                }
+                        }
                 }
                 this.disabled = disabled;
@@ -355 +358 @@
 
 dojo.declare("dijit._editor.RichText", dijit._Widget, {
-        constructor: function(){
+        constructor: function(paras){
                 // summary:
                 //              dijit._editor.RichText is the core of the WYSIWYG editor in dojo, which
@@ -403 +406 @@
                 this.onLoadDeferred = new dojo.Deferred();
 
-                this.useIframe = (dojo.isFF && (dojo.isFF < 3)) || this.useIframe || this.styleSheets.length;
+                //in this constructor, mixin properties are not yet merged, so we have to check for paras here
+                this.useIframe = (dojo.isFF && (dojo.isFF < 3)) || paras['useIframe'] || paras['styleSheets'];
 
                 if(this.useIframe){
@@ -713 +717 @@
 
         disabled: true,
-        _mozSettingProps: ['styleWithCSS','insertBrOnReturn'],
+        _mozSettingProps: {'styleWithCSS':false},
 
         setDisabled: function(/*Boolean*/ disabled){
@@ -750 +754 @@
 
                 var events = this.events.concat(this.captureEvents);
-                var ap = (this.iframe) ? this.window : this.editNode;
+                var ap = (this.iframe) ? this.document : this.editNode;
                 dojo.forEach(events, function(item){
                         // dojo.connect(ap, item.toLowerCase(), console, "debug");
                         this.connect(ap, item.toLowerCase(), item);
                 }, this);
-                if(!dojo.isIE){
-                        try{ // sanity check for Mozilla
-                                // this.document.execCommand("useCSS", false, true); // old moz call
-                                this.document.execCommand("styleWithCSS", false, false); // new moz call
-                                //this.document.execCommand("insertBrOnReturn", false, false); // new moz call
-                        }catch(e2){ }
-                        // FIXME: when scrollbars appear/disappear this needs to be fired
-                }else{ // IE contentEditable
+                if(dojo.isIE){ // IE contentEditable
                         // give the node Layout on IE
                         this.editNode.style.zoom = 1.0;
@@ -832 +829 @@
 
                 // function call after the character has been inserted
-                setTimeout(dojo.hitch(this, "onKeyPressed", e), 1);
+                if(!this._onKeyHitch){
+                        this._onKeyHitch=dojo.hitch(this, "onKeyPressed");
+                }
+                setTimeout(this._onKeyHitch, 1);
                 return true;
         },
@@ -848 +848 @@
         },
 
-        onKeyPressed: function(/*Event*/e){
-                return;
+        onKeyPressed: function(){
                 this.onDisplayChanged(/*e*/); // can't pass in e
         },
@@ -928 +927 @@
                         clearTimeout(this._updateTimer);
                 }
-                this._updateTimer = setTimeout( // really? we hitch every time?
-                        dojo.hitch(this,"onNormalizedDisplayChanged"), 
-                        this.updateInterval
-                );
+                if(!this._updateHandler){
+                        this._updateHandler = dojo.hitch(this,"onNormalizedDisplayChanged");
+                }
+                this._updateTimer = setTimeout(this._updateHandler, this.updateInterval);
         },
         onNormalizedDisplayChanged: function(){
@@ -939 +938 @@
                 //              If something needs to happen immidiately after a
                 //              user change, please use onDisplayChanged instead
-                this._updateTimer = null;
+                delete this._updateTimer;
         },
         onChange: function(newContent){