<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12660] trunk/wp-includes/js/tinymce/plugins/wpeditimage:
Clean CSS of the Edit Image popup in the visual editor props Simek,
show changed image size and fill width or height when left blank,
fixes #11655, fixes #10442</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12660">12660</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2010-01-08 13:06:17 +0000 (Fri, 08 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean CSS of the Edit Image popup in the visual editor props Simek, show changed image size and fill width or height when left blank, fixes <a href="http://trac.wordpress.org/ticket/11655">#11655</a>, fixes <a href="http://trac.wordpress.org/ticket/10442">#10442</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimagecsseditimagecss">trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimageeditimagehtml">trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimagejseditimagejs">trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimagejseditimagedevjs">trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswpeditimagecsseditimagecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (12659 => 12660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css 2010-01-08 08:51:12 UTC (rev 12659)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css 2010-01-08 13:06:17 UTC (rev 12660)
</span><span class="lines">@@ -40,6 +40,12 @@
</span><span class="cx"> padding: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+p.help {
+ margin: 4px 0;
+ font-size: 12px;
+ font-style: italic;
+}
+
</ins><span class="cx"> body, td {
</span><span class="cx"> font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
</span><span class="cx"> }
</span><span class="lines">@@ -52,11 +58,13 @@
</span><span class="cx"> img.alignright,
</span><span class="cx"> .alignright {
</span><span class="cx"> float: right;
</span><ins>+ margin-left: 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> img.alignleft,
</span><span class="cx"> .alignleft {
</span><span class="cx"> float: left;
</span><ins>+ margin-right: 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> img.aligncenter {
</span><span class="lines">@@ -149,9 +157,9 @@
</span><span class="cx"> -khtml-border-top-right-radius: 4px;
</span><span class="cx"> -webkit-border-top-right-radius: 4px;
</span><span class="cx"> border-top-right-radius: 4px;
</span><del>- border-style:solid;
- border-width:1px;
- font-weight:normal;
</del><ins>+ border-style: solid;
+ border-width: 1px;
+ font-weight: normal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #adv_settings .field label {
</span><span class="lines">@@ -279,13 +287,16 @@
</span><span class="cx"> .describe textarea {
</span><span class="cx"> width: 460px;
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><ins>+ -moz-border-radius: 4px;
+ -khtml-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> .media-upload-form label,
</span><span class="cx"> .media-upload-form legend {
</span><span class="cx"> font-weight: bold;
</span><del>- font-size: 13px;
</del><ins>+ font-size: 12px;
</ins><span class="cx"> color: #464646;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -341,3 +352,7 @@
</span><span class="cx"> height: 27px;
</span><span class="cx"> line-height: 26px;
</span><span class="cx"> }
</span><ins>+
+* html input {
+ border: 1px solid #ddd;
+}
</ins></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpeditimageeditimagehtml"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (12659 => 12660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html 2010-01-08 08:51:12 UTC (rev 12659)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html 2010-01-08 13:06:17 UTC (rev 12660)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</span><span class="cx"> <title></title>
</span><span class="cx">
</span><del>-<script type="text/javascript" src="js/editimage.js?ver=3223"></script>
</del><ins>+<script type="text/javascript" src="js/editimage.js?ver=327"></script>
</ins><span class="cx"> <script type="text/javascript" src="../../utils/form_utils.js?ver=3223"></script>
</span><span class="cx">
</span><del>-<link rel="stylesheet" href="css/editimage.css?ver=3223" type="text/css" media="all" />
</del><ins>+<link rel="stylesheet" href="css/editimage.css?ver=327" type="text/css" media="all" />
</ins><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
</span><span class="lines">@@ -85,6 +85,17 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><ins>+ <tr>
+ <th valign="top" scope="row" class="label">
+ <label for="img_alt">
+ <span class="alignleft">{#wpeditimage.alt}</span>
+ </label>
+ </th>
+ <td class="field">
+ <input type="text" id="img_alt" name="img_alt" value="" size="60" />
+ </td>
+ </tr>
+
</ins><span class="cx"> <tr id="cap_field">
</span><span class="cx"> <th valign="top" scope="row" class="label">
</span><span class="cx"> <label for="img_cap">
</span><span class="lines">@@ -128,17 +139,6 @@
</span><span class="cx"> <input type="text" id="img_src" name="img_src" value="" onblur="wpImage.checkVal(this)" aria-required="true" size="60" />
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><del>-
- <tr>
- <th valign="top" scope="row" class="label">
- <label for="img_alt">
- <span class="alignleft">{#wpeditimage.alt}</span>
- </label>
- </th>
- <td class="field">
- <input type="text" id="img_alt" name="img_alt" value="" size="60" />
- </td>
- </tr>
</del><span class="cx">
</span><span class="cx"> <tr id="img_dim">
</span><span class="cx"> <th valign="top" scope="row" class="label">
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpeditimagejseditimagedevjs"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js (0 => 12660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js (rev 0)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js 2010-01-08 13:06:17 UTC (rev 12660)
</span><span class="lines">@@ -0,0 +1,613 @@
</span><ins>+
+var tinymce = null, tinyMCEPopup, tinyMCE, wpImage;
+
+tinyMCEPopup = {
+ init: function() {
+ var t = this, w, li, q, i, it;
+
+ li = ('' + document.location.search).replace(/^\?/, '').split('&');
+ q = {};
+ for ( i = 0; i < li.length; i++ ) {
+ it = li[i].split('=');
+ q[unescape(it[0])] = unescape(it[1]);
+ }
+
+ if (q.mce_rdomain)
+ document.domain = q.mce_rdomain;
+
+ // Find window & API
+ w = t.getWin();
+ tinymce = w.tinymce;
+ tinyMCE = w.tinyMCE;
+ t.editor = tinymce.EditorManager.activeEditor;
+ t.params = t.editor.windowManager.params;
+
+ // Setup local DOM
+ t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
+ t.editor.windowManager.onOpen.dispatch(t.editor.windowManager, window);
+ },
+
+ getWin : function() {
+ return window.dialogArguments || opener || parent || top;
+ },
+
+ getParam : function(n, dv) {
+ return this.editor.getParam(n, dv);
+ },
+
+ close : function() {
+ var t = this, win = t.getWin();
+
+ // To avoid domain relaxing issue in Opera
+ function close() {
+ win.tb_remove();
+ tinymce = tinyMCE = t.editor = t.dom = t.dom.doc = null; // Cleanup
+ };
+
+ if (tinymce.isOpera)
+ win.setTimeout(close, 0);
+ else
+ close();
+ },
+
+ execCommand : function(cmd, ui, val, a) {
+ a = a || {};
+ a.skip_focus = 1;
+
+ this.restoreSelection();
+ return this.editor.execCommand(cmd, ui, val, a);
+ },
+
+ storeSelection : function() {
+ this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple');
+ },
+
+ restoreSelection : function() {
+ var t = tinyMCEPopup;
+
+ if (tinymce.isIE)
+ t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
+ }
+}
+tinyMCEPopup.init();
+
+wpImage = {
+ preInit : function() {
+ // import colors stylesheet from parent
+ var win = tinyMCEPopup.getWin(), styles = win.document.styleSheets, url, i;
+
+ for ( i = 0; i < styles.length; i++ ) {
+ url = styles.item(i).href;
+ if ( url && url.indexOf('colors') != -1 )
+ document.write( '<link rel="stylesheet" href="'+url+'" type="text/css" media="all" />' );
+ }
+ },
+
+ I : function(e) {
+ return document.getElementById(e);
+ },
+
+ current : '',
+ link : '',
+ link_rel : '',
+ target_value : '',
+ current_size_sel : 's100',
+ width : '',
+ height : '',
+ align : '',
+ img_alt : '',
+
+ setTabs : function(tab) {
+ var t = this;
+
+ if ( 'current' == tab.className ) return false;
+ t.I('div_advanced').style.display = ( 'tab_advanced' == tab.id ) ? 'block' : 'none';
+ t.I('div_basic').style.display = ( 'tab_basic' == tab.id ) ? 'block' : 'none';
+ t.I('tab_basic').className = t.I('tab_advanced').className = '';
+ tab.className = 'current';
+ return false;
+ },
+
+ img_seturl : function(u) {
+ var t = this, rel = t.I('link_rel').value;
+
+ if ( 'current' == u ) {
+ t.I('link_href').value = t.current;
+ t.I('link_rel').value = t.link_rel;
+ } else {
+ t.I('link_href').value = t.link;
+ if ( rel ) {
+ rel = rel.replace( /attachment|wp-att-[0-9]+/gi, '' );
+ t.I('link_rel').value = tinymce.trim(rel);
+ }
+ }
+ },
+
+ imgAlignCls : function(v) {
+ var t = this, cls = t.I('img_classes').value;
+
+ t.I('img_demo').className = t.align = v;
+
+ cls = cls.replace( /align[^ "']+/gi, '' );
+ cls += (' ' + v);
+ cls = cls.replace( /\s+/g, ' ' ).replace( /^\s/, '' );
+
+ if ( 'aligncenter' == v ) {
+ t.I('hspace').value = '';
+ t.updateStyle('hspace');
+ }
+
+ t.I('img_classes').value = cls;
+ },
+
+ showSize : function(el) {
+ var t = this, demo = t.I('img_demo'), w = t.width, h = t.height, id = el.id || 's100', size;
+
+ size = parseInt(id.substring(1)) / 200;
+ demo.width = Math.round(w * size);
+ demo.height = Math.round(h * size);
+
+ t.showSizeClear();
+ el.style.borderColor = '#A3A3A3';
+ el.style.backgroundColor = '#E5E5E5';
+ },
+
+ showSizeSet : function() {
+ var t = this, s130, s120, s110;
+
+ if ( (t.width * 1.3) > parseInt(t.preloadImg.width) ) {
+ s130 = t.I('s130'), s120 = t.I('s120'), s110 = t.I('s110');
+
+ s130.onclick = s120.onclick = s110.onclick = null;
+ s130.onmouseover = s120.onmouseover = s110.onmouseover = null;
+ s130.style.color = s120.style.color = s110.style.color = '#aaa';
+ }
+ },
+
+ showSizeRem : function() {
+ var t = this, demo = t.I('img_demo'), f = document.forms[0];
+
+ demo.width = Math.round(f.width.value * 0.5);
+ demo.height = Math.round(f.height.value * 0.5);
+ t.showSizeClear();
+ t.I(t.current_size_sel).style.borderColor = '#A3A3A3';
+ t.I(t.current_size_sel).style.backgroundColor = '#E5E5E5';
+
+ return false;
+ },
+
+ showSizeClear : function() {
+ var divs = this.I('img_size').getElementsByTagName('div'), i;
+
+ for ( i = 0; i < divs.length; i++ ) {
+ divs[i].style.borderColor = '#f1f1f1';
+ divs[i].style.backgroundColor = '#f1f1f1';
+ }
+ },
+
+ imgEditSize : function(el) {
+ var t = this, f = document.forms[0], W, H, w, h, id;
+
+ if ( ! t.preloadImg || ! t.preloadImg.width || ! t.preloadImg.height )
+ return;
+
+ W = parseInt(t.preloadImg.width), H = parseInt(t.preloadImg.height), w = t.width || W, h = t.height || H, id = el.id || 's100';
+
+ size = parseInt(id.substring(1)) / 100;
+
+ w = Math.round(w * size);
+ h = Math.round(h * size);
+
+ f.width.value = Math.min(W, w);
+ f.height.value = Math.min(H, h);
+
+ t.current_size_sel = id;
+ t.demoSetSize();
+ },
+
+ demoSetSize : function(img) {
+ var demo = this.I('img_demo'), f = document.forms[0];
+
+ demo.width = f.width.value ? Math.round(f.width.value * 0.5) : '';
+ demo.height = f.height.value ? Math.round(f.height.value * 0.5) : '';
+ },
+
+ demoSetStyle : function() {
+ var f = document.forms[0], demo = this.I('img_demo'), dom = tinyMCEPopup.editor.dom;
+
+ if (demo) {
+ dom.setAttrib(demo, 'style', f.img_style.value);
+ dom.setStyle(demo, 'width', '');
+ dom.setStyle(demo, 'height', '');
+ }
+ },
+
+ origSize : function() {
+ var t = this, f = document.forms[0], el = t.I('s100');
+
+ f.width.value = t.width = t.preloadImg.width;
+ f.height.value = t.height = t.preloadImg.height;
+ t.showSizeSet();
+ t.demoSetSize();
+ t.showSize(el);
+ },
+
+ init : function() {
+ var ed = tinyMCEPopup.editor, h;
+
+ h = document.body.innerHTML;
+ document.body.innerHTML = ed.translate(h);
+ window.setTimeout( function(){wpImage.setup();}, 500 );
+ },
+
+ setup : function() {
+ var t = this, c, el, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor,
+ d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = '', dlc, pa;
+
+ document.dir = tinyMCEPopup.editor.getParam('directionality','');
+
+ if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) )
+ t.I('cap_field').style.display = 'none';
+
+ tinyMCEPopup.restoreSelection();
+ el = ed.selection.getNode();
+ if (el.nodeName != 'IMG')
+ return;
+
+ f.img_src.value = d.src = link = ed.dom.getAttrib(el, 'src');
+ ed.dom.setStyle(el, 'float', '');
+ t.getImageData();
+ c = ed.dom.getAttrib(el, 'class');
+
+ if ( DL = dom.getParent(el, 'dl') ) {
+ dlc = ed.dom.getAttrib(DL, 'class');
+ dlc = dlc.match(/align[^ "']+/i);
+ if ( dlc && ! dom.hasClass(el, dlc) ) {
+ c += ' '+dlc;
+ tinymce.trim(c);
+ }
+
+ tinymce.each(DL.childNodes, function(e) {
+ if ( e.nodeName == 'DD' && dom.hasClass(e, 'wp-caption-dd') ) {
+ caption = e.innerHTML;
+ return;
+ }
+ });
+ }
+
+ f.img_cap.value = caption;
+ f.img_title.value = ed.dom.getAttrib(el, 'title');
+ f.img_alt.value = ed.dom.getAttrib(el, 'alt');
+ f.border.value = ed.dom.getAttrib(el, 'border');
+ f.vspace.value = ed.dom.getAttrib(el, 'vspace');
+ f.hspace.value = ed.dom.getAttrib(el, 'hspace');
+ f.align.value = ed.dom.getAttrib(el, 'align');
+ f.width.value = t.width = ed.dom.getAttrib(el, 'width');
+ f.height.value = t.height = ed.dom.getAttrib(el, 'height');
+ f.img_classes.value = c;
+ f.img_style.value = ed.dom.getAttrib(el, 'style');
+
+ // Move attribs to styles
+ if ( dom.getAttrib(el, 'hspace') )
+ t.updateStyle('hspace');
+
+ if ( dom.getAttrib(el, 'border') )
+ t.updateStyle('border');
+
+ if ( dom.getAttrib(el, 'vspace') )
+ t.updateStyle('vspace');
+
+ if ( pa = ed.dom.getParent(el, 'A') ) {
+ f.link_href.value = t.current = ed.dom.getAttrib(pa, 'href');
+ f.link_title.value = ed.dom.getAttrib(pa, 'title');
+ f.link_rel.value = t.link_rel = ed.dom.getAttrib(pa, 'rel');
+ f.link_style.value = ed.dom.getAttrib(pa, 'style');
+ t.target_value = ed.dom.getAttrib(pa, 'target');
+ f.link_classes.value = ed.dom.getAttrib(pa, 'class');
+ }
+
+ f.link_target.checked = ( t.target_value && t.target_value == '_blank' ) ? 'checked' : '';
+
+ fname = link.substring( link.lastIndexOf('/') );
+ fname = fname.replace(/-[0-9]{2,4}x[0-9]{2,4}/, '' );
+ t.link = link.substring( 0, link.lastIndexOf('/') ) + fname;
+
+ if ( c.indexOf('alignleft') != -1 ) {
+ t.I('alignleft').checked = "checked";
+ d.className = t.align = "alignleft";
+ } else if ( c.indexOf('aligncenter') != -1 ) {
+ t.I('aligncenter').checked = "checked";
+ d.className = t.align = "aligncenter";
+ } else if ( c.indexOf('alignright') != -1 ) {
+ t.I('alignright').checked = "checked";
+ d.className = t.align = "alignright";
+ } else if ( c.indexOf('alignnone') != -1 ) {
+ t.I('alignnone').checked = "checked";
+ d.className = t.align = "alignnone";
+ }
+
+ if ( t.width && t.preloadImg.width ) t.showSizeSet();
+ document.body.style.display = '';
+ },
+
+ remove : function() {
+ var ed = tinyMCEPopup.editor, p, el;
+
+ tinyMCEPopup.restoreSelection();
+ el = ed.selection.getNode();
+ if (el.nodeName != 'IMG') return;
+
+ if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') )
+ ed.dom.remove(p);
+ else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 )
+ ed.dom.remove(p);
+ else ed.dom.remove(el);
+
+ ed.execCommand('mceRepaint');
+ tinyMCEPopup.close();
+ return;
+ },
+
+ update : function() {
+ var t = this, f = document.forms[0], ed = tinyMCEPopup.editor, el, b, fixSafari = null,
+ DL, P, A, DIV, do_caption = null, img_class = f.img_classes.value, html,
+ id, cap_id = '', cap, DT, DD, cap_width, div_cls, lnk = '', pa, aa;
+
+ tinyMCEPopup.restoreSelection();
+ el = ed.selection.getNode();
+
+ if (el.nodeName != 'IMG') return;
+ if (f.img_src.value === '') {
+ t.remove();
+ return;
+ }
+
+ if ( f.img_cap.value != '' && f.width.value != '' ) {
+ do_caption = 1;
+ img_class = img_class.replace( /align[^ "']+\s?/gi, '' );
+ }
+
+ A = ed.dom.getParent(el, 'a');
+ P = ed.dom.getParent(el, 'p');
+ DL = ed.dom.getParent(el, 'dl');
+ DIV = ed.dom.getParent(el, 'div');
+
+ tinyMCEPopup.execCommand("mceBeginUndoLevel");
+
+ ed.dom.setAttribs(el, {
+ src : f.img_src.value,
+ title : f.img_title.value,
+ alt : f.img_alt.value,
+ width : f.width.value,
+ height : f.height.value,
+ style : f.img_style.value,
+ 'class' : img_class
+ });
+
+ if ( f.link_href.value ) {
+ // Create new anchor elements
+ if ( A == null ) {
+ if ( ! f.link_href.value.match(/https?:\/\//i) )
+ f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value);
+
+ if ( tinymce.isWebKit && ed.dom.hasClass(el, 'aligncenter') ) {
+ ed.dom.removeClass(el, 'aligncenter');
+ fixSafari = 1;
+ }
+
+ tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
+ if ( fixSafari ) ed.dom.addClass(el, 'aligncenter');
+
+ tinymce.each(ed.dom.select("a"), function(n) {
+ if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
+
+ ed.dom.setAttribs(n, {
+ href : f.link_href.value,
+ title : f.link_title.value,
+ rel : f.link_rel.value,
+ target : (f.link_target.checked == true) ? '_blank' : '',
+ 'class' : f.link_classes.value,
+ style : f.link_style.value
+ });
+ }
+ });
+ } else {
+ ed.dom.setAttribs(A, {
+ href : f.link_href.value,
+ title : f.link_title.value,
+ rel : f.link_rel.value,
+ target : (f.link_target.checked == true) ? '_blank' : '',
+ 'class' : f.link_classes.value,
+ style : f.link_style.value
+ });
+ }
+ }
+
+ if ( do_caption ) {
+ cap_width = 10 + parseInt(f.width.value);
+ div_cls = (t.align == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp';
+
+ if ( DL ) {
+ ed.dom.setAttribs(DL, {
+ 'class' : 'wp-caption '+t.align,
+ style : 'width: '+cap_width+'px;'
+ });
+
+ if ( DIV )
+ ed.dom.setAttrib(DIV, 'class', div_cls);
+
+ if ( (DT = ed.dom.getParent(el, 'dt')) && (DD = DT.nextSibling) && ed.dom.hasClass(DD, 'wp-caption-dd') )
+ ed.dom.setHTML(DD, f.img_cap.value);
+
+ } else {
+ if ( (id = f.img_classes.value.match( /wp-image-([0-9]{1,6})/ )) && id[1] )
+ cap_id = 'attachment_'+id[1];
+
+ if ( f.link_href.value && (lnk = ed.dom.getParent(el, 'a')) ) {
+ if ( lnk.childNodes.length == 1 )
+ html = ed.dom.getOuterHTML(lnk);
+ else {
+ html = ed.dom.getOuterHTML(lnk);
+ html = html.match(/<a[^>]+>/i);
+ html = html+ed.dom.getOuterHTML(el)+'</a>';
+ }
+ } else html = ed.dom.getOuterHTML(el);
+
+ html = '<dl id="'+cap_id+'" class="wp-caption '+t.align+'" style="width: '+cap_width+
+ 'px"><dt class="wp-caption-dt">'+html+'</dt><dd class="wp-caption-dd">'+f.img_cap.value+'</dd></dl>';
+
+ cap = ed.dom.create('div', {'class': div_cls}, html);
+
+ if ( P ) {
+ P.parentNode.insertBefore(cap, P);
+ if ( P.childNodes.length == 1 )
+ ed.dom.remove(P);
+ else if ( lnk && lnk.childNodes.length == 1 )
+ ed.dom.remove(lnk);
+ else ed.dom.remove(el);
+ } else if ( pa = ed.dom.getParent(el, 'TD,TH,LI') ) {
+ pa.appendChild(cap);
+ if ( lnk && lnk.childNodes.length == 1 )
+ ed.dom.remove(lnk);
+ else ed.dom.remove(el);
+ }
+ }
+
+ } else {
+ if ( DL && DIV ) {
+ if ( f.link_href.value && (aa = ed.dom.getParent(el, 'a')) ) html = ed.dom.getOuterHTML(aa);
+ else html = ed.dom.getOuterHTML(el);
+
+ P = ed.dom.create('p', {}, html);
+ DIV.parentNode.insertBefore(P, DIV);
+ ed.dom.remove(DIV);
+ }
+ }
+
+ if ( f.img_classes.value.indexOf('aligncenter') != -1 ) {
+ if ( P && ( ! P.style || P.style.textAlign != 'center' ) )
+ ed.dom.setStyle(P, 'textAlign', 'center');
+ } else {
+ if ( P && P.style && P.style.textAlign == 'center' )
+ ed.dom.setStyle(P, 'textAlign', '');
+ }
+
+ if ( ! f.link_href.value && A ) {
+ b = ed.selection.getBookmark();
+ ed.dom.remove(A, 1);
+ ed.selection.moveToBookmark(b);
+ }
+
+ tinyMCEPopup.execCommand("mceEndUndoLevel");
+ ed.execCommand('mceRepaint');
+ tinyMCEPopup.close();
+ },
+
+ updateStyle : function(ty) {
+ var dom = tinyMCEPopup.dom, v, f = document.forms[0], img = dom.create('img', {style : f.img_style.value});
+
+ if (tinyMCEPopup.editor.settings.inline_styles) {
+ // Handle align
+ if (ty == 'align') {
+ dom.setStyle(img, 'float', '');
+ dom.setStyle(img, 'vertical-align', '');
+
+ v = f.align.value;
+ if (v) {
+ if (v == 'left' || v == 'right')
+ dom.setStyle(img, 'float', v);
+ else
+ img.style.verticalAlign = v;
+ }
+ }
+
+ // Handle border
+ if (ty == 'border') {
+ dom.setStyle(img, 'border', '');
+
+ v = f.border.value;
+ if (v || v == '0') {
+ if (v == '0')
+ img.style.border = '0';
+ else
+ img.style.border = v + 'px solid black';
+ }
+ }
+
+ // Handle hspace
+ if (ty == 'hspace') {
+ dom.setStyle(img, 'marginLeft', '');
+ dom.setStyle(img, 'marginRight', '');
+
+ v = f.hspace.value;
+ if (v) {
+ img.style.marginLeft = v + 'px';
+ img.style.marginRight = v + 'px';
+ }
+ }
+
+ // Handle vspace
+ if (ty == 'vspace') {
+ dom.setStyle(img, 'marginTop', '');
+ dom.setStyle(img, 'marginBottom', '');
+
+ v = f.vspace.value;
+ if (v) {
+ img.style.marginTop = v + 'px';
+ img.style.marginBottom = v + 'px';
+ }
+ }
+
+ // Merge
+ f.img_style.value = dom.serializeStyle(dom.parseStyle(img.style.cssText));
+ this.demoSetStyle();
+ }
+ },
+
+ checkVal : function(f) {
+
+ if ( f.value == '' ) {
+ // if ( f.id == 'width' ) f.value = this.width || this.preloadImg.width;
+ // if ( f.id == 'height' ) f.value = this.height || this.preloadImg.height;
+ if ( f.id == 'img_src' ) f.value = this.I('img_demo').src || this.preloadImg.src;
+ }
+ },
+
+ resetImageData : function() {
+ var f = document.forms[0];
+
+ f.width.value = f.height.value = '';
+ },
+
+ updateImageData : function() {
+ var f = document.forms[0], t = wpImage, w = f.width.value, h = f.height.value;
+
+ if ( !w && h )
+ w = f.width.value = t.width = Math.round( t.preloadImg.width / (t.preloadImg.height / h) );
+ else if ( w && !h )
+ h = f.height.value = t.height = Math.round( t.preloadImg.height / (t.preloadImg.width / w) );
+
+ if ( !w )
+ f.width.value = t.width = t.preloadImg.width;
+
+ if ( !h )
+ f.height.value = t.height = t.preloadImg.height;
+
+ t.showSizeSet();
+ t.demoSetSize();
+ if ( f.img_style.value )
+ t.demoSetStyle();
+ },
+
+ getImageData : function() {
+ var t = wpImage, f = document.forms[0];
+
+ t.preloadImg = new Image();
+ t.preloadImg.onload = t.updateImageData;
+ t.preloadImg.onerror = t.resetImageData;
+ t.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.img_src.value);
+ }
+};
+
+window.onload = function(){wpImage.init();}
+wpImage.preInit();
</ins><span class="cx">Property changes on: trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpeditimagejseditimagejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (12659 => 12660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js 2010-01-08 08:51:12 UTC (rev 12659)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js 2010-01-08 13:06:17 UTC (rev 12660)
</span><span class="lines">@@ -1,607 +1 @@
</span><del>-
-var tinymce = null, tinyMCEPopup, tinyMCE;
-
-tinyMCEPopup = {
- init: function() {
- var t = this, w, ti, li, q, i, it;
-
- li = ('' + document.location.search).replace(/^\?/, '').split('&');
- q = {};
- for (i=0; i<li.length; i++) {
- it = li[i].split('=');
- q[unescape(it[0])] = unescape(it[1]);
- }
-
- if (q.mce_rdomain)
- document.domain = q.mce_rdomain;
-
- // Find window & API
- w = t.getWin();
- tinymce = w.tinymce;
- tinyMCE = w.tinyMCE;
- t.editor = tinymce.EditorManager.activeEditor;
- t.params = t.editor.windowManager.params;
-
- // Setup local DOM
- t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
- t.editor.windowManager.onOpen.dispatch(t.editor.windowManager, window);
- },
-
- getWin : function() {
- return window.dialogArguments || opener || parent || top;
- },
-
- getParam : function(n, dv) {
- return this.editor.getParam(n, dv);
- },
-
- close : function() {
- var t = this, win = t.getWin();
-
- // To avoid domain relaxing issue in Opera
- function close() {
- win.tb_remove();
- tinymce = tinyMCE = t.editor = t.dom = t.dom.doc = null; // Cleanup
- };
-
- if (tinymce.isOpera)
- win.setTimeout(close, 0);
- else
- close();
- },
-
- execCommand : function(cmd, ui, val, a) {
- a = a || {};
- a.skip_focus = 1;
-
- this.restoreSelection();
- return this.editor.execCommand(cmd, ui, val, a);
- },
-
- storeSelection : function() {
- this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple');
- },
-
- restoreSelection : function() {
- var t = tinyMCEPopup;
-
- if (tinymce.isIE)
- t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
- }
-}
-tinyMCEPopup.init();
-
-var wpImage = {
- preInit : function() {
- // import colors stylesheet from parent
- var win = tinyMCEPopup.getWin();
- var styles = win.document.styleSheets;
-
- for ( i = 0; i < styles.length; i++ ) {
- var url = styles.item(i).href;
- if ( url && url.indexOf('colors') != -1 )
- document.write( '<link rel="stylesheet" href="'+url+'" type="text/css" media="all" />' );
- }
- },
-
- I : function(e) {
- return document.getElementById(e);
- },
-
- current : '',
- link : '',
- link_rel : '',
- target_value : '',
- current_size_sel : 's100',
- width : '',
- height : '',
- align : '',
- img_alt : '',
-
- setTabs : function(tab) {
- var t = this;
-
- if ( 'current' == tab.className ) return false;
- t.I('div_advanced').style.display = ( 'tab_advanced' == tab.id ) ? 'block' : 'none';
- t.I('div_basic').style.display = ( 'tab_basic' == tab.id ) ? 'block' : 'none';
- t.I('tab_basic').className = t.I('tab_advanced').className = '';
- tab.className = 'current';
- return false;
- },
-
- img_seturl : function(u) {
- var t = this, rel = t.I('link_rel').value;
-
- if ( 'current' == u ) {
- t.I('link_href').value = t.current;
- t.I('link_rel').value = t.link_rel;
- } else {
- t.I('link_href').value = t.link;
- if ( rel ) {
- rel = rel.replace( /attachment|wp-att-[0-9]+/gi, '' );
- t.I('link_rel').value = tinymce.trim(rel);
- }
- }
- },
-
- imgAlignCls : function(v) {
- var t = this, cls = t.I('img_classes').value;
-
- t.I('img_demo').className = t.align = v;
-
- cls = cls.replace( /align[^ "']+/gi, '' );
- cls += (' ' + v);
- cls = cls.replace( /\s+/g, ' ' ).replace( /^\s/, '' );
-
- if ( 'aligncenter' == v ) {
- t.I('hspace').value = '';
- t.updateStyle('hspace');
- }
-
- t.I('img_classes').value = cls;
- },
-
- showSize : function(el) {
- var t = this, demo = t.I('img_demo'), w = t.width, h = t.height, id = el.id || 's100', size;
-
- size = parseInt(id.substring(1)) / 200;
- demo.width = Math.round(w * size);
- demo.height = Math.round(h * size);
-
- t.showSizeClear();
- el.style.borderColor = '#A3A3A3';
- el.style.backgroundColor = '#E5E5E5';
- },
-
- showSizeSet : function() {
- var t = this;
-
- if ( (t.width * 1.3) > parseInt(t.preloadImg.width) ) {
- var s130 = t.I('s130'), s120 = t.I('s120'), s110 = t.I('s110');
-
- s130.onclick = s120.onclick = s110.onclick = null;
- s130.onmouseover = s120.onmouseover = s110.onmouseover = null;
- s130.style.color = s120.style.color = s110.style.color = '#aaa';
- }
- },
-
- showSizeRem : function() {
- var t = this, demo = t.I('img_demo'), f = document.forms[0];
-
- demo.width = Math.round(f.width.value * 0.5);
- demo.height = Math.round(f.height.value * 0.5);
- t.showSizeClear();
- t.I(t.current_size_sel).style.borderColor = '#A3A3A3';
- t.I(t.current_size_sel).style.backgroundColor = '#E5E5E5';
-
- return false;
- },
-
- showSizeClear : function() {
- var divs = this.I('img_size').getElementsByTagName('div');
-
- for ( i = 0; i < divs.length; i++ ) {
- divs[i].style.borderColor = '#f1f1f1';
- divs[i].style.backgroundColor = '#f1f1f1';
- }
- },
-
- imgEditSize : function(el) {
- var t = this, f = document.forms[0];
-
- if ( ! t.preloadImg || ! t.preloadImg.width || ! t.preloadImg.height ) return;
- var W = parseInt(t.preloadImg.width), H = parseInt(t.preloadImg.height), w = t.width || W, h = t.height || H, id = el.id || 's100';
-
- size = parseInt(id.substring(1)) / 100;
-
- w = Math.round(w * size);
- h = Math.round(h * size);
-
- f.width.value = Math.min(W, w);
- f.height.value = Math.min(H, h);
-
- t.current_size_sel = id;
- t.demoSetSize();
- },
-
- demoSetSize : function(img) {
- var demo = this.I('img_demo'), f = document.forms[0];
-
- demo.width = f.width.value ? Math.round(f.width.value * 0.5) : '';
- demo.height = f.height.value ? Math.round(f.height.value * 0.5) : '';
- },
-
- demoSetStyle : function() {
- var f = document.forms[0], demo = this.I('img_demo'), dom = tinyMCEPopup.editor.dom;
-
- if (demo) {
- dom.setAttrib(demo, 'style', f.img_style.value);
- dom.setStyle(demo, 'width', '');
- dom.setStyle(demo, 'height', '');
- }
- },
-
- origSize : function() {
- var t = this, f = document.forms[0], el = t.I('s100');
-
- f.width.value = t.width = t.preloadImg.width;
- f.height.value = t.height = t.preloadImg.height;
- t.showSizeSet();
- t.demoSetSize();
- t.showSize(el);
- },
-
- init : function() {
- var ed = tinyMCEPopup.editor, h;
-
- h = document.body.innerHTML;
-
- // Replace a=x with a="x" in IE
- if (tinymce.isIE)
- h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"')
-
- document.body.innerHTML = ed.translate(h);
- window.setTimeout( function(){wpImage.setup();}, 100 );
- },
-
- setup : function() {
- var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = '';
- document.dir = tinyMCEPopup.editor.getParam('directionality','');
-
- if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) )
- t.I('cap_field').style.display = 'none';
-
- tinyMCEPopup.restoreSelection();
- el = ed.selection.getNode();
- if (el.nodeName != 'IMG') return;
-
- f.img_src.value = d.src = link = ed.dom.getAttrib(el, 'src');
- ed.dom.setStyle(el, 'float', '');
- t.getImageData();
- c = ed.dom.getAttrib(el, 'class');
-
- if ( DL = dom.getParent(el, 'dl') ) {
- var dlc = ed.dom.getAttrib(DL, 'class');
- dlc = dlc.match(/align[^ "']+/i);
- if ( dlc && ! dom.hasClass(el, dlc) ) {
- c += ' '+dlc;
- tinymce.trim(c);
- }
-
- tinymce.each(DL.childNodes, function(e) {
- if ( e.nodeName == 'DD' && dom.hasClass(e, 'wp-caption-dd') ) {
- caption = e.innerHTML;
- return;
- }
- });
- }
-
- f.img_cap.value = caption;
- f.img_title.value = ed.dom.getAttrib(el, 'title');
- f.img_alt.value = ed.dom.getAttrib(el, 'alt');
- f.border.value = ed.dom.getAttrib(el, 'border');
- f.vspace.value = ed.dom.getAttrib(el, 'vspace');
- f.hspace.value = ed.dom.getAttrib(el, 'hspace');
- f.align.value = ed.dom.getAttrib(el, 'align');
- f.width.value = t.width = ed.dom.getAttrib(el, 'width');
- f.height.value = t.height = ed.dom.getAttrib(el, 'height');
- f.img_classes.value = c;
- f.img_style.value = ed.dom.getAttrib(el, 'style');
-
- // Move attribs to styles
- if (dom.getAttrib(el, 'hspace'))
- t.updateStyle('hspace');
-
- if (dom.getAttrib(el, 'border'))
- t.updateStyle('border');
-
- if (dom.getAttrib(el, 'vspace'))
- t.updateStyle('vspace');
-
- if (pa = ed.dom.getParent(el, 'A')) {
- f.link_href.value = t.current = ed.dom.getAttrib(pa, 'href');
- f.link_title.value = ed.dom.getAttrib(pa, 'title');
- f.link_rel.value = t.link_rel = ed.dom.getAttrib(pa, 'rel');
- f.link_style.value = ed.dom.getAttrib(pa, 'style');
- t.target_value = ed.dom.getAttrib(pa, 'target');
- f.link_classes.value = ed.dom.getAttrib(pa, 'class');
- }
-
- f.link_target.checked = ( t.target_value && t.target_value == '_blank' ) ? 'checked' : '';
-
- fname = link.substring( link.lastIndexOf('/') );
- fname = fname.replace(/-[0-9]{2,4}x[0-9]{2,4}/, '' );
- t.link = link.substring( 0, link.lastIndexOf('/') ) + fname;
-
- if ( c.indexOf('alignleft') != -1 ) {
- t.I('alignleft').checked = "checked";
- d.className = t.align = "alignleft";
- } else if ( c.indexOf('aligncenter') != -1 ) {
- t.I('aligncenter').checked = "checked";
- d.className = t.align = "aligncenter";
- } else if ( c.indexOf('alignright') != -1 ) {
- t.I('alignright').checked = "checked";
- d.className = t.align = "alignright";
- } else if ( c.indexOf('alignnone') != -1 ) {
- t.I('alignnone').checked = "checked";
- d.className = t.align = "alignnone";
- }
-
- if ( t.width && t.preloadImg.width ) t.showSizeSet();
- document.body.style.display = '';
- },
-
- remove : function() {
- var ed = tinyMCEPopup.editor, p, el;
-
- tinyMCEPopup.restoreSelection();
- el = ed.selection.getNode();
- if (el.nodeName != 'IMG') return;
-
- if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') )
- ed.dom.remove(p);
- else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 )
- ed.dom.remove(p);
- else ed.dom.remove(el);
-
- ed.execCommand('mceRepaint');
- tinyMCEPopup.close();
- return;
- },
-
- update : function() {
- var t = this, f = document.forms[0], ed = tinyMCEPopup.editor, el, b, fixSafari = null, DL, P, A, DIV, do_caption = null, img_class = f.img_classes.value, html;
-
- tinyMCEPopup.restoreSelection();
- el = ed.selection.getNode();
-
- if (el.nodeName != 'IMG') return;
- if (f.img_src.value === '') {
- t.remove();
- return;
- }
-
- if ( f.img_cap.value != '' && f.width.value != '' ) {
- do_caption = 1;
- img_class = img_class.replace( /align[^ "']+\s?/gi, '' );
- }
-
- A = ed.dom.getParent(el, 'a');
- P = ed.dom.getParent(el, 'p');
- DL = ed.dom.getParent(el, 'dl');
- DIV = ed.dom.getParent(el, 'div');
-
- tinyMCEPopup.execCommand("mceBeginUndoLevel");
-
- ed.dom.setAttribs(el, {
- src : f.img_src.value,
- title : f.img_title.value,
- alt : f.img_alt.value,
- width : f.width.value,
- height : f.height.value,
- style : f.img_style.value,
- 'class' : img_class
- });
-
- if ( f.link_href.value ) {
- // Create new anchor elements
- if ( A == null ) {
- if ( ! f.link_href.value.match(/https?:\/\//i) )
- f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value);
-
- if ( tinymce.isWebKit && ed.dom.hasClass(el, 'aligncenter') ) {
- ed.dom.removeClass(el, 'aligncenter');
- fixSafari = 1;
- }
-
- tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
- if ( fixSafari ) ed.dom.addClass(el, 'aligncenter');
-
- tinymce.each(ed.dom.select("a"), function(n) {
- if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
-
- ed.dom.setAttribs(n, {
- href : f.link_href.value,
- title : f.link_title.value,
- rel : f.link_rel.value,
- target : (f.link_target.checked == true) ? '_blank' : '',
- 'class' : f.link_classes.value,
- style : f.link_style.value
- });
- }
- });
- } else {
- ed.dom.setAttribs(A, {
- href : f.link_href.value,
- title : f.link_title.value,
- rel : f.link_rel.value,
- target : (f.link_target.checked == true) ? '_blank' : '',
- 'class' : f.link_classes.value,
- style : f.link_style.value
- });
- }
- }
-
- if ( do_caption ) {
- var id, cap_id = '', cap, DT, DD, cap_width = 10 + parseInt(f.width.value), align = t.align.substring(5), div_cls = (t.align == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp';
-
- if ( DL ) {
- ed.dom.setAttribs(DL, {
- 'class' : 'wp-caption '+t.align,
- style : 'width: '+cap_width+'px;'
- });
-
- if ( DIV )
- ed.dom.setAttrib(DIV, 'class', div_cls);
-
- if ( (DT = ed.dom.getParent(el, 'dt')) && (DD = DT.nextSibling) && ed.dom.hasClass(DD, 'wp-caption-dd') )
- ed.dom.setHTML(DD, f.img_cap.value);
-
- } else {
- var lnk = '', pa;
- if ( (id = f.img_classes.value.match( /wp-image-([0-9]{1,6})/ )) && id[1] )
- cap_id = 'attachment_'+id[1];
-
- if ( f.link_href.value && (lnk = ed.dom.getParent(el, 'a')) ) {
- if ( lnk.childNodes.length == 1 )
- html = ed.dom.getOuterHTML(lnk);
- else {
- html = ed.dom.getOuterHTML(lnk);
- html = html.match(/<a[^>]+>/i);
- html = html+ed.dom.getOuterHTML(el)+'</a>';
- }
- } else html = ed.dom.getOuterHTML(el);
-
- html = '<dl id="'+cap_id+'" class="wp-caption '+t.align+'" style="width: '+cap_width+
- 'px"><dt class="wp-caption-dt">'+html+'</dt><dd class="wp-caption-dd">'+f.img_cap.value+'</dd></dl>';
-
- cap = ed.dom.create('div', {'class': div_cls}, html);
-
- if ( P ) {
- P.parentNode.insertBefore(cap, P);
- if ( P.childNodes.length == 1 )
- ed.dom.remove(P);
- else if ( lnk && lnk.childNodes.length == 1 )
- ed.dom.remove(lnk);
- else ed.dom.remove(el);
- } else if ( pa = ed.dom.getParent(el, 'TD,TH,LI') ) {
- pa.appendChild(cap);
- if ( lnk && lnk.childNodes.length == 1 )
- ed.dom.remove(lnk);
- else ed.dom.remove(el);
- }
- }
-
- } else {
- if ( DL && DIV ) {
- var aa;
- if ( f.link_href.value && (aa = ed.dom.getParent(el, 'a')) ) html = ed.dom.getOuterHTML(aa);
- else html = ed.dom.getOuterHTML(el);
-
- P = ed.dom.create('p', {}, html);
- DIV.parentNode.insertBefore(P, DIV);
- ed.dom.remove(DIV);
- }
- }
-
- if ( f.img_classes.value.indexOf('aligncenter') != -1 ) {
- if ( P && ( ! P.style || P.style.textAlign != 'center' ) )
- ed.dom.setStyle(P, 'textAlign', 'center');
- } else {
- if ( P && P.style && P.style.textAlign == 'center' )
- ed.dom.setStyle(P, 'textAlign', '');
- }
-
- if ( ! f.link_href.value && A ) {
- b = ed.selection.getBookmark();
- ed.dom.remove(A, 1);
- ed.selection.moveToBookmark(b);
- }
-
- tinyMCEPopup.execCommand("mceEndUndoLevel");
- ed.execCommand('mceRepaint');
- tinyMCEPopup.close();
- },
-
- updateStyle : function(ty) {
- var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : f.img_style.value});
-
- if (tinyMCEPopup.editor.settings.inline_styles) {
- // Handle align
- if (ty == 'align') {
- dom.setStyle(img, 'float', '');
- dom.setStyle(img, 'vertical-align', '');
-
- v = f.align.value;
- if (v) {
- if (v == 'left' || v == 'right')
- dom.setStyle(img, 'float', v);
- else
- img.style.verticalAlign = v;
- }
- }
-
- // Handle border
- if (ty == 'border') {
- dom.setStyle(img, 'border', '');
-
- v = f.border.value;
- if (v || v == '0') {
- if (v == '0')
- img.style.border = '0';
- else
- img.style.border = v + 'px solid black';
- }
- }
-
- // Handle hspace
- if (ty == 'hspace') {
- dom.setStyle(img, 'marginLeft', '');
- dom.setStyle(img, 'marginRight', '');
-
- v = f.hspace.value;
- if (v) {
- img.style.marginLeft = v + 'px';
- img.style.marginRight = v + 'px';
- }
- }
-
- // Handle vspace
- if (ty == 'vspace') {
- dom.setStyle(img, 'marginTop', '');
- dom.setStyle(img, 'marginBottom', '');
-
- v = f.vspace.value;
- if (v) {
- img.style.marginTop = v + 'px';
- img.style.marginBottom = v + 'px';
- }
- }
-
- // Merge
- f.img_style.value = dom.serializeStyle(dom.parseStyle(img.style.cssText));
- this.demoSetStyle();
- }
- },
-
- checkVal : function(f) {
-
- if ( f.value == '' ) {
- // if ( f.id == 'width' ) f.value = this.width || this.preloadImg.width;
- // if ( f.id == 'height' ) f.value = this.height || this.preloadImg.height;
- if ( f.id == 'img_src' ) f.value = this.I('img_demo').src || this.preloadImg.src;
- }
- },
-
- resetImageData : function() {
- var f = document.forms[0];
-
- f.width.value = f.height.value = '';
- },
-
- updateImageData : function() {
- var f = document.forms[0], t = wpImage;
-
- if ( f.width.value == '' || f.height.value == '' ) {
- f.width.value = t.width = t.preloadImg.width;
- f.height.value = t.height = t.preloadImg.height;
- }
-
- t.showSizeSet();
- t.demoSetSize();
- if ( f.img_style.value )
- t.demoSetStyle();
- },
-
- getImageData : function() {
- var t = wpImage, f = document.forms[0];
-
- t.preloadImg = new Image();
- t.preloadImg.onload = t.updateImageData;
- t.preloadImg.onerror = t.resetImageData;
- t.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.img_src.value);
- }
-};
-
-window.onload = function(){wpImage.init();}
-wpImage.preInit();
</del><ins>+var tinymce=null,tinyMCEPopup,tinyMCE,wpImage;tinyMCEPopup={init:function(){var d=this,b,a,f,c,e;a=(""+document.location.search).replace(/^\?/,"").split("&");f={};for(c=0;c<a.length;c++){e=a[c].split("=");f[unescape(e[0])]=unescape(e[1])}if(f.mce_rdomain){document.domain=f.mce_rdomain}b=d.getWin();tinymce=b.tinymce;tinyMCE=b.tinyMCE;d.editor=tinymce.EditorManager.activeEditor;d.params=d.editor.windowManager.params;d.dom=d.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);d.editor.windowManager.onOpen.dispatch(d.editor.windowManager,window)},getWin:function(){return window.dialogArguments||opener||parent||top},getParam:function(b,a){return this.editor.getParam(b,a)},close:function(){var a=this,b=a.getWin();function c(){b.tb_remove();tinymce=tinyMCE=a.editor=a.dom=a.dom.doc=null}if(tinymce.isOpera){b.setTimeout(c,0)}else{c()}},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark("simple")},restoreSelection:function(){var a=tinyMCEPopup;if(tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}}};tinyMCEPopup.init();wpImage={preInit:function(){var d=tinyMCEPopup.getWin(),c=d.document.styleSheets,a,b;for(b=0;b<c.length;b++){a=c.item(b).href;if(a&&a.indexOf("colors")!=-1){document.write('<link rel="stylesheet" href="'+a+'" type="text/css" media="all" />')}}},I:function(a){return document.getElementById(a)},current:"",link:"",link_rel:"",target_value:"",current_size_sel:"s100",width:"",height:"",align:"",img_alt:"",setTabs:function(b){var a=this;if("current"==b.className){return false}a.I("div_advanced").style.display=("tab_advanced"==b.id)?"block":"none";a.I("div_basic").style.display=("tab_basic"==b.id)?"block":"none";a.I("tab_basic").className=a.I("tab_advanced").className="";b.className="current";return false},img_seturl:function(b){var c=this,a=c.I("link_rel").value;if("current"==b){c.I("link_href").value=c.current;c.I("link_rel").value=c.link_rel}else{c.I("link_href").value=c.link;if(a){a=a.replace(/attachment|wp-att-[0-9]+/gi,"");c.I("link_rel").value=tinymce.trim(a)}}},imgAlignCls:function(b){var c=this,a=c.I("img_classes").value;c.I("img_demo").className=c.align=b;a=a.replace(/align[^ "']+/gi,"");a+=(" "+b);a=a.replace(/\s+/g," ").replace(/^\s/,"");if("aligncenter"==b){c.I("hspace").value="";c.updateStyle("hspace")}c.I("img_classes").value=a},showSize:function(e){var c=this,f=c.I("img_demo"),a=c.width,d=c.height,g=e.id||"s100",b;b=parseInt(g.substring(1))/200;f.width=Math.round(a*b);f.height=Math.round(d*b);c.showSizeClear();e.style.borderColor="#A3A3A3";e.style.backgroundColor="#E5E5E5"},showSizeSet:function(){var b=this,d,c,a;if((b.width*1.3)>parseInt(b.preloadImg.width)){d=b.I("s130"),c=b.I("s120"),a=b.I("s110");d.onclick=c.onclick=a.onclick=null;d.onmouseover=c.onmouseover=a.onmouseover=null;d.style.color=c.style.color=a.style.color="#aaa"}},showSizeRem:function(){var a=this,c=a.I("img_demo"),b=document.forms[0];c.width=Math.round(b.width.value*0.5);c.height=Math.round(b.height.value*0.5);a.showSizeClear();a.I(a.current_size_sel).style.borderColor="#A3A3A3";a.I(a.current_size_sel).style.backgroundColor="#E5E5E5";return false},showSizeClear:function(){var b=this.I("img_size").getElementsByTagName("div"),a;for(a=0;a<b.length;a++){b[a].style.borderColor="#f1f1f1";b[a].style.backgroundColor="#f1f1f1"}},imgEditSize:function(g){var d=this,i=document.forms[0],a,c,b,e,j;if(!d.preloadImg||!d.preloadImg.width||!d.preloadImg.height){return}a=parseInt(d.preloadImg.width),c=parseInt(d.preloadImg.height),b=d.width||a,e=d.height||c,j=g.id||"s100";size=parseInt(j.substring(1))/100;b=Math.round(b*size);e=Math.round(e*size);i.width.value=Math.min(a,b);i.height.value=Math.min(c,e);d.current_size_sel=j;d.demoSetSize()},demoSetSize:function(a){var c=this.I("img_demo"),b=document.forms[0];c.width=b.width.value?Math.round(b.width.value*0.5):"";c.height=b.height.value?Math.round(b.height.value*0.5):""},demoSetStyle:function(){var b=document.forms[0],a=this.I("img_demo"),c=tinyMCEPopup.editor.dom;if(a){c.setAttrib(a,"style",b.img_style.value);c.setStyle(a,"width","");c.setStyle(a,"height","")}},origSize:function(){var a=this,c=document.forms[0],b=a.I("s100");c.width.value=a.width=a.preloadImg.width;c.height.value=a.height=a.preloadImg.height;a.showSizeSet();a.demoSetSize();a.showSize(b)},init:function(){var a=tinyMCEPopup.editor,b;b=document.body.innerHTML;document.body.innerHTML=a.translate(b);window.setTimeout(function(){wpImage.setup()},500)},setup:function(){var p=this,k,b,l,e,i=document.forms[0],h=tinyMCEPopup.editor,j=p.I("img_demo"),g=tinyMCEPopup.dom,a,o="",n,m;document.dir=tinyMCEPopup.editor.getParam("directionality","");if(tinyMCEPopup.editor.getParam("wpeditimage_disable_captions",false)){p.I("cap_field").style.display="none"}tinyMCEPopup.restoreSelection();b=h.selection.getNode();if(b.nodeName!="IMG"){return}i.img_src.value=j.src=l=h.dom.getAttrib(b,"src");h.dom.setStyle(b,"float","");p.getImageData();k=h.dom.getAttrib(b,"class");if(a=g.getParent(b,"dl")){n=h.dom.getAttrib(a,"class");n=n.match(/align[^ "']+/i);if(n&&!g.hasClass(b,n)){k+=" "+n;tinymce.trim(k)}tinymce.each(a.childNodes,function(c){if(c.nodeName=="DD"&&g.hasClass(c,"wp-caption-dd")){o=c.innerHTML;return}})}i.img_cap.value=o;i.img_title.value=h.dom.getAttrib(b,"title");i.img_alt.value=h.dom.getAttrib(b,"alt");i.border.value=h.dom.getAttrib(b,"border");i.vspace.value=h.dom.getAttrib(b,"vspace");i.hspace.value=h.dom.getAttrib(b,"hspace");i.align.value=h.dom.getAttrib(b,"align");i.width.value=p.width=h.dom.getAttrib(b,"width");i.height.value=p.height=h.dom.getAttrib(b,"height");i.img_classes.value=k;i.img_style.value=h.dom.getAttrib(b,"style");if(g.getAttrib(b,"hspace")){p.updateStyle("hspace")}if(g.getAttrib(b,"border")){p.updateStyle("border")}if(g.getAttrib(b,"vspace")){p.updateStyle("vspace")}if(m=h.dom.getParent(b,"A")){i.link_href.value=p.current=h.dom.getAttrib(m,"href");i.link_title.value=h.dom.getAttrib(m,"title");i.link_rel.value=p.link_rel=h.dom.getAttrib(m,"rel");i.link_style.value=h.dom.getAttrib(m,"style");p.target_value=h.dom.getAttrib(m,"target");i.link_classes.value=h.dom.getAttrib(m,"class")}i.link_target.checked=(p.target_value&&p.target_value=="_blank")?"checked":"";e=l.substring(l.lastIndexOf("/"));e=e.replace(/-[0-9]{2,4}x[0-9]{2,4}/,"");p.link=l.substring(0,l.lastIndexOf("/"))+e;if(k.indexOf("alignleft")!=-1){p.I("alignleft").checked="checked";j.className=p.align="alignleft"}else{if(k.indexOf("aligncenter")!=-1){p.I("aligncenter").checked="checked";j.className=p.align="aligncenter"}else{if(k.indexOf("alignright")!=-1){p.I("alignright").checked="checked";j.className=p.align="alignright"}else{if(k.indexOf("alignnone")!=-1){p.I("alignnone").checked="checked";j.className=p.align="alignnone"}}}}if(p.width&&p.preloadImg.width){p.showSizeSet()}document.body.style.display=""},remove:function(){var a=tinyMCEPopup.editor,c,b;tinyMCEPopup.restoreSelection();b=a.selection.getNode();if(b.nodeName!="IMG"){return}if((c=a.dom.getParent(b,"div"))&&a.dom.hasClass(c,"mceTemp")){a.dom.remove(c)}else{if((c=a.dom.getParent(b,"A"))&&c.childNodes.length==1){a.dom.remove(c)}else{a.dom.remove(b)}}a.execCommand("mceRepaint");tinyMCEPopup.close();return},update:function(){var m=this,v=document.forms[0],g=tinyMCEPopup.editor,e,x,d=null,n,h,p,r,o=null,k=v.img_classes.value,l,q,u="",j,i,s,a,z,w="",c,y;tinyMCEPopup.restoreSelection();e=g.selection.getNode();if(e.nodeName!="IMG"){return}if(v.img_src.value===""){m.remove();return}if(v.img_cap.value!=""&&v.width.value!=""){o=1;k=k.replace(/align[^ "']+\s?/gi,"")}p=g.dom.getParent(e,"a");h=g.dom.getParent(e,"p");n=g.dom.getParent(e,"dl");r=g.dom.getParent(e,"div");tinyMCEPopup.execCommand("mceBeginUndoLevel");g.dom.setAttribs(e,{src:v.img_src.value,title:v.img_title.value,alt:v.img_alt.value,width:v.width.value,height:v.height.value,style:v.img_style.value,"class":k});if(v.link_href.value){if(p==null){if(!v.link_href.value.match(/https?:\/\//i)){v.link_href.value=tinyMCEPopup.editor.documentBaseURI.toAbsolute(v.link_href.value)}if(tinymce.isWebKit&&g.dom.hasClass(e,"aligncenter")){g.dom.removeClass(e,"aligncenter");d=1}tinyMCEPopup.execCommand("CreateLink",false,"#mce_temp_url#",{skip_undo:1});if(d){g.dom.addClass(e,"aligncenter")}tinymce.each(g.dom.select("a"),function(b){if(g.dom.getAttrib(b,"href")=="#mce_temp_url#"){g.dom.setAttribs(b,{href:v.link_href.value,title:v.link_title.value,rel:v.link_rel.value,target:(v.link_target.checked==true)?"_blank":"","class":v.link_classes.value,style:v.link_style.value})}})}else{g.dom.setAttribs(p,{href:v.link_href.value,title:v.link_title.value,rel:v.link_rel.value,target:(v.link_target.checked==true)?"_blank":"","class":v.link_classes.value,style:v.link_style.value})}}if(o){a=10+parseInt(v.width.value);z=(m.align=="aligncenter")?"mceTemp mceIEcenter":"mceTemp";if(n){g.dom.setAttribs(n,{"class":"wp-caption "+m.align,style:"width: "+a+"px;"});if(r){g.dom.setAttrib(r,"class",z)}if((i=g.dom.getParent(e,"dt"))&&(s=i.nextSibling)&&g.dom.hasClass(s,"wp-caption-dd")){g.dom.setHTML(s,v.img_cap.value)}}else{if((q=v.img_classes.value.match(/wp-image-([0-9]{1,6})/))&&q[1]){u="attachment_"+q[1]}if(v.link_href.value&&(w=g.dom.getParent(e,"a"))){if(w.childNodes.length==1){l=g.dom.getOuterHTML(w)}else{l=g.dom.getOuterHTML(w);l=l.match(/<a[^>]+>/i);l=l+g.dom.getOuterHTML(e)+"</a>"}}else{l=g.dom.getOuterHTML(e)}l='<dl id="'+u+'" class="wp-caption '+m.align+'" style="width: '+a+'px"><dt class="wp-caption-dt">'+l+'</dt><dd class="wp-caption-dd">'+v.img_cap.value+"</dd></dl>";j=g.dom.create("div",{"class":z},l);if(h){h.parentNode.insertBefore(j,h);if(h.childNodes.length==1){g.dom.remove(h)}else{if(w&&w.childNodes.length==1){g.dom.remove(w)}else{g.dom.remove(e)}}}else{if(c=g.dom.getParent(e,"TD,TH,LI")){c.appendChild(j);if(w&&w.childNodes.length==1){g.dom.remove(w)}else{g.dom.remove(e)}}}}}else{if(n&&r){if(v.link_href.value&&(y=g.dom.getParent(e,"a"))){l=g.dom.getOuterHTML(y)}else{l=g.dom.getOuterHTML(e)}h=g.dom.create("p",{},l);r.parentNode.insertBefore(h,r);g.dom.remove(r)}}if(v.img_classes.value.indexOf("aligncenter")!=-1){if(h&&(!h.style||h.style.textAlign!="center")){g.dom.setStyle(h,"textAlign","center")}}else{if(h&&h.style&&h.style.textAlign=="center"){g.dom.setStyle(h,"textAlign","")}}if(!v.link_href.value&&p){x=g.selection.getBookmark();g.dom.remove(p,1);g.selection.moveToBookmark(x)}tinyMCEPopup.execCommand("mceEndUndoLevel");g.execCommand("mceRepaint");tinyMCEPopup.close()},updateStyle:function(a){var e=tinyMCEPopup.dom,c,d=document.forms[0],b=e.create("img",{style:d.img_style.value});if(tinyMCEPopup.editor.settings.inline_styles){if(a=="align"){e.setStyle(b,"float","");e.setStyle(b,"vertical-align","");c=d.align.value;if(c){if(c=="left"||c=="right"){e.setStyle(b,"float",c)}else{b.style.verticalAlign=c}}}if(a=="border"){e.setStyle(b,"border","");c=d.border.value;if(c||c=="0"){if(c=="0"){b.style.border="0"}else{b.style.border=c+"px solid black"}}}if(a=="hspace"){e.setStyle(b,"marginLeft","");e.setStyle(b,"marginRight","");c=d.hspace.value;if(c){b.style.marginLeft=c+"px";b.style.marginRight=c+"px"}}if(a=="vspace"){e.setStyle(b,"marginTop","");e.setStyle(b,"marginBottom","");c=d.vspace.value;if(c){b.style.marginTop=c+"px";b.style.marginBottom=c+"px"}}d.img_style.value=e.serializeStyle(e.parseStyle(b.style.cssText));this.demoSetStyle()}},checkVal:function(a){if(a.value==""){if(a.id=="img_src"){a.value=this.I("img_demo").src||this.preloadImg.src}}},resetImageData:function(){var a=document.forms[0];a.width.value=a.height.value=""},updateImageData:function(){var d=document.forms[0],b=wpImage,a=d.width.value,c=d.height.value;if(!a&&c){a=d.width.value=b.width=Math.round(b.preloadImg.width/(b.preloadImg.height/c))}else{if(a&&!c){c=d.height.value=b.height=Math.round(b.preloadImg.height/(b.preloadImg.width/a))}}if(!a){d.width.value=b.width=b.preloadImg.width}if(!c){d.height.value=b.height=b.preloadImg.height}b.showSizeSet();b.demoSetSize();if(d.img_style.value){b.demoSetStyle()}},getImageData:function(){var a=wpImage,b=document.forms[0];a.preloadImg=new Image();a.preloadImg.onload=a.updateImageData;a.preloadImg.onerror=a.resetImageData;a.preloadImg.src=tinyMCEPopup.editor.documentBaseURI.toAbsolute(b.img_src.value)}};window.onload=function(){wpImage.init()};wpImage.preInit();
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>