From 443ab3001e01ebb53603595c0f6b044694b79a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= Date: Thu, 27 Mar 2014 07:02:16 +0000 Subject: [PATCH] MCE view controls: * Move controls back over to the left, as they were before. Wide images and muscle memory have been causing frustration. * Improve the experience and unify the UI of media view controls. Audio and video views now require an initial click to select before further interaction. * CSS clean up and organization. fixes #27320, #27542. Built from https://develop.svn.wordpress.org/trunk@27777 git-svn-id: http://core.svn.wordpress.org/trunk@27614 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wpeditimage/plugin.js | 2 +- .../tinymce/plugins/wpeditimage/plugin.min.js | 2 +- .../js/tinymce/skins/wordpress/wp-content.css | 86 +++++++++--------- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 121067 -> 121060 bytes wp-includes/media-template.php | 3 + 5 files changed, 47 insertions(+), 46 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 3ba19b47bc..962360d875 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -369,7 +369,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { dom.setStyles( toolbar, { top: rectangle.y, - left: rectangle.x + rectangle.w - toolbarSize.w + left: rectangle.x }); } diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index 8278033506..9eb361f17f 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wpeditimage",function(a){function b(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j,k=tinymce.trim;return e=c.match(/id=['"]([^'"]*)['"] ?/),e&&(c=c.replace(e[0],"")),f=c.match(/align=['"]([^'"]*)['"] ?/),f&&(c=c.replace(f[0],"")),g=c.match(/width=['"]([0-9]*)['"] ?/),g&&(c=c.replace(g[0],"")),d=k(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=k(i[2]),i=k(i[1])):(h=k(c).replace(/caption=['"]/,"").replace(/['"]$/,""),i=d),e=e&&e[1]?e[1]:"",f=f&&f[1]?f[1]:"alignnone",!g&&i&&(g=i.match(/width=['"]([0-9]*)['"]/)),g&&g[1]&&(g=g[1]),g&&h?(j=parseInt(g,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'

'+i+'
'+h+"
"):d})}function c(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"

"+c[1]+"

":""):(c=b.replace(/
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi,function(a,b,c,d){var e,f,g;return g=c.match(/width="([0-9]*)"/),g=g&&g[1]?g[1]:"",g&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",f=f.match(/align[a-z]+/)||"alignnone",d=d.replace(/\r\n|\r/g,"\n").replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),d=d.replace(/\s*\n\s*/g,"
"),'[caption id="'+e+'" align="'+f+'" width="'+g+'"]'+c+" "+d+"[/caption]"):c}),0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

[\s\S]*<\/p>)?[\s\S]*/gi,"

$1

$2")),c)})}function d(b){var c,d,e,f,g=a.dom;return d={attachment_id:!1,url:!1,height:"",width:"",size:"none",caption:"",alt:"",align:"none",link:!1,linkUrl:""},d.url=g.getAttrib(b,"src"),d.alt=g.getAttrib(b,"alt"),d.width=parseInt(g.getAttrib(b,"width"),10),d.height=parseInt(g.getAttrib(b,"height"),10),c=b.className.split(" "),tinymce.each(c,function(a){/^wp-image/.test(a)&&(d.attachment_id=parseInt(a.replace("wp-image-",""),10)),/^align/.test(a)&&(d.align=a.replace("align","")),/^size/.test(a)&&(d.size=a.replace("size-",""))}),e=g.getParents(b,".wp-caption"),e.length&&(e=e[0],c=e.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)&&(d.align=a.replace("align",""))}),f=g.select("dd.wp-caption-dd",e),f.length&&(f=f[0],d.caption=a.serializer.serialize(f).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(d.linkUrl=g.getAttrib(b.parentNode,"href")),d}function e(b,c){var d,e,g,h,j,k,l,m,n;c.caption?(h=f(c,"html"),e=parseInt(c.width,10),a.getParam("wpeditimage_html5_captions")||(e+=10),d="align"+c.align,n=c.attachment_id?'id="attachment_'+c.attachment_id+'" ':"",h="

'+h+'
'+c.caption+"
",g=a.dom.create("div",{"class":"mceTemp"},h)):g=f(c,"node"),k=b,j=a.dom.getParent(b,".mceTemp"),j?k=j:"A"===b.parentNode.nodeName&&(k=b.parentNode),l=a.dom.uniqueId("wp_"),a.dom.setAttrib(g,"data-wp-replace-id",l),a.dom.replace(g,k),g=a.dom.select('[data-wp-replace-id="'+l+'"]')[0],a.dom.setAttrib(g,"data-wp-replace-id",""),a.nodeChanged(),m="IMG"===g.nodeName?g:a.dom.select("img",g)[0],m&&(a.selection.select(m),i(m))}function f(b,c){var d,e=[];if(c=c?c:"node",b.caption||e.push("align"+b.align),b.attachment_id&&(e.push("wp-image-"+b.attachment_id),b.size&&e.push("size-"+b.size)),d={src:b.url,width:b.width,height:b.height,alt:b.alt},e.length&&(d["class"]=e.join(" ")),b.linkUrl){if("node"===c)return a.dom.create("a",{href:b.linkUrl},a.dom.createHTML("img",d));if("html"===c)return a.dom.createHTML("a",{href:b.linkUrl},a.dom.createHTML("img",d))}else{if("node"===c)return a.dom.create("img",d);if("html"===c)return a.dom.createHTML("img",d)}}function g(b){var c,f;return"undefined"!=typeof wp&&wp.media?(a.undoManager.add(),c=wp.media({frame:"image",state:"image-details",metadata:d(b)}),f=function(d){e(b,d),a.focus(),c.detach()},c.state("image-details").on("update",f),c.state("replace-image").on("replace",f),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function h(b){var c;"DIV"===b.nodeName&&a.dom.hasClass(b,"mceTemp")?c=b:("IMG"===b.nodeName||"DT"===b.nodeName||"A"===b.nodeName)&&(c=a.dom.getParent(b,"div.mceTemp")),c?(a.selection.select(c.nextSibling?c.nextSibling:c.previousSibling?c.previousSibling:c.parentNode),a.selection.collapse(!0),a.nodeChanged(),a.dom.remove(c)):a.dom.remove(b)}function i(b){var c,d,e,f,g=a.dom;j(),b&&"IMG"===b.nodeName&&!k(b)&&(g.setAttrib(b,"data-wp-imgselect",1),c=g.getRect(b),d='
',e=g.create("div",{id:"wp-image-toolbar","data-mce-bogus":"1",contenteditable:!1},d),a.getBody().appendChild(e),f=g.getSize(e),g.setStyles(e,{top:c.y,left:c.x+c.w-f.w}))}function j(){var b=a.dom.get("wp-image-toolbar");b&&a.dom.remove(b),a.dom.setAttrib(a.dom.select("img[data-wp-imgselect]"),"data-wp-imgselect",null)}function k(b){var c=a.dom;return c.hasClass(b,"mceItem")||c.getAttrib(b,"data-mce-placeholder")||c.getAttrib(b,"data-mce-object")?!0:!1}return a.on("init",function(){var b=a.dom,c=a.getParam("wpeditimage_html5_captions")?"html5-captions":"html4-captions";b.addClass(a.getBody(),c),a.on("wpLoadImageForm",function(b){if(!a.getParam("wpeditimage_disable_captions")){var c={type:"textbox",flex:1,name:"caption",minHeight:60,multiline:!0,scroll:!0,label:"Image caption"};b.data.splice(b.data.length-1,0,c)}}),a.on("wpNewImageRefresh",function(a){var c,d;(c=b.getParent(a.node,"dl.wp-caption"))&&(c.style.width||(d=parseInt(a.node.clientWidth,10)+10,d=d?d+"px":"50%",b.setStyle(c,"width",d)))}),a.on("wpImageFormSubmit",function(c){var d,e,f,g,h,i=c.imgData.data,j=c.imgData.node,k=c.imgData.caption,l="",m="",n="";return i.id="__wp-temp-img-id",c.imgData.cancel=!0,i.style||(i.style=null),i.src?(k&&(k=k.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),k=k.replace(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
")),j?(h=j.id||null,b.setAttribs(j,i),d=b.getParent(j,"dl.wp-caption"),k?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=k):(j.className&&(l=j.className.match(/wp-image-([0-9]+)/),m=j.className.match(/align(left|right|center|none)/)),m?(m=m[0],j.className=j.className.replace(/align(left|right|center|none)/g,"")):m="alignnone",m=' class="wp-caption '+m+'"',l&&(l=' id="attachment_'+l[1]+'"'),n=i.width||j.clientWidth,n&&(n=parseInt(n,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),j.parentNode&&"A"===j.parentNode.nodeName?(g=b.getOuterHTML(j.parentNode),f=j.parentNode):(g=b.getOuterHTML(j),f=j),g="
'+g+'
'+k+"
",(e=b.getParent(j,"p"))?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.remove(f),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):d&&(g=b.getOuterHTML("A"===j.parentNode.nodeName?j.parentNode:j),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=b.createHTML("img",i),k?(f=a.selection.getNode(),i.width&&(n=parseInt(i.width,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),g='
'+g+'
'+k+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):a.selection.setContent(g)),j=b.get("__wp-temp-img-id"),b.setAttrib(j,"id",h),void(c.imgData.node=j)):void(j&&(b.remove((d=b.getParent(j,"div.mceTemp"))?d:"A"===j.parentNode.nodeName?j.parentNode:j),a.nodeChanged()))}),a.on("wpLoadImageData",function(c){var d,e=c.imgData.data,f=c.imgData.node;(d=b.getParent(f,"dl.wp-caption"))&&(d=b.select("dd.wp-caption-dd",d)[0],d&&(e.caption=a.serializer.serialize(d).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault(),j()}),tinymce.Env.ie&&tinymce.Env.ie>10&&(b.bind(a.getBody(),"mscontrolselect",function(c){"IMG"===c.target.nodeName&&b.getParent(c.target,".wp-caption")?a.getBody().focus():"DL"===c.target.nodeName&&b.hasClass(c.target,"wp-caption")&&c.target.focus()}),a.on("click",function(c){"IMG"===c.target.nodeName&&b.getAttrib(c.target,"data-wp-imgselect")&&b.getParent(c.target,"dl.wp-caption")&&a.getBody().focus()}))}),a.on("ObjectResized",function(b){var c,d,e=b.target,f=a.dom;"IMG"===e.nodeName&&(e.className=e.className.replace(/\bsize-[^ ]+/,""),(c=f.getParent(e,".wp-caption"))&&(d=b.width||f.getAttrib(e,"width"),d&&(d=parseInt(d,10),a.getParam("wpeditimage_html5_captions")||(d+=10),f.setStyle(c,"width",d+"px"))),i(e))}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g=b.command,h=a.dom;if("mceInsertContent"===g){if((c=h.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=h.create("p"),h.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged(),tinymce.Env.ie>8))return setTimeout(function(){a.selection.setCursorLocation(d,0),a.selection.setContent(b.value)},500),!1}else if("JustifyLeft"===g||"JustifyRight"===g||"JustifyCenter"===g){if(c=a.selection.getNode(),f=g.substr(7).toLowerCase(),f="align"+f,j(),e=h.is(c,"dl.wp-caption")?c:h.getParent(c,"dl.wp-caption"))return h.hasClass(e,f)?(h.removeClass(e,f),h.addClass(e,"alignnone")):(e.className=e.className.replace(/align[^ ]+/g,""),h.addClass(e,f)),!1;"IMG"===c.nodeName&&(h.hasClass(c,f)?h.addClass(c,"alignnone"):h.removeClass(c,"alignnone"))}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,i=a.dom;if(b.keyCode===tinymce.util.VK.ENTER)c=g.getNode(),d=i.getParent(c,"div.mceTemp"),d&&(i.events.cancel(b),tinymce.each(i.select("dt, dd",d),function(a){i.isEmpty(a)&&i.remove(a)}),f=tinymce.Env.ie&&tinymce.Env.ie<11?"":'
',e=i.create("p",null,f),"DD"===c.nodeName?i.insertAfter(e,d):d.parentNode.insertBefore(e,d),a.nodeChanged(),g.setCursorLocation(e,0));else if((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&i.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=i.getParent(c,"div.mceTemp")),d))return i.events.cancel(b),h(c),!1}),a.on("mousedown",function(b){a.dom.getParent(b.target,"#wp-image-toolbar")?tinymce.Env.ie&&b.preventDefault():"IMG"!==b.target.nodeName&&j()}),a.on("mouseup",function(b){var c,d=b.target,e=a.dom;b.button&&b.button>1||("DIV"===d.nodeName&&e.getParent(d,"#wp-image-toolbar")?(c=e.select("img[data-wp-imgselect]")[0],c&&(a.selection.select(c),e.hasClass(d,"remove")?(h(c),j()):e.hasClass(d,"edit")&&g(c))):"IMG"!==d.nodeName||a.dom.getAttrib(d,"data-wp-imgselect")||k(d)?"IMG"!==d.nodeName&&j():i(d))}),a.on("cut",function(){j()}),a.wpSetImgCaption=function(a){return b(a)},a.wpGetImgCaption=function(a){return c(a)},a.on("BeforeSetContent",function(b){b.content=a.wpSetImgCaption(b.content)}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content),b.content=b.content.replace(/ data-wp-imgselect="1"/g,""))}),{_do_shcode:b,_get_shcode:c}}); \ No newline at end of file +tinymce.PluginManager.add("wpeditimage",function(a){function b(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j,k=tinymce.trim;return e=c.match(/id=['"]([^'"]*)['"] ?/),e&&(c=c.replace(e[0],"")),f=c.match(/align=['"]([^'"]*)['"] ?/),f&&(c=c.replace(f[0],"")),g=c.match(/width=['"]([0-9]*)['"] ?/),g&&(c=c.replace(g[0],"")),d=k(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=k(i[2]),i=k(i[1])):(h=k(c).replace(/caption=['"]/,"").replace(/['"]$/,""),i=d),e=e&&e[1]?e[1]:"",f=f&&f[1]?f[1]:"alignnone",!g&&i&&(g=i.match(/width=['"]([0-9]*)['"]/)),g&&g[1]&&(g=g[1]),g&&h?(j=parseInt(g,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'

'+i+'
'+h+"
"):d})}function c(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"

"+c[1]+"

":""):(c=b.replace(/
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi,function(a,b,c,d){var e,f,g;return g=c.match(/width="([0-9]*)"/),g=g&&g[1]?g[1]:"",g&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",f=f.match(/align[a-z]+/)||"alignnone",d=d.replace(/\r\n|\r/g,"\n").replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),d=d.replace(/\s*\n\s*/g,"
"),'[caption id="'+e+'" align="'+f+'" width="'+g+'"]'+c+" "+d+"[/caption]"):c}),0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

[\s\S]*<\/p>)?[\s\S]*/gi,"

$1

$2")),c)})}function d(b){var c,d,e,f,g=a.dom;return d={attachment_id:!1,url:!1,height:"",width:"",size:"none",caption:"",alt:"",align:"none",link:!1,linkUrl:""},d.url=g.getAttrib(b,"src"),d.alt=g.getAttrib(b,"alt"),d.width=parseInt(g.getAttrib(b,"width"),10),d.height=parseInt(g.getAttrib(b,"height"),10),c=b.className.split(" "),tinymce.each(c,function(a){/^wp-image/.test(a)&&(d.attachment_id=parseInt(a.replace("wp-image-",""),10)),/^align/.test(a)&&(d.align=a.replace("align","")),/^size/.test(a)&&(d.size=a.replace("size-",""))}),e=g.getParents(b,".wp-caption"),e.length&&(e=e[0],c=e.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)&&(d.align=a.replace("align",""))}),f=g.select("dd.wp-caption-dd",e),f.length&&(f=f[0],d.caption=a.serializer.serialize(f).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(d.linkUrl=g.getAttrib(b.parentNode,"href")),d}function e(b,c){var d,e,g,h,j,k,l,m,n;c.caption?(h=f(c,"html"),e=parseInt(c.width,10),a.getParam("wpeditimage_html5_captions")||(e+=10),d="align"+c.align,n=c.attachment_id?'id="attachment_'+c.attachment_id+'" ':"",h="

'+h+'
'+c.caption+"
",g=a.dom.create("div",{"class":"mceTemp"},h)):g=f(c,"node"),k=b,j=a.dom.getParent(b,".mceTemp"),j?k=j:"A"===b.parentNode.nodeName&&(k=b.parentNode),l=a.dom.uniqueId("wp_"),a.dom.setAttrib(g,"data-wp-replace-id",l),a.dom.replace(g,k),g=a.dom.select('[data-wp-replace-id="'+l+'"]')[0],a.dom.setAttrib(g,"data-wp-replace-id",""),a.nodeChanged(),m="IMG"===g.nodeName?g:a.dom.select("img",g)[0],m&&(a.selection.select(m),i(m))}function f(b,c){var d,e=[];if(c=c?c:"node",b.caption||e.push("align"+b.align),b.attachment_id&&(e.push("wp-image-"+b.attachment_id),b.size&&e.push("size-"+b.size)),d={src:b.url,width:b.width,height:b.height,alt:b.alt},e.length&&(d["class"]=e.join(" ")),b.linkUrl){if("node"===c)return a.dom.create("a",{href:b.linkUrl},a.dom.createHTML("img",d));if("html"===c)return a.dom.createHTML("a",{href:b.linkUrl},a.dom.createHTML("img",d))}else{if("node"===c)return a.dom.create("img",d);if("html"===c)return a.dom.createHTML("img",d)}}function g(b){var c,f;return"undefined"!=typeof wp&&wp.media?(a.undoManager.add(),c=wp.media({frame:"image",state:"image-details",metadata:d(b)}),f=function(d){e(b,d),a.focus(),c.detach()},c.state("image-details").on("update",f),c.state("replace-image").on("replace",f),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function h(b){var c;"DIV"===b.nodeName&&a.dom.hasClass(b,"mceTemp")?c=b:("IMG"===b.nodeName||"DT"===b.nodeName||"A"===b.nodeName)&&(c=a.dom.getParent(b,"div.mceTemp")),c?(a.selection.select(c.nextSibling?c.nextSibling:c.previousSibling?c.previousSibling:c.parentNode),a.selection.collapse(!0),a.nodeChanged(),a.dom.remove(c)):a.dom.remove(b)}function i(b){var c,d,e,f,g=a.dom;j(),b&&"IMG"===b.nodeName&&!k(b)&&(g.setAttrib(b,"data-wp-imgselect",1),c=g.getRect(b),d='
',e=g.create("div",{id:"wp-image-toolbar","data-mce-bogus":"1",contenteditable:!1},d),a.getBody().appendChild(e),f=g.getSize(e),g.setStyles(e,{top:c.y,left:c.x}))}function j(){var b=a.dom.get("wp-image-toolbar");b&&a.dom.remove(b),a.dom.setAttrib(a.dom.select("img[data-wp-imgselect]"),"data-wp-imgselect",null)}function k(b){var c=a.dom;return c.hasClass(b,"mceItem")||c.getAttrib(b,"data-mce-placeholder")||c.getAttrib(b,"data-mce-object")?!0:!1}return a.on("init",function(){var b=a.dom,c=a.getParam("wpeditimage_html5_captions")?"html5-captions":"html4-captions";b.addClass(a.getBody(),c),a.on("wpLoadImageForm",function(b){if(!a.getParam("wpeditimage_disable_captions")){var c={type:"textbox",flex:1,name:"caption",minHeight:60,multiline:!0,scroll:!0,label:"Image caption"};b.data.splice(b.data.length-1,0,c)}}),a.on("wpNewImageRefresh",function(a){var c,d;(c=b.getParent(a.node,"dl.wp-caption"))&&(c.style.width||(d=parseInt(a.node.clientWidth,10)+10,d=d?d+"px":"50%",b.setStyle(c,"width",d)))}),a.on("wpImageFormSubmit",function(c){var d,e,f,g,h,i=c.imgData.data,j=c.imgData.node,k=c.imgData.caption,l="",m="",n="";return i.id="__wp-temp-img-id",c.imgData.cancel=!0,i.style||(i.style=null),i.src?(k&&(k=k.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),k=k.replace(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
")),j?(h=j.id||null,b.setAttribs(j,i),d=b.getParent(j,"dl.wp-caption"),k?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=k):(j.className&&(l=j.className.match(/wp-image-([0-9]+)/),m=j.className.match(/align(left|right|center|none)/)),m?(m=m[0],j.className=j.className.replace(/align(left|right|center|none)/g,"")):m="alignnone",m=' class="wp-caption '+m+'"',l&&(l=' id="attachment_'+l[1]+'"'),n=i.width||j.clientWidth,n&&(n=parseInt(n,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),j.parentNode&&"A"===j.parentNode.nodeName?(g=b.getOuterHTML(j.parentNode),f=j.parentNode):(g=b.getOuterHTML(j),f=j),g="
'+g+'
'+k+"
",(e=b.getParent(j,"p"))?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.remove(f),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):d&&(g=b.getOuterHTML("A"===j.parentNode.nodeName?j.parentNode:j),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=b.createHTML("img",i),k?(f=a.selection.getNode(),i.width&&(n=parseInt(i.width,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),g='
'+g+'
'+k+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):a.selection.setContent(g)),j=b.get("__wp-temp-img-id"),b.setAttrib(j,"id",h),void(c.imgData.node=j)):void(j&&(b.remove((d=b.getParent(j,"div.mceTemp"))?d:"A"===j.parentNode.nodeName?j.parentNode:j),a.nodeChanged()))}),a.on("wpLoadImageData",function(c){var d,e=c.imgData.data,f=c.imgData.node;(d=b.getParent(f,"dl.wp-caption"))&&(d=b.select("dd.wp-caption-dd",d)[0],d&&(e.caption=a.serializer.serialize(d).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault(),j()}),tinymce.Env.ie&&tinymce.Env.ie>10&&(b.bind(a.getBody(),"mscontrolselect",function(c){"IMG"===c.target.nodeName&&b.getParent(c.target,".wp-caption")?a.getBody().focus():"DL"===c.target.nodeName&&b.hasClass(c.target,"wp-caption")&&c.target.focus()}),a.on("click",function(c){"IMG"===c.target.nodeName&&b.getAttrib(c.target,"data-wp-imgselect")&&b.getParent(c.target,"dl.wp-caption")&&a.getBody().focus()}))}),a.on("ObjectResized",function(b){var c,d,e=b.target,f=a.dom;"IMG"===e.nodeName&&(e.className=e.className.replace(/\bsize-[^ ]+/,""),(c=f.getParent(e,".wp-caption"))&&(d=b.width||f.getAttrib(e,"width"),d&&(d=parseInt(d,10),a.getParam("wpeditimage_html5_captions")||(d+=10),f.setStyle(c,"width",d+"px"))),i(e))}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g=b.command,h=a.dom;if("mceInsertContent"===g){if((c=h.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=h.create("p"),h.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged(),tinymce.Env.ie>8))return setTimeout(function(){a.selection.setCursorLocation(d,0),a.selection.setContent(b.value)},500),!1}else if("JustifyLeft"===g||"JustifyRight"===g||"JustifyCenter"===g){if(c=a.selection.getNode(),f=g.substr(7).toLowerCase(),f="align"+f,j(),e=h.is(c,"dl.wp-caption")?c:h.getParent(c,"dl.wp-caption"))return h.hasClass(e,f)?(h.removeClass(e,f),h.addClass(e,"alignnone")):(e.className=e.className.replace(/align[^ ]+/g,""),h.addClass(e,f)),!1;"IMG"===c.nodeName&&(h.hasClass(c,f)?h.addClass(c,"alignnone"):h.removeClass(c,"alignnone"))}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,i=a.dom;if(b.keyCode===tinymce.util.VK.ENTER)c=g.getNode(),d=i.getParent(c,"div.mceTemp"),d&&(i.events.cancel(b),tinymce.each(i.select("dt, dd",d),function(a){i.isEmpty(a)&&i.remove(a)}),f=tinymce.Env.ie&&tinymce.Env.ie<11?"":'
',e=i.create("p",null,f),"DD"===c.nodeName?i.insertAfter(e,d):d.parentNode.insertBefore(e,d),a.nodeChanged(),g.setCursorLocation(e,0));else if((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&i.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=i.getParent(c,"div.mceTemp")),d))return i.events.cancel(b),h(c),!1}),a.on("mousedown",function(b){a.dom.getParent(b.target,"#wp-image-toolbar")?tinymce.Env.ie&&b.preventDefault():"IMG"!==b.target.nodeName&&j()}),a.on("mouseup",function(b){var c,d=b.target,e=a.dom;b.button&&b.button>1||("DIV"===d.nodeName&&e.getParent(d,"#wp-image-toolbar")?(c=e.select("img[data-wp-imgselect]")[0],c&&(a.selection.select(c),e.hasClass(d,"remove")?(h(c),j()):e.hasClass(d,"edit")&&g(c))):"IMG"!==d.nodeName||a.dom.getAttrib(d,"data-wp-imgselect")||k(d)?"IMG"!==d.nodeName&&j():i(d))}),a.on("cut",function(){j()}),a.wpSetImgCaption=function(a){return b(a)},a.wpGetImgCaption=function(a){return c(a)},a.on("BeforeSetContent",function(b){b.content=a.wpSetImgCaption(b.content)}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content),b.content=b.content.replace(/ data-wp-imgselect="1"/g,""))}),{_do_shcode:b,_get_shcode:c}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/wp-includes/js/tinymce/skins/wordpress/wp-content.css index a5fb3e43ca..6b6d4c5c12 100644 --- a/wp-includes/js/tinymce/skins/wordpress/wp-content.css +++ b/wp-includes/js/tinymce/skins/wordpress/wp-content.css @@ -212,41 +212,37 @@ audio { border: 1px solid transparent; } -.wpview-type-audio { - padding: 24px 0 0; +.wpview-wrap.selected { + background-color: #f2f8ff; /* fallback to old blue */ + background-color: rgba(0,0,0,0.1); + border-color: #777; + border-color: rgba(0,0,0,0.3); } -.wpview-type-video { - padding: 0; +.wpview-overlay { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } -.wont-play { - padding: 4px 0; -} - -.wont-play p { - font-size: 13px; - line-height: 1.3; - display: block; - width: 70%; - margin: 0 15%; - text-align: center; -} - -.wpview-type-gallery:after { - content: ''; - display: table; - clear: both; +.wpview-wrap.selected .wpview-overlay { + display: none; } .wpview-wrap .toolbar { position: absolute; top: 0; - right: 0; + left: 0; display: none; z-index: 100; } +.wpview-wrap.selected .toolbar { + display: block; +} + #wp-image-toolbar { position: absolute; } @@ -254,7 +250,7 @@ audio { .wpview-wrap .toolbar div, #wp-image-toolbar div { margin-top: 7px; - margin-right: 7px; + margin-left: 7px; padding: 2px; width: 30px; height: 30px; @@ -273,30 +269,26 @@ audio { color: #2ea2cc; } -/* temporary overrides; still pending styling */ -.wpview-type-audio .toolbar div, -.wont-play .toolbar div { - margin: 0; - padding: 3px; - width: 20px; - height: 20px; - box-shadow: none; - font-size: 20px; +/* Audio player is short; therefore let's put the toolbar above */ +.wpview-type-audio .toolbar { + top: -41px; } -.wpview-wrap.selected .toolbar, -.wpview-type-audio .toolbar, -.wpview-type-video .toolbar { +.wpview-type-audio .toolbar div:first-child { + margin-left: 0; +} + +.wont-play { + padding: 4px 0; +} + +.wont-play p { + font-size: 13px; + line-height: 1.3; display: block; -} - -.wpview-type-gallery.selected, -.wpview-type-audio, -.wpview-type-video { - background-color: #f2f8ff; /* fallback to old blue */ - background-color: rgba(0,0,0,0.1); - border-color: #777; - border-color: rgba(0,0,0,0.3); + width: 70%; + margin: 0 15%; + text-align: center; } .wpview-type-video .track-details, @@ -310,6 +302,12 @@ audio { text-overflow: ellipsis; } +.wpview-type-gallery:after { + content: ''; + display: table; + clear: both; +} + .gallery img[data-mce-selected]:focus { outline: none; } diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index 10aa0112fa350137100b5d74c9271c3ab596be8e..e18ab9330bd3a8ce1bb385109c0d004e64287e84 100644 GIT binary patch delta 3355 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 diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index 8499c76054..31913365ae 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -997,6 +997,7 @@ function wp_print_media_templates() {

{{{ data.model.caption }}}
<# } #> +
@@ -1027,6 +1029,7 @@ function wp_print_media_templates() {
+