Changeset 7378

Timestamp:

03/18/08 06:59:53 (5 months ago)

Author:

ryan

Message:

TinyMCE fixes from azaozz. fixes #6272

Files:

• trunk/wp-admin/js/editor.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/langs/wp-langs.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/media/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/media/media.htm (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/safari/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/js/color_picker.js (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/js/link.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (13 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce_ext.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/wp-mce-help.php (modified) (3 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/js/editor.js

@@ -27 +27 @@
-       // We have a TON of cleanup to do.
-
-        // Remove anonymous, empty paragraphs.
-        content = content.replace(new RegExp('<p>(\\s|&nbsp;|<br />)*</p>', 'mg'), '');
-
-        // Mark </p> if it has any attributes.
-        content = content.replace(new RegExp('(<p[^>]+>.*?)</p>', 'mg'), '$1</p#>');
-
+//content = content.replace(new RegExp('\\s*</p>\\s*', 'mgi'), '</p>\n\n');
+//content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '<br />\n');
+//content = content.replace(new RegExp('( )+', 'g'), ' ');
+
-        // Get it ready for wpautop.
-
+
+
-        content = content.replace(new RegExp('\\s*</p>\\s*', 'mgi'), '\n\n');
-        content = content.replace(new RegExp('\\n\\s*\\n', 'mgi'), '\n\n');

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -38 +38 @@
-insertdate_desc:"' . mce_escape( __('Insert date') ) . '",
-inserttime_desc:"' . mce_escape( __('Insert time') ) . '",
-_('January').','.__('February').','.__('March').','.__('April').','.__('May').','.__('June').','.__('July').','.__('August').','.__('September').','.__('October').','.__('November').','.__('December
-_('Jan_January_abbreviation').','.__('Feb_February_abbreviation').','.__('Mar_March_abbreviation').','.__('Apr_April_abbreviation').','.__('May_May_abbreviation').','.__('Jun_June_abbreviation').','.__('Jul_July_abbreviation').','.__('Aug_August_abbreviation').','.__('Sep_September_abbreviation').','.__('Oct_October_abbreviation').','.__('Nov_November_abbreviation').','.__('Dec_December_abbreviation
-_('Sunday').','.__('Monday').','.__('Tuesday').','.__('Wednesday').','.__('Thursday').','.__('Friday').','.__('Saturday
-_('Sun').','.__('Mon').','.__('Tue').','.__('Wed').','.__('Thu').','.__('Fri').','.__('Sat
+c('January,February,March,April,May,June,July,August,September,October,November,December|Comma separated list of the months. No spaces between them.
+c('Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec|Comma separated list of the abbreviated names of the months. No spaces between them.
+c('Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday|Comma separated list of the days of the week. No spaces between them.
+c('Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun|Comma separated list of the abbreviated names for the days of the week. No spaces between them.
-},
-print:{
@@ -391 +391 @@
-
-tinyMCE.addI18n("' . $language . '.wordpress",{
-Kitchen Sink
+Advanced Toolbar
-wp_more_desc:"' . mce_escape( __('Insert More tag') ) . ' (Alt+Shift+T)",
-wp_page_desc:"' . mce_escape( __('Insert Page break') ) . ' (Alt+Shift+P)",

trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js

@@ -1 @@
-
+u&&

trunk/wp-includes/js/tinymce/plugins/media/editor_plugin.js

@@ -1 @@
-
+if(ed.settings.content_css!==false)

trunk/wp-includes/js/tinymce/plugins/media/media.htm

@@ -34 +34 @@
-                                        <!-- <option value="flv">Flash video (FLV)</option> -->
-                                        <option value="qt">Quicktime</option>
-v
+r
-                                        <option value="wmp">Windows Media</option>
-                                        <option value="rmp">Real Media</option>
@@ -813 +813 @@
-        <div class="mceActionPanel">
-            <div style="float: left">
+                <input type="submit" id="insert" name="insert" value="{#insert}" />
+            </div>
+
+            <div style="float: right">
-                <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-            </div>
-
-            <div style="float: right">
-                <input type="submit" id="insert" name="insert" value="{#insert}" />
-            </div>
-        </div>

trunk/wp-includes/js/tinymce/plugins/safari/editor_plugin.js

@@ -1 @@
-KeyUp.add(function(ed,e){var h;if(e.keyCode==46||e.keyCode==8){h=ed.getBody().innerHTML;if(!/<(img|hr)/.test(h)&&tinymce.trim(h.replace(/<[^>]+>/g,'')).length==0)ed.setContent('',{format:'raw'});}});ed.addCommand('FormatBlock',function(u,v){var dom=ed.dom,e=dom.getParent(ed.selection.getNode(),dom.isBlock);if(e)dom.replace(dom.create(v),e,1);else ed.getDoc().execCommand("FormatBlock",false,v);});ed.addCommand('mceInsertContent',function(u,v){ed.getDoc().execCommand("InsertText",false,'mce_marker');ed.getBody().innerHTML=ed.getBody().innerHTML.replace(/mce_marker/g,v+'<span id="_mce_tmp">XX</span>');ed.selection.select(ed.dom.get('_mce_tmp'));ed.getDoc().execCommand("Delete",false,' ');});ed.onKeyPress.add(function(ed,e){if(e.keyCode==13&&(e.shiftKey||ed.settings.force_br_newlines&&ed.selection.getNode().nodeName!='LI')){t._insertBR(ed);Event.cancel(e);}});ed.addQueryValueHandler('FontSize',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;return ed.getDoc().queryCommandValue('FontSize');});ed.addQueryValueHandler('FontName',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');return ed.getDoc().queryCommandValue('FontName');});ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName=='IMG'){t.selElm=e;ed.selection.select(e);}else t.selElm=null;});ed.onBeforeExecCommand.add(function(ed,c,b){var r=t.bookmarkRng;if(r){ed.selection.setRng(r);t.bookmarkRng=null;}});ed.onInit.add(function(){t._fixWebKitSpans();ed.windowManager.onOpen.add(function(){var r=ed.selection.getRng();if(r.startContainer!=ed.getDoc()){t.bookmarkRng=r.cloneRange();}});ed.windowManager.onClose.add(function(){t.bookmarkRng=null;}
+Paste.add(function(ed,e){function removeStyles(e){e=e.target;if(e.nodeType==1){e.style.cssText='';each(ed.dom.select('*',e),function(e){e.style.cssText='';});}};Event.add(ed.getDoc(),'DOMNodeInserted',removeStyles);window.setTimeout(function(){Event.remove(ed.getDoc(),'DOMNodeInserted',removeStyles);},0);});ed.onKeyUp.add(function(ed,e){var h,b;if(e.keyCode==46||e.keyCode==8){b=ed.getBody();h=b.innerHTML;if(b.childNodes.length==1&&!/<(img|hr)/.test(h)&&tinymce.trim(h.replace(/<[^>]+>/g,'')).length==0)ed.setContent('',{format:'raw'});}});ed.addCommand('FormatBlock',function(u,v){var dom=ed.dom,e=dom.getParent(ed.selection.getNode(),dom.isBlock);if(e)dom.replace(dom.create(v),e,1);else ed.getDoc().execCommand("FormatBlock",false,v);});ed.addCommand('mceInsertContent',function(u,v){ed.getDoc().execCommand("InsertText",false,'mce_marker');ed.getBody().innerHTML=ed.getBody().innerHTML.replace(/mce_marker/g,v+'<span id="_mce_tmp">XX</span>');ed.selection.select(ed.dom.get('_mce_tmp'));ed.getDoc().execCommand("Delete",false,' ');});ed.onKeyPress.add(function(ed,e){if(e.keyCode==13&&(e.shiftKey||ed.settings.force_br_newlines&&ed.selection.getNode().nodeName!='LI')){t._insertBR(ed);Event.cancel(e);}});ed.addQueryValueHandler('FontSize',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontSize))return tinymce.inArray(t.namedFontSizes,v)+1;return ed.getDoc().queryCommandValue('FontSize');});ed.addQueryValueHandler('FontName',function(u,v){var e,v;if((e=ed.dom.getParent(ed.selection.getStart(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');if((e=ed.dom.getParent(ed.selection.getEnd(),'span'))&&(v=e.style.fontFamily))return v.replace(/, /g,',');return ed.getDoc().queryCommandValue('FontName');});ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName=='IMG'){t.selElm=e;ed.selection.select(e);}else t.selElm=null;});ed.onInit.add(function(){t._fixWebKitSpans(

trunk/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js

@@ -46 +46 @@
-
-            ed.onInit.add(function() {
-
+
+
-            });
-
@@ -228 +229 @@
-                    offset_x : p1.x,
-                    offset_y : p1.y,
-n
+mceN
-                });
-

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -102 +102 @@
-            // Add listeners to handle more break
-            t._handleMoreBreak(ed, url);
+            
+            ed.onPostProcess.add(function(se, o) {
+                o.content = o.content.replace(/\r?\n/g, ' ');
+            });
-            
-            // Add custom shortcuts

trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js

@@ -1 @@
-
+if(ed.settings.content_css!==false)

trunk/wp-includes/js/tinymce/themes/advanced/js/color_picker.js

@@ -3 +3 @@
-var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
-
-new Array(
+[
-    "#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
-    "#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
@@ -31 +31 @@
-    "#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
-    "#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
-)