Ticket #4070: RichEditBC.patch

Editor.js

@@ -56 +56 @@
 
                         if(!this.toolbar){
                                 // if we haven't been assigned a toolbar, create one
-                                this.toolbar = new dijit.Toolbar({});
+                                this.toolbar = new dijit.Toolbar({region:'top'}); // LALEE Added 'region:top' for BorderLayout 
                                 dojo.place(this.toolbar.domNode, this.editingArea, "before");
                         }
 
                         dojo.forEach(this.plugins, this.addPlugin, this);
                         this.onNormalizedDisplayChanged(); //update toolbar button status
+
+//LALEE:  ADD THE TOOLBAR TO OUR BORDERLAYOUT OBJECT
+                        if (this.borderContainer) {
+                                this.borderContainer.addChild(this.toolbar, 0);
+                                this.borderContainer.resize(); //  = new dijit.layout.BorderContainer({}, this.domNode);
+                        } else {
+                                console.debug('RichEdit Control has no usable borderContainer at this time.');
+                        }               
+                        
 //                      }catch(e){ console.debug(e); }
 
                         this.toolbar.startup();

_editor/RichText.js

@@ -6 +6 @@
 dojo.require("dojo.i18n");
 dojo.requireLocalization("dijit.form", "Textarea");
 
+dojo.require("dijit.layout.BorderContainer"); //LALEE:  Need BorderContainer for enhanced RichEditor
+
 // used to restore content when user leaves this page then comes back
 // but do not try doing dojo.doc.write if we are using xd loading.
 // dojo.doc.write will only work if RichText.js is included in the dojo.js
@@ -442 +444 @@
         //              By default, this is 300px. If you want to have the editor always
         //              resizes to accommodate the content, use AlwaysShowToolbar plugin
         //              and set height=""
-        height: "300px",
+        height: "100%", //LALEE:  Make our BorderContainer Stretch to fit the Container by default; Override if necessary.
 
         // minHeight: String
         //              The minimum height that the editor should have
@@ -599 +601 @@
                         this.name=this.textarea.name;
                         html = this._preFilterContent(this.textarea.value);
                         this.domNode = dojo.doc.createElement("div");
+
+//LALEE:  Make a BorderContainer out of a NEW DIV (assigned to this.domNode) if we're starting out from a TEXTAREA . . .
+                        // this.domNode.setAttribute('lalee', 'div_to_wrap_all_from_textarea');
+                        this.borderContainer = new dijit.layout.BorderContainer({region:this.textarea.getAttribute('region')}, this.domNode);
+                        this.domNode.style.height = this.textarea.style.height; //  || this.height;
+                        
                         this.domNode.setAttribute('widgetId',this.id);
                         this.textarea.removeAttribute('widgetId');
                         this.domNode.cssText = this.textarea.cssText;
@@ -626 +634 @@
 
                         // this.domNode.innerHTML = html;
 
-                        if(this.textarea.form){
-                                dojo.connect(this.textarea.form, "onsubmit", this, function(){
+//LALEE:  For some reason, this "out-of-box" code won't FORM-POST . . .
+//                      if(this.textarea.form){
+//                              dojo.connect(this.textarea.form, "onsubmit", this, function(){
+//                                      // FIXME: should we be calling close() here instead?
+//                                      this.textarea.value = this.getValue();
+//                              });
+//                      }
+ 
+                        // ------------------------------------------------------------
+                        //LALEE:  I need this patch in order to get dijit.Editor to work for Form Submits!! 
+                        // (From http://dojotoolkit.org/forum/support/dijit/dijit-editor-linked-textarea-submit-failes-textarea-content#comment-6023 )
+                        // ------------------------------------------------------------
+                        //this.domNode.innerHTML = html;
+                        if (this.textarea.form) {
+                                // FIXME: port: this used to be before advice!!!
+                                dojo.connect(this.textarea.form, "onsubmit", this, function(e){
                                         // FIXME: should we be calling close() here instead?
                                         this.textarea.value = this.getValue();
-                                });
+                                        if (this.textarea.form == null) {
+                                                this.textarea_form.appendChild(this.textarea);
+                                        }
+                                }, this);
+                                this.textarea_form = this.textarea.form;
                         }
+
                 }else{
+//LALEE:  Make a BorderContainer out of the EXISTING DIV (already assigned to this.domNode) 
+//      since we're starting out from a NON-TEXTAREA (i.e. we're starting from a DIV)
+                        // this.domNode.setAttribute('lalee', 'div_to_wrap_all_from_div');
+                        this.domNode.id += "_bc"; // LALEE:  Euwww DAMN!!  But I can't figure out any other way to get this "working" at the moment.  :-(
+                        this.borderContainer = new dijit.layout.BorderContainer({region:this.region}, this.domNode);
+                        // this.borderContainer.domNode.style.height = this.borderContainer.domNode.style.height || this.height;
+                        
                         html = this._preFilterContent(dijit._editor.getChildrenHtml(this.domNode));
                         this.domNode.innerHTML = '';
                 }
@@ -652 +686 @@
                         this.domNode.innerHTML = " <br>";
                 }
 
-                this.editingArea = this.domNode; // dojo.doc.createElement("div");
-                // this.domNode.appendChild(this.editingArea);
+                this.editingArea = dojo.doc.createElement("div"); // this.domNode;
+
+//LALEE:  If we did our BorderContainer correctly, we can now Convert this.editingArea into a ContentPane
+//      and then add it to our wrapping BorderContainer
+                if (this.borderContainer) {
+                        var editContentPane = new dijit.layout.ContentPane({region:'center'}, this.editingArea);
+                        this.borderContainer.addChild(editContentPane);
+                }
 
                 if(this.name != "" && (!dojo.config["useXDomain"] || dojo.config["allowXdRichTextSave"])){
                         var saveTextarea = dojo.byId(dijit._scopeName + "._editor.RichText.savedContent");