Changeset 8204

Timestamp:

06/27/08 16:13:27 (2 months ago)

Author:

ryan

Message:

TinyMCE 3.1.1 from azaozz. fixes #7191

Files:

• trunk/wp-admin/gears-manifest.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/template.htm (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) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/paste/blank.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/paste/pastetext.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/paste/pasteword.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/safari/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (5 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/about.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/anchor.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/charmap.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/color_picker.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/image.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/link.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/source_editor.htm (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/wp-mce-help.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/gears-manifest.php

@@ -65 +65 @@
-{
-"betaManifestVersion" : 1,
-5
+6
-"entries" : [
-<?php echo $defaults; ?>
@@ -113 +113 @@
-{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-02
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },

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

@@ -1 @@
-absolute
+'+(tinymce.isIE6||(tinymce.isIE&&!DOM.boxModel)?'absolute':'fixed')+'

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

@@ -4 +4 @@
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-0
+
-    <script type="text/javascript">
-        function patchCallback(settings, key) {

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

@@ -1 @@
-t.focus(id);t._fixIELayout(id,1);if(DOM.get(id+'_ok'))DOM.get(id+'_ok').focus();t.count++;return w;},focus:function(id){var t=this,w=t.windows[id];w.zIndex=this.zIndex++;w.element.setStyle('zIndex',w.zIndex);w.element.update();id=id+'_wrapper';DOM.removeClass(t.lastId,'mceFocus');DOM.addClass(id,'mceFocus');t.lastId=id;},_addAll:function(te,ne){var i,n,t=this,dom=tinymce.DOM;if(is(ne,'string'))te.appendChild(dom.doc.createTextNode(ne));else if(ne.length){te=te.appendChild(dom.create(ne[0],ne[1]));for(i=2;i<ne.length;i++)t._addAll(te,ne[i]);}},_startDrag:function(id,se,ac){var t=this,mu,mm,d=DOM.doc,eb,w=t.windows[id],we=w.element,sp=we.getXY(),p,sz,ph,cp,vp,sx,sy,sex,sey,dx,dy,dw,dh;cp={x:0,y:0};vp=DOM.getViewPort();vp.w-=2;vp.h-=2;sex=se.screenX;sey=se.screenY;dx=dy=dw=dh=0;mu=Event.add(d,'mouseup',function(e){Event.remove(d,'mouseup',mu);Event.remove(d,'mousemove',mm);if(eb)eb.remove();we.moveBy(dx,dy);we.resizeBy(dw,dh);sz=we.getSize();DOM.setStyles(id+'_ifr',{width:sz.w-w.deltaWidth,height:sz.h-w.deltaHeight});t._fixIELayout(id,1);return Event.cancel(e);});if(ac!='Move')startMove();function startMove(){if(eb)return;t._fixIELayout(id,0);DOM.add(d.body,'div',{id:'mceEventBlocker','class':'mceEventBlocker '+(t.editor.settings.inlinepopups_skin||'clearlooks2'),style:{left:vp.x,top:vp.y,zIndex:t.zIndex+1}
+if(tinymce.isIE6||(tinymce.isIE&&!DOM.boxModel))DOM.setStyles('mceModalBlocker',{position:'absolute',width:vp.w-2,height:vp.h-2});t.focus(id);t._fixIELayout(id,1);if(DOM.get(id+'_ok'))DOM.get(id+'_ok').focus();t.count++;return w;},focus:function(id){var t=this,w=t.windows[id];w.zIndex=this.zIndex++;w.element.setStyle('zIndex',w.zIndex);w.element.update();id=id+'_wrapper';DOM.removeClass(t.lastId,'mceFocus');DOM.addClass(id,'mceFocus');t.lastId=id;},_addAll:function(te,ne){var i,n,t=this,dom=tinymce.DOM;if(is(ne,'string'))te.appendChild(dom.doc.createTextNode(ne));else if(ne.length){te=te.appendChild(dom.create(ne[0],ne[1]));for(i=2;i<ne.length;i++)t._addAll(te,ne[i]);}},_startDrag:function(id,se,ac){var t=this,mu,mm,d=DOM.doc,eb,w=t.windows[id],we=w.element,sp=we.getXY(),p,sz,ph,cp,vp,sx,sy,sex,sey,dx,dy,dw,dh;cp={x:0,y:0};vp=DOM.getViewPort();vp.w-=2;vp.h-=2;sex=se.screenX;sey=se.screenY;dx=dy=dw=dh=0;mu=Event.add(d,'mouseup',function(e){Event.remove(d,'mouseup',mu);Event.remove(d,'mousemove',mm);if(eb)eb.remove();we.moveBy(dx,dy);we.resizeBy(dw,dh);sz=we.getSize();DOM.setStyles(id+'_ifr',{width:sz.w-w.deltaWidth,height:sz.h-w.deltaHeight});t._fixIELayout(id,1);return Event.cancel(e);});if(ac!='Move')startMove();function startMove(){if(eb)return;t._fixIELayout(id,0);DOM.add(d.body,'div',{id:'mceEventBlocker','class':'mceEventBlocker '+(t.editor.settings.inlinepopups_skin||'clearlooks2'),style:{left:vp.x,top:vp.y,zIndex:t.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!DOM.boxModel))DOM.setStyles('mceEventBlocker',{position:'absolute',width:vp.w-2,height:vp.h-2

trunk/wp-includes/js/tinymce/plugins/inlinepopups/template.htm

@@ -3 +3 @@
-<head>
-<title>Template for dialogs</title>
-0
+
-</head>
-<body>

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

@@ -1 @@
->/gi,'<span class="mceItemEmbed" $1>');h=h.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');h=h.replace(/<\/(object|embed)([^>]*)>/gi,'</span>
+?>/gi,'<span class="mceItemEmbed" $1></span>');h=h.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');h=h.replace(/<\/(object)([^>]*)>/gi,'</span>');h=h.replace(/<\/embed>/gi,'

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

@@ -3 +3 @@
-<head>
-    <title>{#media_dlg.title}</title>
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
-    <base target="_self" />
-</head>

trunk/wp-includes/js/tinymce/plugins/paste/blank.htm

@@ -3 +3 @@
-<title>blank_page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-0
+
-<base target="_self" />
-<script type="text/javascript">

trunk/wp-includes/js/tinymce/plugins/paste/pastetext.htm

@@ -3 +3 @@
-    <title>{#paste.paste_text_desc}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-0
-0
+
+
-    <base target="_self" />
-</head>

trunk/wp-includes/js/tinymce/plugins/paste/pasteword.htm

@@ -3 +3 @@
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>{#paste.paste_word_desc}</title>
-0
-0
-0
+
+
+
-    <base target="_self" />
-</head>

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

@@ -1 @@
-
+addCommand('CreateLink',function(u,v){var n=ed.selection.getNode(),dom=ed.dom,a;if(n&&(/^(left|right)$/i.test(dom.getStyle(n,'float',1))||/^(left|right)$/i.test(dom.getAttrib(n,'align')))){a=dom.create('a',{href:v},n.cloneNode());n.parentNode.replaceChild(a,n);ed.selection.select(a);}else ed.getDoc().execCommand("CreateLink",false,v);});ed.

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

@@ -5 +5 @@
-<title></title>
-
-02
-0
-
-0
+1
+
+
+
-<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" />
-<script type="text/javascript">
-if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
-0
+
-</script>
-<base target="_self" />

trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

@@ -343 +343 @@
-        A = ed.dom.getParent(el, 'A');
-        P = ed.dom.getParent(el, 'p');
-
+
-/*      if ( tinymce.isIE ) {
-            if ( f.img_classes.value.indexOf('aligncenter') != -1 )
@@ -350 +350 @@
-        }
-*/
-
-        ed.dom.setAttribs(el, {
-            src : f.img_src.value,
@@ -363 +362 @@
-        if ( ! f.link_href.value ) {
-            if ( A ) {
-                tinyMCEPopup.execCommand("mceBeginUndoLevel");
-                b = ed.selection.getBookmark();
-pa
+A
-                ed.selection.moveToBookmark(b);
-                tinyMCEPopup.execCommand("mceEndUndoLevel");
-            }
-        } else {
-            tinyMCEPopup.execCommand("mceBeginUndoLevel");
-    
-            // Create new anchor elements
-            if ( A == null ) {
@@ -403 +398 @@
-                });
-            }
-
-
-
+
+
-        ed.dom.setAttrib(el, 'class', f.img_classes.value);
-        
@@ -415 +409 @@
-                ed.dom.setStyle(P, 'textAlign', '');
-        }
-
+
-        ed.execCommand('mceRepaint');
-        tinyMCEPopup.close();

trunk/wp-includes/js/tinymce/themes/advanced/about.htm

@@ -3 +3 @@
-<head>
-    <title>{#advanced_dlg.about_title}</title>
-0
-0
-0
+
+
+
-</head>
-<body id="about" style="display: none">

trunk/wp-includes/js/tinymce/themes/advanced/anchor.htm

@@ -3 +3 @@
-<head>
-    <title>{#advanced_dlg.anchor_title}</title>
-0
-0
+
+
-    <base target="_self" />
-</head>

trunk/wp-includes/js/tinymce/themes/advanced/charmap.htm

@@ -4 +4 @@
-    <title>{#advanced_dlg.charmap_title}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-0
-0
+
+
-    <base target="_self" />
-</head>

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

@@ -3 +3 @@
-<head>
-    <title>{#advanced_dlg.colorpicker_title}</title>
-0
-0
-0
+
+
+
-    <base target="_self" />
-</head>

trunk/wp-includes/js/tinymce/themes/advanced/image.htm

@@ -3 +3 @@
-<head>
-    <title>{#advanced_dlg.image_title}</title>
-0
-0
-0
-0
+
+
+
+
-    <base target="_self" />
-</head>

trunk/wp-includes/js/tinymce/themes/advanced/link.htm

@@ -3 +3 @@
-<head>
-    <title>{#advanced_dlg.link_title}</title>
-0
-0
-0
-0