Changeset 3283

Timestamp:

12/09/05 19:24:14 (3 years ago)

Author:

ryan

Message:

MCE fix-em-ups from skeltoac. fixes #1962

Files:

• trunk/wp-admin/admin-functions.php (modified) (2 diffs)
• trunk/wp-admin/admin-header.php (modified) (4 diffs)
• trunk/wp-admin/edit-form-advanced.php (modified) (4 diffs)
• trunk/wp-admin/edit-form-comment.php (modified) (4 diffs)
• trunk/wp-admin/edit-page-form.php (modified) (3 diffs)
• trunk/wp-admin/inline-uploading.php (modified) (10 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (2 diffs)

trunk/wp-admin/admin-functions.php

@@ -1078 +1078 @@
-    // Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP
-    if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Safari'))
-: 
-   
+
+
-            <script src="../wp-includes/js/quicktags.js" type="text/javascript"></script>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1802 +1828 @@
-}
-
+function user_can_richedit() {
+    if ( 'true' != get_user_option('rich_editing') )
+        return false;
+
+    if ( preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) )
+        return false;
+
+    return true; // Best guess
+}
+
-?>

trunk/wp-admin/admin-header.php

@@ -80 +80 @@
-<script type="text/javascript" src="list-manipulation.js"></script>
-<?php if ( isset( $editing ) ) : ?>
-'true' == get_user_option('rich_editing'
+user_can_richedit(
-$mce_plugins = apply_filters('mce_plugins', array('wordpress', 'autosave', 'wphelp'));
-$mce_plugins = implode($mce_plugins, ',');
-$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'separator', 'bullist', 'numlist', 'outdent', 'indent', 'separator', 'justifyleft', 'justifycenter', 'justifyright' ,'separator', 'link', 'unlink', 'image', 'emotions', 'wordpress', 'separator', 'undo', 'redo', 'code', 'wphelp'));
-$mce_buttons = implode($mce_buttons, ',');
+$mce_buttons_2 = apply_filters('mce_buttons_2', array());
+$mce_buttons_2 = implode($mce_buttons_2, ',');
-?>
-<script language="javascript" type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?index=0&theme=advanced&plugins=<?php echo $mce_plugins; ?>"></script>
@@ -94 +96 @@
-    theme : "advanced",
-    theme_advanced_buttons1 : "<?php echo $mce_buttons; ?>",
-
+<?php echo $mce_buttons_2; ?>
-    theme_advanced_buttons3 : "",
-    theme_advanced_toolbar_location : "top",
@@ -111 +113 @@
-    remove_linebreaks : true,
-    save_callback : "wp_save_callback",
-
+
+
+
-    plugins : "<?php echo $mce_plugins; ?>"
-    <?php do_action('mce_options'); ?>
@@ -152 +156 @@
- 
-function newCatAddIn() {
+    if ( !document.getElementById('jaxcat') ) return false;
-    var ajaxcat = document.createElement('p');
-    ajaxcat.id = 'ajaxcat';

trunk/wp-admin/edit-form-advanced.php

@@ -7 +7 @@
-<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php endif; ?>
-
-<?php $richedit = ( 'true' != get_user_option('rich_editing') ) ? false : true; ?>
-
-<form name="post" action="post.php" method="post" id="post">
@@ -140 +138 @@
-</fieldset>
-
-$richedit
+user_can_richedit()
-<legend><?php _e('Post') ?></legend>
-
@@ -149 +147 @@
- }
-?>
-
-
-
-
-
-
+
+
+
+
+
-<script type="text/javascript">
-<!--
-edCanvas = document.getElementById('content');
-
-
-
-
-
+
-// This code is meant to allow tabbing from Title to Post (TinyMCE).
-if ( tinyMCE.isMSIE )
@@ -194 +187 @@
-            }
-        }
-
+
-//-->
-</script>
-<?php endif; ?>
-
-<?php echo $form_pingback ?>

trunk/wp-admin/edit-form-comment.php

@@ -5 +5 @@
-$form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment->comment_ID . "' />\n<input type='hidden' name='comment_post_ID' value='".$comment->comment_post_ID;
-?>
-<?php $richedit = ( 'true' != get_user_option('rich_editing') ) ? false : true; ?>
-
-<form name="post" action="post.php" method="post" id="post">
@@ -33 +32 @@
-        <legend><?php _e('URI:') ?></legend>
-        <div>
-
+id="newcomment_author_url" 
-    </div>
-</fieldset>
@@ -39 +38 @@
-<fieldset style="clear: both;">
-        <legend><?php _e('Comment') ?></legend>
-if ( !$richedit ) 
+
-
-<?php
@@ -47 +46 @@
- }
-?>
-<?php if ( $richedit ) echo 'title="true"'; ?> rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content" style="width: 99%"><?php echo $richedit
+title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content" style="width: 99%"><?php echo user_can_richedit()
-</fieldset>
-
-<?php if ( !$richedit ) : ?>
-<script type="text/javascript">
-<!--
-edCanvas = document.getElementById('content');
+<?php if ( user_can_richedit() ) : ?>
+// This code is meant to allow tabbing from Author URL to Post (TinyMCE).
+if ( tinyMCE.isMSIE )
+    document.getElementById('newcomment_author_url').onkeydown = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+else
+    document.getElementById('newcomment_author_url').onkeypress = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+<?php endif; ?>
-//-->
-</script>
-<?php endif; ?>
-
-<p class="submit"><input type="submit" name="editcomment" id="editcomment" value="<?php echo $submitbutton_text ?>" style="font-weight: bold;" tabindex="6" />

trunk/wp-admin/edit-page-form.php

@@ -20 +20 @@
-
-?>
-
-<?php $richedit = ( 'true' != get_user_option('rich_editing') ) ? false : true; ?>
-
-<form name="post" action="post.php" method="post" id="post">
@@ -120 +118 @@
-
-
-( $richedit
+user_can_richedit(
-    <legend><?php _e('Page Content') ?></legend>
-<?php
@@ -128 +126 @@
- }
-?>
-
-
-
-
-
-
+
+
+
+
+
-<script type="text/javascript">
-<!--
-edCanvas = document.getElementById('content');
+<?php if ( user_can_richedit() ) : ?>
+// This code is meant to allow tabbing from Title to Post (TinyMCE).
+if ( tinyMCE.isMSIE )
+    document.getElementById('title').onkeydown = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+else
+    document.getElementById('title').onkeypress = function (e)
+        {
+            e = e ? e : window.event;
+            if (e.keyCode == 9 && !e.shiftKey && !e.controlKey && !e.altKey) {
+                var i = tinyMCE.selectedInstance;
+                if(typeof i ==  'undefined')
+                    return true;
+                                tinyMCE.execCommand("mceStartTyping");
+                this.blur();
+                i.contentWindow.focus();
+                e.returnValue = false;
+                return false;
+            }
+        }
+<?php endif; ?>
-//-->
-</script>
-<?php endif; ?>
-
-<p class="submit">

trunk/wp-admin/inline-uploading.php

@@ -151 +151 @@
-$uwidth_sum = 0;
-$html = '';
+$popups = '';
-$style = '';
-$script = '';
@@ -163 +164 @@
-    $__using_original = __('Using Original');
-    $__no_thumbnail = '<del>'.__('No Thumbnail').'</del>';
+    $__send_to_editor = __('Send to editor');
-    $__close = __('Close Options');
-    $__confirmdelete = __('Delete this file from the server?');
@@ -191 +193 @@
-        }
-        $attachment = array_merge($attachment, $meta);
-
+
+
-        <a onclick=\"popup.style.display='none';return false;\" href=\"javascript:void()\">$__close</a>
-";
@@ -220 +223 @@
-";
-            $html .= "<div id='target{$ID}' class='attwrap left'>
-    <div id='popup{$ID}' class='popup'>
-        <a id=\"I{$ID}\" onclick=\"if($thumb)toggleImage({$ID});else alert('$__nothumb');return false;\" href=\"javascript:void()\">$thumbtext</a>
-        <a id=\"L{$ID}\" onclick=\"toggleLink({$ID});return false;\" href=\"javascript:void()\">$__not_linked</a>
-        {$delete_cancel}
-    </div>
-    <div id='div{$ID}' class='imagewrap' onclick=\"doPopup({$ID});\">
-        <img id=\"image{$ID}\" src=\"$src\" alt=\"{$image['post_title']}\" $height_width />
@@ -230 +228 @@
-</div>
-";
+            $popups .= "<div id='popup{$ID}' class='popup'>
+    <a id=\"I{$ID}\" onclick=\"if($thumb)toggleImage({$ID});else alert('$__nothumb');return false;\" href=\"javascript:void()\">$thumbtext</a>
+    <a id=\"L{$ID}\" onclick=\"toggleLink({$ID});return false;\" href=\"javascript:void()\">$__not_linked</a>
+    {$send_delete_cancel}
+</div>
+";
-        } else {
-{$ID}a
-{$ID}b
+a[{$ID}]
+b[{$ID}]
-";
-            $html .= "<div id='target{$ID}' class='attwrap left'>
-    <div id='popup{$ID}' class='popup'>
-        <div class='filetype'>File Type: ".str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
-        <a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>
-        {$delete_cancel}
-    </div>
-    <div id='div{$ID}' class='otherwrap' onmousedown=\"selectLink({$ID})\" onclick=\"doPopup({$ID});return false;\">
-        <a id=\"{$ID}\" href=\"{$attachment['guid']}\" onmousedown=\"selectLink({$ID});\" onclick=\"return false;\">{$attachment['post_title']}</a>
-    </div>
+</div>
+";
+            $popups .= "<div id='popup{$ID}' class='popup'>
+    <div class='filetype'>File Type: ".str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
+    <a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>
+    {$send_delete_cancel}
-</div>
-";
@@ -279 +284 @@
-    popup = document.getElementById('popup'+i);
-    popup.style.left = (target.offsetLeft) + 'px';
+    popup.style.top = (target.offsetTop) + 'px';
-    popup.style.display = 'block';
-}
-
-
-
+
-function selectLink(n) {
-    o=document.getElementById('div'+n);
+    if ( typeof document.body.createTextRange == 'undefined' || typeof win.tinyMCE == 'undefined' || win.tinyMCE.configs.length < 1 )
+        return;
-    r = document.body.createTextRange();
-    if ( typeof r != 'undefined' ) {
@@ -334 +340 @@
-    }
-}
+
+var win = window.opener ? window.opener : window.dialogArguments;
+if (!win) win = top;
+tinyMCE = win.tinyMCE;
+richedit = ( typeof tinyMCE == 'object' && tinyMCE.configs.length > 0 );
+function sendToEditor(n) {
+    o = document.getElementById('div'+n);
+    h = o.innerHTML.replace(new RegExp('^\\s*(.*?)\\s*$', ''), '$1'); // Trim
+    h = h.replace(new RegExp(' (class|title|width|height|id|onclick|onmousedown)=([^\'"][^ ]*)( |/|>)', 'g'), ' $1="$2"$3'); // Enclose attribs in quotes
+    h = h.replace(new RegExp(' on(click|mousedown)="[^"]*"', 'g'), ''); // Drop menu events
+    h = h.replace(new RegExp('<(/?)A', 'g'), '<$1a'); // Lowercase tagnames
+    h = h.replace(new RegExp('<IMG', 'g'), '<img'); // Lowercase again
+    h = h.replace(new RegExp('(<img .+?")>', 'g'), '$1 />'); // XHTML
+    if ( richedit )
+        win.tinyMCE.execCommand('mceInsertContent', false, h);
+    else
+        win.edInsertContent(win.edCanvas, h);
+}
-</script>
-<style type="text/css">
@@ -352 +376 @@
-}
-#images {
+    position: absolute;
-    clear: both;
-    margin: 0px;
-3
+15
-    height: 96px;
-/*  white-space: nowrap;*/
@@ -493 +518 @@
-</style>
-</head>
- onload="init()"
+
-<ul id="upload-menu">
-<li<?php echo $current_1; ?>><a href="<?php echo basename(__FILE__); ?>?action=upload&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>"><?php _e('Upload'); ?></a></li>
@@ -522 +547 @@
-<?php if ( $action == 'view' ) : ?>
-<div id="wrap">
-div class="tip"><?php _e('You can drag and drop these items into your post. Click on one for more options.'); ?></div
+!--<div class="tip"><?php _e('You can drag and drop these items into your post. Click on one for more options.'); ?></div>--
-<div id="images">
-<?php echo $html; ?>
+<?php echo $popups; ?>
-</div>
-</div>

trunk/wp-admin/wp-admin.css

@@ -2 +2 @@
-    height: 100%; /* kill peekaboo bug in IE */
-}
-
+
+
+
-a {
-    border-bottom: 1px solid #69c;

trunk/wp-includes/js/tinymce/tiny_mce.js

@@ -5527 +5527 @@
-            var insertHTMLFailed = false;
-            this.getWin().focus();
-
+
-            if (tinyMCE.isGecko || tinyMCE.isOpera) {
-                try {
@@ -5561 +5561 @@
-                }
-            }
-
+
-            // Ugly hack in Opera due to non working "inserthtml"
-            if (tinyMCE.isOpera && insertHTMLFailed) {