vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-16 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Image caption fixes from azaozz: captions are properly created in tables and in lists, all tags are properly removed when deleting a caption, the align buttons can be used to align the captions. see #6812

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@8260 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-07-06 16:38:37 +00:00
parent 3373e4334e
commit 7dccf2c37c
6 changed files with 106 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
+12 -26
View File
@@ -21,16 +21,16 @@
ed.onInit.add(function(ed) {
tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) {
ed.plugins.wpeditimage.hideButtons();
ed.plugins.wpeditimage.hideButtons();
});
});
ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) {
ed.plugins.wpeditimage.hideButtons();
});
});
ed.onSaveContent.add(function(ed, o) {
ed.plugins.wpeditimage.hideButtons();
ed.plugins.wpeditimage.hideButtons();
});
ed.onMouseUp.add(function(ed, e) {
@@ -63,8 +63,8 @@
});
ed.onBeforeSetContent.add(function(ed, o) {
o.content = t._do_shcode(o.content);
});
o.content = t._do_shcode(o.content);
});
ed.onPostProcess.add(function(ed, o) {
if (o.get)
@@ -74,8 +74,8 @@
_do_shcode : function(co) {
return co.replace(/\[wp_caption([^\]]+)\]([\s\S]+?)\[\/wp_caption\][\s\u00a0]*/g, function(a,b,c){
var id = b.match(/id=['"]([^'"]+)/), cls = b.match(/align=['"]([^'"]+)/);
var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/);
var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/align=['"]([^'"]+)/i);
var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/i);
id = ( id && id[1] ) ? id[1] : '';
cls = ( cls && cls[1] ) ? cls[1] : 'alignnone';
@@ -91,8 +91,8 @@
},
_get_shcode : function(co) {
return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>([^<]+)<\/dd>\s*<\/dl>\s*<\/div>\s*/g, function(a,b,c,cap){
var id = b.match(/id=['"]([^'"]+)/), cls = b.match(/class=['"]([^'"]+)/);
return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>([^<]+)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){
var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/class=['"]([^'"]+)/i);
var w = c.match(/width=['"]([0-9]+)/);
id = ( id && id[1] ) ? id[1] : '';
@@ -100,26 +100,12 @@
w = ( w && w[1] ) ? w[1] : '';
if ( ! w || ! cap ) return c;
cls = cls ? cls.match(/align[^ '"]+/) : '';
cls = cls.match(/align[^ '"]+/) || 'alignnone';
return '[wp_caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/wp_caption]';
});
},
_fixCenter : function(c) {
var ed = tinyMCE.activeEditor;
tinymce.each(ed.dom.select('img', c), function(n) {
if ( ed.dom.hasClass(n, 'aligncenter') ) {
var P = ed.dom.getParent(n, 'p');
if ( tinymce.isIE )
ed.dom.addClass(P, 'mce_iecenter');
if ( P.style && P.style.textAlign == 'center' )
ed.dom.setStyle(P, 'textAlign', '');
}
});
},
showButtons : function(n) {
var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y;
@@ -172,7 +158,7 @@
ed.windowManager.bookmark = ed.selection.getBookmark('simple');
ed.execCommand("WP_EditImage");
this.parentNode.style.display = 'none';
}
};
var wp_delimgbtn = DOM.add('wp_editbtns', 'img', {
src : t.url+'/img/delete.png',
@@ -196,7 +182,7 @@
ed.execCommand('mceRepaint');
return false;
}
}
};
},
getInfo : function() {
wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js
+35 -21
View File
@@ -260,11 +260,11 @@ var wpImage = {
if ( DL = dom.getParent(el, 'dl') ) {
var dlc = ed.dom.getAttrib(DL, 'class');
dlc = dlc.match(/align[^ "']+/i);
if ( ! dom.hasClass(el, dlc) )
if ( dlc && ! dom.hasClass(el, dlc) )
c += ' '+dlc;
tinymce.each(DL.childNodes, function(e) {
if ( e.nodeName == 'DD' ) {
if ( e.nodeName == 'DD' && dom.hasClass(e, 'wp_caption_dd') ) {
caption = e.innerHTML;
return;
}
@@ -377,16 +377,10 @@ var wpImage = {
'class' : img_class
});
if ( ! f.link_href.value ) {
if ( A ) {
b = ed.selection.getBookmark();
ed.dom.remove(A, 1);
ed.selection.moveToBookmark(b);
}
} else {
if ( f.link_href.value ) {
// Create new anchor elements
if ( A == null ) {
if ( ! f.link_href.value.match(/https?:\/\//) )
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') ) {
@@ -431,18 +425,26 @@ var wpImage = {
style : 'width: '+cap_width+'px;'
});
if ( DIV )
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_alt.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 ) html = ed.dom.getOuterHTML(ed.dom.getParent(el, 'a'));
else html = ed.dom.getOuterHTML(el);
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_alt.value+'</dd></dl>';
@@ -451,19 +453,25 @@ var wpImage = {
if ( P ) {
P.parentNode.insertBefore(cap, P);
ed.dom.remove(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);
}
}
tinyMCEPopup.execCommand("mceEndUndoLevel");
ed.execCommand('mceRepaint');
tinyMCEPopup.close();
return;
} else {
if ( DL && DIV ) {
if ( f.link_href.value ) html = ed.dom.getOuterHTML(ed.dom.getParent(el, 'a'));
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);
@@ -478,6 +486,12 @@ var wpImage = {
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();