Ticket #4421: dojo.editor.patch

dijit/_editor/RichText.js

@@ -239 +239 @@
                         // new editing harness node.
                         this.textarea = this.domNode;
                         this.name=this.textarea.name;
-                        var html = this._preFilterContent(this.textarea.value);
+      // in Safari, formatting information gets lost if we use textarea.value
+      // in Firefox otoh, textarea.innerHTML results in escaped html-tags.
+                        if(dojo.isSafari) {
+        var html = this._preFilterContent(this.textarea.innerHTML);
+      } else {
+        var html = this._preFilterContent(this.textarea.value);
+      }
                         this.domNode = dojo.doc.createElement("div");
                         this.domNode.setAttribute('widgetId',this.id);
                         this.textarea.removeAttribute('widgetId');
@@ -1161 +1167 @@
                         //area, the <a> tag will be around all the content
                         //so for now, use setValue for IE too
                         this.setValue(html);
-                }
+                } else { 
+      // is there any particular reason why there is no catch-all? In Safari 2.0.4
+      // none of the above are executed...
+      this.setValue(html);
+    }
         },
 
         _preFilterContent: function(/*String*/html){

dijit/form/Button.js

@@ -30 +30 @@
 
         type: "button",
         baseClass: "dijitButton",
-        templateString:"<div class=\"dijit dijitLeft dijitInline dijitButton\" baseClass=\"${baseClass}\"\n\tdojoAttachEvent=\"onclick:_onButtonClick,onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouse\"\n\t><div class='dijitRight'\n\t><button class=\"dijitStretch dijitButtonNode dijitButtonContents\" dojoAttachPoint=\"focusNode,titleNode\"\n\t\ttabIndex=\"${tabIndex}\" type=\"${type}\" id=\"${id}\" name=\"${name}\" waiRole=\"button\" waiState=\"labelledby-${id}_label\"\n\t\t><div class=\"dijitInline ${iconClass}\"></div\n\t\t><span class=\"dijitButtonText\" id=\"${id}_label\" dojoAttachPoint=\"containerNode\">${label}</span\n\t></button\n></div></div>\n",
+        templateString:"<div class=\"dijit dijitLeft dijitInline dijitButton\" baseClass=\"${baseClass}\"\n\tdojoAttachEvent=\"onclick:_onButtonClick,onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouseDown\"\n\t><div class='dijitRight'\n\t><button class=\"dijitStretch dijitButtonNode dijitButtonContents\" dojoAttachPoint=\"focusNode,titleNode\"\n\t\ttabIndex=\"${tabIndex}\" type=\"${type}\" id=\"${id}\" name=\"${name}\" waiRole=\"button\" waiState=\"labelledby-${id}_label\"\n\t\t><div class=\"dijitInline ${iconClass}\"></div\n\t\t><span class=\"dijitButtonText\" id=\"${id}_label\" dojoAttachPoint=\"containerNode\">${label}</span\n\t></button\n></div></div>\n",
 
         // TODO: set button's title to this.containerNode.innerText
 
+  // in Safari we need to prevent losing focus if we want to work with selections
+  _onMouseDown: function(/*Event*/ e){
+    if(dojo.isSafari){ dojo.stopEvent(e); }
+    this._onMouse(e);
+  },
+
         _onButtonClick: function(/*Event*/ e){
                 // summary: callback when the user mouse clicks the button portion
                 dojo.stopEvent(e);
@@ -47 +53 @@
                 if (this.showLabel == false){
                         var labelText = "";
                         this.label = this.containerNode.innerHTML;
-                        labelText = dojo.trim(this.containerNode.innerText || this.containerNode.textContent);
+                        // Safari 2.0.4: empty Strings in this.containerNode.innerText are treated
+                        //                                                       as false-values. this.containerNode.textContent otoh is 
+                        //                                                       undefined. Use explicit typecast(?) to String to ensure 
+                        //                                                       this call to dojo.trim doesn't kill our button. 
+                        labelText = dojo.trim(this.containerNode.innerText || this.containerNode.textContent || '');
                         // set title attrib on iconNode
                         this.titleNode.title=labelText;
                         dojo.addClass(this.containerNode,"dijitDisplayNone");
@@ -234 +244 @@
 dojo.declare("dijit.form.ComboButton", dijit.form.DropDownButton, {
         // summary
         //              left side is normal button, right side displays menu
-        templateString:"<table class='dijit dijitReset dijitInline dijitLeft dijitComboButton'  baseClass='dijitComboButton'\n\tid=\"${id}\" name=\"${name}\" cellspacing='0' cellpadding='0'\n\tdojoAttachEvent=\"onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouse\">\n\t<tr>\n\t\t<td\tclass=\"dijitStretch dijitButtonContents dijitButtonNode\"\n\t\t\ttabIndex=\"${tabIndex}\"\n\t\t\tdojoAttachEvent=\"ondijitclick:_onButtonClick\"  dojoAttachPoint=\"titleNode\"\n\t\t\twaiRole=\"button\" waiState=\"labelledby-${id}_label\">\n\t\t\t<div class=\"dijitInline ${iconClass}\"></div>\n\t\t\t<span class=\"dijitButtonText\" id=\"${id}_label\" dojoAttachPoint=\"containerNode\">${label}</span>\n\t\t</td>\n\t\t<td class='dijitReset dijitRight dijitButtonNode dijitDownArrowButton'\n\t\t\tdojoAttachPoint=\"popupStateNode,focusNode\"\n\t\t\tdojoAttachEvent=\"onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouse,ondijitclick:_onArrowClick, onkeypress:_onKey\"\n\t\t\tbaseClass=\"dijitComboButtonDownArrow\"\n\t\t\ttitle=\"${optionsTitle}\"\n\t\t\ttabIndex=\"${tabIndex}\"\n\t\t\twaiRole=\"button\" waiState=\"haspopup-true\"\n\t\t><div waiRole=\"presentation\">&#9660;</div>\n\t</td></tr>\n</table>\n",
+        templateString:"<table class='dijit dijitReset dijitInline dijitLeft dijitComboButton'  baseClass='dijitComboButton'\n\tid=\"${id}\" name=\"${name}\" cellspacing='0' cellpadding='0'\n\tdojoAttachEvent=\"onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouseDown\">\n\t<tr>\n\t\t<td\tclass=\"dijitStretch dijitButtonContents dijitButtonNode\"\n\t\t\ttabIndex=\"${tabIndex}\"\n\t\t\tdojoAttachEvent=\"ondijitclick:_onButtonClick\"  dojoAttachPoint=\"titleNode\"\n\t\t\twaiRole=\"button\" waiState=\"labelledby-${id}_label\">\n\t\t\t<div class=\"dijitInline ${iconClass}\"></div>\n\t\t\t<span class=\"dijitButtonText\" id=\"${id}_label\" dojoAttachPoint=\"containerNode\">${label}</span>\n\t\t</td>\n\t\t<td class='dijitReset dijitRight dijitButtonNode dijitDownArrowButton'\n\t\t\tdojoAttachPoint=\"popupStateNode,focusNode\"\n\t\t\tdojoAttachEvent=\"onmouseover:_onMouse,onmouseout:_onMouse,onmousedown:_onMouse,ondijitclick:_onArrowClick, onkeypress:_onKey\"\n\t\t\tbaseClass=\"dijitComboButtonDownArrow\"\n\t\t\ttitle=\"${optionsTitle}\"\n\t\t\ttabIndex=\"${tabIndex}\"\n\t\t\twaiRole=\"button\" waiState=\"haspopup-true\"\n\t\t><div waiRole=\"presentation\">&#9660;</div>\n\t</td></tr>\n</table>\n",
 
         // optionsTitle: String
         //  text that describes the options menu (accessibility)