Ticket #16695: 16695.2.diff

wp-includes/js/quicktags.dev.js

@@ -4 +4 @@
 
 var edButtons = new Array(), edLinks = new Array(), edOpenTags = new Array(), now = new Date(), datetime;
 
+// cross browser dom ready
+(function(func,w) {
+        if (typeof jQuery != 'undefined') {
+                jQuery(func);
+        } else {
+                if ( w.addEventListener )
+                        w.addEventListener('load', func, false);
+                else if ( w.attachEvent )
+                        w.attachEvent( 'onload', func );
+        }
+})(edToolbar,window);
+
 function edButton(id, display, tagStart, tagEnd, access, open) {
         this.id = id;                           // used to name the toolbar button
         this.display = display;         // label on button
@@ -154 +166 @@
 
 function edShowButton(button, i) {
         if (button.id == 'ed_img') {
-                document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertImage(edCanvas);" value="' + button.display + '" />');
+                return '<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertImage(edCanvas);" value="' + button.display + '" />';
         }
         else if (button.id == 'ed_link') {
-                document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertLink(edCanvas, ' + i + ');" value="' + button.display + '" />');
+                return '<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertLink(edCanvas, ' + i + ');" value="' + button.display + '" />';
         }
         else {
-                document.write('<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertTag(edCanvas, ' + i + ');" value="' + button.display + '"  />');
+                return '<input type="button" id="' + button.id + '" accesskey="' + button.access + '" class="ed_button" onclick="edInsertTag(edCanvas, ' + i + ');" value="' + button.display + '"  />';
         }
 }
 
@@ -170 +182 @@
                 tempStr += '<option value="' + i + '">' + edLinks[i].display + '</option>';
         }
         tempStr += '</select>';
-        document.write(tempStr);
+        return tempStr;
 }
 
 function edAddTag(button) {
@@ -253 +265 @@
 }
 
 function edToolbar() {
-        document.write('<div id="ed_toolbar">');
+        var tb = document.getElementById('ed_toolbar'), html = '';
+
         for (var i = 0; i < edButtons.length; i++) {
-                edShowButton(edButtons[i], i);
+                html += edShowButton(edButtons[i], i);
         }
-        document.write('<input type="button" id="ed_spell" class="ed_button" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />');
-        document.write('<input type="button" id="ed_close" class="ed_button" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />');
-//      edShowLinks(); // disabled by default
-        document.write('</div>');
+        
+        html += '<input type="button" id="ed_spell" class="ed_button" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />';
+        html += '<input type="button" id="ed_close" class="ed_button" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />';
+
+        // html += edShowLinks(); // disabled by default
+        tb.innerHTML = html;
 }
 
 // insertion code

wp-includes/general-template.php

@@ -1827 +1827 @@
 ?>
         <div id="quicktags"><?php
         wp_print_scripts( 'quicktags' ); ?>
-        <script type="text/javascript">edToolbar()</script>
+        <div id="ed_toolbar">
         </div>
+        </div>
 
 <?php
         $the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea rows='$rows'$class cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");