From a16cc1979051b263364250ff63742a20be288258 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 30 Dec 2013 01:54:11 +0000 Subject: [PATCH] TinyMCE: - Fix toolbar icons in IE9. - Remove background gradients in IE < 10. - Lint our plugins. - Add draggable attribute to the caption wrapper and make the captioned images non-draggable in Chrome. See #24067. Built from https://develop.svn.wordpress.org/trunk@26880 git-svn-id: http://core.svn.wordpress.org/trunk@26763 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/css/editor-rtl.css | 132 +++++++++--------- wp-includes/css/editor-rtl.min.css | 2 +- wp-includes/css/editor.css | 132 +++++++++--------- wp-includes/css/editor.min.css | 2 +- .../js/tinymce/plugins/wordpress/plugin.js | 12 +- .../tinymce/plugins/wordpress/plugin.min.js | 2 +- .../js/tinymce/plugins/wpeditimage/plugin.js | 17 ++- .../tinymce/plugins/wpeditimage/plugin.min.js | 2 +- .../js/tinymce/plugins/wpfullscreen/plugin.js | 5 +- .../plugins/wpfullscreen/plugin.min.js | 2 +- .../js/tinymce/plugins/wpgallery/plugin.js | 4 +- .../tinymce/plugins/wpgallery/plugin.min.js | 2 +- .../js/tinymce/plugins/wpview/plugin.js | 40 ++++-- .../js/tinymce/plugins/wpview/plugin.min.js | 2 +- .../js/tinymce/skins/wordpress/wp-content.css | 8 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 118507 -> 118500 bytes 16 files changed, 196 insertions(+), 168 deletions(-) diff --git a/wp-includes/css/editor-rtl.css b/wp-includes/css/editor-rtl.css index b78ba88f30..505fd01084 100644 --- a/wp-includes/css/editor-rtl.css +++ b/wp-includes/css/editor-rtl.css @@ -2,12 +2,13 @@ TinyMCE and Quicklinks toolbars ------------------------------------------------------------------------------*/ -.mce-panel { +div.mce-panel { border: 0; background: #fff; + filter: none; } -.mce-toolbar-grp { +div.mce-toolbar-grp { border-bottom: 1px solid #dedede; background: #f5f5f5; } @@ -40,6 +41,7 @@ margin: 0 1px; -webkit-border-radius: 2px; border-radius: 2px; + filter: none; } #wp-fullscreen-buttons .mce-btn:hover, @@ -107,37 +109,37 @@ color: #333; } -.mce-i-bold, -.mce-i-italic, -.mce-i-bullist, -.mce-i-numlist, -.mce-i-blockquote, -.mce-i-alignleft, -.mce-i-aligncenter, -.mce-i-alignright, -.mce-i-link, -.mce-i-unlink, -.mce-i-wp_more, -.mce-i-strikethrough, -.mce-i-spellchecker, -.mce-i-fullscreen, -.mce-i-wp_fullscreen, -.mce-i-wp_adv, -.mce-i-underline, -.mce-i-alignjustify, -.mce-i-forecolor, -.mce-i-pastetext, -.mce-i-pasteword, -.mce-i-removeformat, -.mce-i-charmap, -.mce-i-outdent, -.mce-i-indent, -.mce-i-undo, -.mce-i-redo, -.mce-i-help, -.mce-i-wp_help, -.mce-i-wp-media-library, -.mce-i-ltr { +i.mce-i-bold, +i.mce-i-italic, +i.mce-i-bullist, +i.mce-i-numlist, +i.mce-i-blockquote, +i.mce-i-alignleft, +i.mce-i-aligncenter, +i.mce-i-alignright, +i.mce-i-link, +i.mce-i-unlink, +i.mce-i-wp_more, +i.mce-i-strikethrough, +i.mce-i-spellchecker, +i.mce-i-fullscreen, +i.mce-i-wp_fullscreen, +i.mce-i-wp_adv, +i.mce-i-underline, +i.mce-i-alignjustify, +i.mce-i-forecolor, +i.mce-i-pastetext, +i.mce-i-pasteword, +i.mce-i-removeformat, +i.mce-i-charmap, +i.mce-i-outdent, +i.mce-i-indent, +i.mce-i-undo, +i.mce-i-redo, +i.mce-i-help, +i.mce-i-wp_help, +i.mce-i-wp-media-library, +i.mce-i-ltr { font: normal 20px/1 'dashicons'; padding: 0; vertical-align: top; @@ -146,116 +148,117 @@ -moz-osx-font-smoothing: grayscale; } -.mce-i-bold:before { +i.mce-i-bold:before { content: '\f200'; } -.mce-i-italic:before { +i.mce-i-italic:before { content: '\f201'; } -.mce-i-bullist:before { +i.mce-i-bullist:before { content: '\f203'; } -.mce-i-numlist:before { +i.mce-i-numlist:before { content: '\f204'; } -.mce-i-blockquote:before { +i.mce-i-blockquote:before { content: '\f205'; } -.mce-i-alignleft:before { +i.mce-i-alignleft:before { content: '\f206'; } -.mce-i-aligncenter:before { +i.mce-i-aligncenter:before { content: '\f207'; } -.mce-i-alignright:before { +i.mce-i-alignright:before { content: '\f208'; } -.mce-i-link:before { +i.mce-i-link:before { content: '\f103'; } -.mce-i-unlink:before { +i.mce-i-unlink:before { content: '\f225'; } -.mce-i-wp_more:before { +i.mce-i-wp_more:before { content: '\f209'; } -.mce-i-strikethrough:before { +i.mce-i-strikethrough:before { content: '\f224'; } -.mce-i-spellchecker:before { +i.mce-i-spellchecker:before { content: '\f210'; } -.mce-i-fullscreen:before, -.mce-i-wp_fullscreen:before { +i.mce-i-fullscreen:before, +i.mce-i-wp_fullscreen:before { content: '\f211'; } -.mce-i-wp_adv:before { +i.mce-i-wp_adv:before { content: '\f212'; } -.mce-i-underline:before { + +i.mce-i-underline:before { content: '\f213'; } -.mce-i-alignjustify:before { +i.mce-i-alignjustify:before { content: '\f214'; } -.mce-i-forecolor:before { +i.mce-i-forecolor:before { content: '\f215'; } -.mce-i-pastetext:before { +i.mce-i-pastetext:before { content: '\f217'; } -.mce-i-removeformat:before { +i.mce-i-removeformat:before { content: '\f218'; } -.mce-i-charmap:before { +i.mce-i-charmap:before { content: '\f220'; } -.mce-i-outdent:before { +i.mce-i-outdent:before { content: '\f221'; } -.mce-i-indent:before { +i.mce-i-indent:before { content: '\f222'; } -.mce-i-undo:before { +i.mce-i-undo:before { content: '\f171'; } -.mce-i-redo:before { +i.mce-i-redo:before { content: '\f172'; } -.mce-i-help:before, -.mce-i-wp_help:before { +i.mce-i-help:before, +i.mce-i-wp_help:before { content: '\f223'; } -.mce-i-wp-media-library:before { +i.mce-i-wp-media-library:before { content: '\f104'; } -.mce-i-ltr:before { +i.mce-i-ltr:before { content: '\f320'; } @@ -299,8 +302,7 @@ box-shadow: none; } -.quicktags-toolbar, -.wp_themeSkin tr.mceFirst td.mceToolbar { +.quicktags-toolbar { border-bottom: 1px solid #dedede; background: #f5f5f5; } diff --git a/wp-includes/css/editor-rtl.min.css b/wp-includes/css/editor-rtl.min.css index 0f01f82d35..3ca6c695e5 100644 --- a/wp-includes/css/editor-rtl.min.css +++ b/wp-includes/css/editor-rtl.min.css @@ -1,4 +1,4 @@ -.mce-panel{border:0;background:#fff}.mce-toolbar-grp{border-bottom:1px solid #dedede;background:#f5f5f5}.mce-toolbar{padding:1px 3px}.mce-statusbar{border-top:1px solid #eee}.mce-path{padding:0 8px 1px}.mce-path-item{line-height:1}.mce-toolbar .mce-btn{border-color:transparent;background:transparent;box-shadow:none}#wp-fullscreen-buttons .mce-btn,.mce-toolbar .mce-btn-group .mce-btn{border:1px solid transparent;margin:0 1px;-webkit-border-radius:2px;border-radius:2px}#wp-fullscreen-buttons .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn.mce-active{box-shadow:0 0 transparent;border-color:#bbb;background:#eee;background-image:-webkit-gradient(linear,right bottom,right top,from(#e5e5e5),to(#fff));background-image:-webkit-linear-gradient(bottom,#e5e5e5,#fff);background-image:linear-gradient(to top,#e5e5e5,#fff)}.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover{border-color:transparent;background:transparent}.mce-toolbar .mce-btn-group .mce-first,.mce-toolbar .mce-btn-group .mce-last{border-color:transparent}.mce-toolbar .mce-btn button{padding:2px 3px;line-height:normal}.mce-toolbar .mce-btn i{text-shadow:0}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox{border-radius:0;direction:rtl;background:#fff;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2);box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2)}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover{background-image:none;border-color:#bbb}.mce-toolbar .mce-colorbutton .mce-open{border-left:0}.mce-toolbar .mce-colorbutton .mce-preview{margin-right:-16px}.mce-toolbar .mce-ico{color:#777;line-height:20px;width:20px;height:20px;text-align:center}.mce-toolbar .mce-btn:hover .mce-ico{color:#333}.mce-i-bold,.mce-i-italic,.mce-i-bullist,.mce-i-numlist,.mce-i-blockquote,.mce-i-alignleft,.mce-i-aligncenter,.mce-i-alignright,.mce-i-link,.mce-i-unlink,.mce-i-wp_more,.mce-i-strikethrough,.mce-i-spellchecker,.mce-i-fullscreen,.mce-i-wp_fullscreen,.mce-i-wp_adv,.mce-i-underline,.mce-i-alignjustify,.mce-i-forecolor,.mce-i-pastetext,.mce-i-pasteword,.mce-i-removeformat,.mce-i-charmap,.mce-i-outdent,.mce-i-indent,.mce-i-undo,.mce-i-redo,.mce-i-help,.mce-i-wp_help,.mce-i-wp-media-library,.mce-i-ltr{font:400 20px/1 dashicons;padding:0;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.mce-i-bold:before{content:'\f200'}.mce-i-italic:before{content:'\f201'}.mce-i-bullist:before{content:'\f203'}.mce-i-numlist:before{content:'\f204'}.mce-i-blockquote:before{content:'\f205'}.mce-i-alignleft:before{content:'\f206'}.mce-i-aligncenter:before{content:'\f207'}.mce-i-alignright:before{content:'\f208'}.mce-i-link:before{content:'\f103'}.mce-i-unlink:before{content:'\f225'}.mce-i-wp_more:before{content:'\f209'}.mce-i-strikethrough:before{content:'\f224'}.mce-i-spellchecker:before{content:'\f210'}.mce-i-fullscreen:before,.mce-i-wp_fullscreen:before{content:'\f211'}.mce-i-wp_adv:before{content:'\f212'}.mce-i-underline:before{content:'\f213'}.mce-i-alignjustify:before{content:'\f214'}.mce-i-forecolor:before{content:'\f215'}.mce-i-pastetext:before{content:'\f217'}.mce-i-removeformat:before{content:'\f218'}.mce-i-charmap:before{content:'\f220'}.mce-i-outdent:before{content:'\f221'}.mce-i-indent:before{content:'\f222'}.mce-i-undo:before{content:'\f171'}.mce-i-redo:before{content:'\f172'}.mce-i-help:before,.mce-i-wp_help:before{content:'\f223'}.mce-i-wp-media-library:before{content:'\f104'}.mce-i-ltr:before{content:'\f320'}.wp-editor-wrap{position:relative}.wp-editor-tools{position:relative;z-index:1}.wp-editor-container{clear:both}.wp-editor-area{font-family:Consolas,Monaco,monospace;font-size:13px;padding:10px;margin:1px 0 0;line-height:150%;border:0 none;outline:0;display:block;resize:vertical;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.wp-editor-tools{padding:0}.wp-editor-container textarea.wp-editor-area{width:100%;margin:0;-webkit-box-shadow:none;box-shadow:none}.quicktags-toolbar,.wp_themeSkin tr.mceFirst td.mceToolbar{border-bottom:1px solid #dedede;background:#f5f5f5}.wp-editor-tabs{float:left}.wp-switch-editor{background:#ebebeb;border:1px solid #dedede;color:#777;cursor:pointer;float:left;font:13px/19px "Open Sans",sans-serif;height:19px;margin:5px 5px 0 0;padding:3px 8px 4px;position:relative;top:1px}.wp-switch-editor:active{background-color:#f1f1f1}.wp-switch-editor:hover{text-decoration:none!important;background:#fff}.js .tmce-active .wp-editor-area{color:#fff}.tmce-active .quicktags-toolbar{display:none}.tmce-active .switch-tmce,.html-active .switch-html{background:#f5f5f5;color:#555;height:20px;border-bottom:0}.wp-media-buttons{float:right}.wp-media-buttons .button{margin-left:5px;margin-bottom:4px;padding-right:7px;padding-left:7px}.wp-media-buttons .button:active{position:relative;top:1px;margin-top:-1px;margin-bottom:1px}.wp-media-buttons .insert-media{padding-right:5px}.wp-media-buttons a{text-decoration:none;color:#464646;font-size:12px}.wp-media-buttons img{padding:0 4px;vertical-align:middle}.wp-media-buttons span.wp-media-buttons-icon{display:inline-block;width:18px;height:18px;vertical-align:text-top;margin:0 2px}.wp-media-buttons .add_media span.wp-media-buttons-icon{background:0}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{content:'\f104'}.quicktags-toolbar{border-bottom-style:solid;border-bottom-width:1px;-webkit-border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-left-radius:3px;border-top-right-radius:3px;padding:2px 8px 0;min-height:29px}.quicktags-toolbar>div{padding:2px 4px 0}.quicktags-toolbar input{margin:2px 1px 4px;line-height:18px;display:inline-block;min-width:26px;padding:2px 4px;font:12px/18px "Open Sans",sans-serif;color:#464646;border:1px solid #c3c3c3;-webkit-border-radius:3px;border-radius:3px;background:#eee;background-image:-webkit-gradient(linear,right bottom,right top,from(#e3e3e3),to(#fff));background-image:-webkit-linear-gradient(bottom,#e3e3e3,#fff);background-image:-moz-linear-gradient(bottom,#e3e3e3,#fff);background-image:-o-linear-gradient(bottom,#e3e3e3,#fff);background-image:linear-gradient(to top,#e3e3e3,#fff)}.quicktags-toolbar input:hover{border-color:#aaa;background:#ddd}.quicktags-toolbar input[value=link]{text-decoration:underline}.quicktags-toolbar input[value=del]{text-decoration:line-through}.quicktags-toolbar input[value="i"]{font-style:italic}.quicktags-toolbar input[value="b"]{font-weight:700}#wp_editbtns,#wp_gallerybtns{padding:2px;position:absolute;display:none;z-index:155000}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;margin:2px;padding:2px;border-width:1px;border-style:solid;-webkit-border-radius:3px;border-radius:3px}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc}#wp-link{background-color:#F5F5F5;line-height:1.4em;font-size:12px}#wp-link ol,#wp-link ul{list-style:none;margin:0;padding:0}#wp-link input[type=text]{-webkit-box-sizing:border-box}#wp-link input[type=text],#wp-link textarea{border-width:1px;border-style:solid;-webkit-border-radius:4px;border-radius:4px;font-size:12px;margin:1px;padding:3px}#wp-link #link-options{padding:10px 0 14px;border-bottom:1px solid #dfdfdf;margin:0 6px 14px}#wp-link p.howto{margin:3px}#wp-link #internal-toggle{display:inline-block;cursor:pointer;padding-right:18px}#wp-link .toggle-arrow{background:transparent url(../images/toggle-arrow.png) top right no-repeat;height:23px;line-height:23px}#wp-link .toggle-arrow-active{background-position:center right}#wp-link label input[type=text]{width:360px;margin-top:5px}#wp-link #link-options label span,#wp-link #search-panel label span.search-label{display:inline-block;width:80px;text-align:left;padding-left:5px}#wp-link .link-search-field{float:right;width:220px}#wp-link .link-search-wrapper{margin:5px 6px 9px;display:block;overflow:hidden}#wp-link .link-search-wrapper span{float:right;margin-top:4px}#wp-link .link-search-wrapper .spinner{display:none;vertical-align:text-bottom}#wp-link .link-target{width:auto;padding:3px 0 0;margin:0 87px 0 0;font-size:11px}#wp-link .query-results{border:1px #dfdfdf solid;margin:0 5px 5px;background:#fff;height:185px;overflow:auto;position:relative}#wp-link li,#wp-link .query-notice{clear:both;margin-bottom:0;border-bottom:1px solid #f1f1f1;color:#333;padding:4px 6px;cursor:pointer;position:relative}#wp-link li:hover{background:#eaf2fa;color:#151515}#wp-link li.unselectable{border-bottom:1px solid #dfdfdf}#wp-link li.unselectable:hover{background:#fff;cursor:auto;color:#333}#wp-link li.selected{background:#ddd;color:#333}#wp-link li.selected .item-title{font-weight:700}#wp-link .item-title{display:inline-block;width:80%}#wp-link .item-info{text-transform:uppercase;color:#666;font-size:11px;position:absolute;left:5px;top:4px;bottom:0}#wp-link #search-results{display:none}#wp-link #search-panel{float:right;width:100%}#wp-link .river-waiting{display:none;padding:10px 0}#wp-link .river-waiting .spinner{margin:0 auto;display:block}#wp-link .submitbox{padding:5px 10px;font-size:11px;overflow:auto;height:29px}#wp-link-cancel{line-height:25px;float:right}#wp-link-update{line-height:23px;float:left}/*! +div.mce-panel{border:0;background:#fff;filter:none}div.mce-toolbar-grp{border-bottom:1px solid #dedede;background:#f5f5f5}.mce-toolbar{padding:1px 3px}.mce-statusbar{border-top:1px solid #eee}.mce-path{padding:0 8px 1px}.mce-path-item{line-height:1}.mce-toolbar .mce-btn{border-color:transparent;background:transparent;box-shadow:none}#wp-fullscreen-buttons .mce-btn,.mce-toolbar .mce-btn-group .mce-btn{border:1px solid transparent;margin:0 1px;-webkit-border-radius:2px;border-radius:2px;filter:none}#wp-fullscreen-buttons .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn.mce-active{box-shadow:0 0 transparent;border-color:#bbb;background:#eee;background-image:-webkit-gradient(linear,right bottom,right top,from(#e5e5e5),to(#fff));background-image:-webkit-linear-gradient(bottom,#e5e5e5,#fff);background-image:linear-gradient(to top,#e5e5e5,#fff)}.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover{border-color:transparent;background:transparent}.mce-toolbar .mce-btn-group .mce-first,.mce-toolbar .mce-btn-group .mce-last{border-color:transparent}.mce-toolbar .mce-btn button{padding:2px 3px;line-height:normal}.mce-toolbar .mce-btn i{text-shadow:0}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox{border-radius:0;direction:rtl;background:#fff;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2);box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2)}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover{background-image:none;border-color:#bbb}.mce-toolbar .mce-colorbutton .mce-open{border-left:0}.mce-toolbar .mce-colorbutton .mce-preview{margin-right:-16px}.mce-toolbar .mce-ico{color:#777;line-height:20px;width:20px;height:20px;text-align:center}.mce-toolbar .mce-btn:hover .mce-ico{color:#333}i.mce-i-bold,i.mce-i-italic,i.mce-i-bullist,i.mce-i-numlist,i.mce-i-blockquote,i.mce-i-alignleft,i.mce-i-aligncenter,i.mce-i-alignright,i.mce-i-link,i.mce-i-unlink,i.mce-i-wp_more,i.mce-i-strikethrough,i.mce-i-spellchecker,i.mce-i-fullscreen,i.mce-i-wp_fullscreen,i.mce-i-wp_adv,i.mce-i-underline,i.mce-i-alignjustify,i.mce-i-forecolor,i.mce-i-pastetext,i.mce-i-pasteword,i.mce-i-removeformat,i.mce-i-charmap,i.mce-i-outdent,i.mce-i-indent,i.mce-i-undo,i.mce-i-redo,i.mce-i-help,i.mce-i-wp_help,i.mce-i-wp-media-library,i.mce-i-ltr{font:400 20px/1 dashicons;padding:0;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}i.mce-i-bold:before{content:'\f200'}i.mce-i-italic:before{content:'\f201'}i.mce-i-bullist:before{content:'\f203'}i.mce-i-numlist:before{content:'\f204'}i.mce-i-blockquote:before{content:'\f205'}i.mce-i-alignleft:before{content:'\f206'}i.mce-i-aligncenter:before{content:'\f207'}i.mce-i-alignright:before{content:'\f208'}i.mce-i-link:before{content:'\f103'}i.mce-i-unlink:before{content:'\f225'}i.mce-i-wp_more:before{content:'\f209'}i.mce-i-strikethrough:before{content:'\f224'}i.mce-i-spellchecker:before{content:'\f210'}i.mce-i-fullscreen:before,i.mce-i-wp_fullscreen:before{content:'\f211'}i.mce-i-wp_adv:before{content:'\f212'}i.mce-i-underline:before{content:'\f213'}i.mce-i-alignjustify:before{content:'\f214'}i.mce-i-forecolor:before{content:'\f215'}i.mce-i-pastetext:before{content:'\f217'}i.mce-i-removeformat:before{content:'\f218'}i.mce-i-charmap:before{content:'\f220'}i.mce-i-outdent:before{content:'\f221'}i.mce-i-indent:before{content:'\f222'}i.mce-i-undo:before{content:'\f171'}i.mce-i-redo:before{content:'\f172'}i.mce-i-help:before,i.mce-i-wp_help:before{content:'\f223'}i.mce-i-wp-media-library:before{content:'\f104'}i.mce-i-ltr:before{content:'\f320'}.wp-editor-wrap{position:relative}.wp-editor-tools{position:relative;z-index:1}.wp-editor-container{clear:both}.wp-editor-area{font-family:Consolas,Monaco,monospace;font-size:13px;padding:10px;margin:1px 0 0;line-height:150%;border:0 none;outline:0;display:block;resize:vertical;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.wp-editor-tools{padding:0}.wp-editor-container textarea.wp-editor-area{width:100%;margin:0;-webkit-box-shadow:none;box-shadow:none}.quicktags-toolbar{border-bottom:1px solid #dedede;background:#f5f5f5}.wp-editor-tabs{float:left}.wp-switch-editor{background:#ebebeb;border:1px solid #dedede;color:#777;cursor:pointer;float:left;font:13px/19px "Open Sans",sans-serif;height:19px;margin:5px 5px 0 0;padding:3px 8px 4px;position:relative;top:1px}.wp-switch-editor:active{background-color:#f1f1f1}.wp-switch-editor:hover{text-decoration:none!important;background:#fff}.js .tmce-active .wp-editor-area{color:#fff}.tmce-active .quicktags-toolbar{display:none}.tmce-active .switch-tmce,.html-active .switch-html{background:#f5f5f5;color:#555;height:20px;border-bottom:0}.wp-media-buttons{float:right}.wp-media-buttons .button{margin-left:5px;margin-bottom:4px;padding-right:7px;padding-left:7px}.wp-media-buttons .button:active{position:relative;top:1px;margin-top:-1px;margin-bottom:1px}.wp-media-buttons .insert-media{padding-right:5px}.wp-media-buttons a{text-decoration:none;color:#464646;font-size:12px}.wp-media-buttons img{padding:0 4px;vertical-align:middle}.wp-media-buttons span.wp-media-buttons-icon{display:inline-block;width:18px;height:18px;vertical-align:text-top;margin:0 2px}.wp-media-buttons .add_media span.wp-media-buttons-icon{background:0}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{content:'\f104'}.quicktags-toolbar{border-bottom-style:solid;border-bottom-width:1px;-webkit-border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-left-radius:3px;border-top-right-radius:3px;padding:2px 8px 0;min-height:29px}.quicktags-toolbar>div{padding:2px 4px 0}.quicktags-toolbar input{margin:2px 1px 4px;line-height:18px;display:inline-block;min-width:26px;padding:2px 4px;font:12px/18px "Open Sans",sans-serif;color:#464646;border:1px solid #c3c3c3;-webkit-border-radius:3px;border-radius:3px;background:#eee;background-image:-webkit-gradient(linear,right bottom,right top,from(#e3e3e3),to(#fff));background-image:-webkit-linear-gradient(bottom,#e3e3e3,#fff);background-image:-moz-linear-gradient(bottom,#e3e3e3,#fff);background-image:-o-linear-gradient(bottom,#e3e3e3,#fff);background-image:linear-gradient(to top,#e3e3e3,#fff)}.quicktags-toolbar input:hover{border-color:#aaa;background:#ddd}.quicktags-toolbar input[value=link]{text-decoration:underline}.quicktags-toolbar input[value=del]{text-decoration:line-through}.quicktags-toolbar input[value="i"]{font-style:italic}.quicktags-toolbar input[value="b"]{font-weight:700}#wp_editbtns,#wp_gallerybtns{padding:2px;position:absolute;display:none;z-index:155000}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;margin:2px;padding:2px;border-width:1px;border-style:solid;-webkit-border-radius:3px;border-radius:3px}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc}#wp-link{background-color:#F5F5F5;line-height:1.4em;font-size:12px}#wp-link ol,#wp-link ul{list-style:none;margin:0;padding:0}#wp-link input[type=text]{-webkit-box-sizing:border-box}#wp-link input[type=text],#wp-link textarea{border-width:1px;border-style:solid;-webkit-border-radius:4px;border-radius:4px;font-size:12px;margin:1px;padding:3px}#wp-link #link-options{padding:10px 0 14px;border-bottom:1px solid #dfdfdf;margin:0 6px 14px}#wp-link p.howto{margin:3px}#wp-link #internal-toggle{display:inline-block;cursor:pointer;padding-right:18px}#wp-link .toggle-arrow{background:transparent url(../images/toggle-arrow.png) top right no-repeat;height:23px;line-height:23px}#wp-link .toggle-arrow-active{background-position:center right}#wp-link label input[type=text]{width:360px;margin-top:5px}#wp-link #link-options label span,#wp-link #search-panel label span.search-label{display:inline-block;width:80px;text-align:left;padding-left:5px}#wp-link .link-search-field{float:right;width:220px}#wp-link .link-search-wrapper{margin:5px 6px 9px;display:block;overflow:hidden}#wp-link .link-search-wrapper span{float:right;margin-top:4px}#wp-link .link-search-wrapper .spinner{display:none;vertical-align:text-bottom}#wp-link .link-target{width:auto;padding:3px 0 0;margin:0 87px 0 0;font-size:11px}#wp-link .query-results{border:1px #dfdfdf solid;margin:0 5px 5px;background:#fff;height:185px;overflow:auto;position:relative}#wp-link li,#wp-link .query-notice{clear:both;margin-bottom:0;border-bottom:1px solid #f1f1f1;color:#333;padding:4px 6px;cursor:pointer;position:relative}#wp-link li:hover{background:#eaf2fa;color:#151515}#wp-link li.unselectable{border-bottom:1px solid #dfdfdf}#wp-link li.unselectable:hover{background:#fff;cursor:auto;color:#333}#wp-link li.selected{background:#ddd;color:#333}#wp-link li.selected .item-title{font-weight:700}#wp-link .item-title{display:inline-block;width:80%}#wp-link .item-info{text-transform:uppercase;color:#666;font-size:11px;position:absolute;left:5px;top:4px;bottom:0}#wp-link #search-results{display:none}#wp-link #search-panel{float:right;width:100%}#wp-link .river-waiting{display:none;padding:10px 0}#wp-link .river-waiting .spinner{margin:0 auto;display:block}#wp-link .submitbox{padding:5px 10px;font-size:11px;overflow:auto;height:29px}#wp-link-cancel{line-height:25px;float:right}#wp-link-update{line-height:23px;float:left}/*! * jQuery UI CSS Framework 1.10.1 * http://jqueryui.com * diff --git a/wp-includes/css/editor.css b/wp-includes/css/editor.css index b35a1a8e4d..3f89381c4c 100644 --- a/wp-includes/css/editor.css +++ b/wp-includes/css/editor.css @@ -2,12 +2,13 @@ TinyMCE and Quicklinks toolbars ------------------------------------------------------------------------------*/ -.mce-panel { +div.mce-panel { border: 0; background: #fff; + filter: none; } -.mce-toolbar-grp { +div.mce-toolbar-grp { border-bottom: 1px solid #dedede; background: #f5f5f5; } @@ -40,6 +41,7 @@ margin: 0 1px; -webkit-border-radius: 2px; border-radius: 2px; + filter: none; } #wp-fullscreen-buttons .mce-btn:hover, @@ -107,37 +109,37 @@ color: #333; } -.mce-i-bold, -.mce-i-italic, -.mce-i-bullist, -.mce-i-numlist, -.mce-i-blockquote, -.mce-i-alignleft, -.mce-i-aligncenter, -.mce-i-alignright, -.mce-i-link, -.mce-i-unlink, -.mce-i-wp_more, -.mce-i-strikethrough, -.mce-i-spellchecker, -.mce-i-fullscreen, -.mce-i-wp_fullscreen, -.mce-i-wp_adv, -.mce-i-underline, -.mce-i-alignjustify, -.mce-i-forecolor, -.mce-i-pastetext, -.mce-i-pasteword, -.mce-i-removeformat, -.mce-i-charmap, -.mce-i-outdent, -.mce-i-indent, -.mce-i-undo, -.mce-i-redo, -.mce-i-help, -.mce-i-wp_help, -.mce-i-wp-media-library, -.mce-i-ltr { +i.mce-i-bold, +i.mce-i-italic, +i.mce-i-bullist, +i.mce-i-numlist, +i.mce-i-blockquote, +i.mce-i-alignleft, +i.mce-i-aligncenter, +i.mce-i-alignright, +i.mce-i-link, +i.mce-i-unlink, +i.mce-i-wp_more, +i.mce-i-strikethrough, +i.mce-i-spellchecker, +i.mce-i-fullscreen, +i.mce-i-wp_fullscreen, +i.mce-i-wp_adv, +i.mce-i-underline, +i.mce-i-alignjustify, +i.mce-i-forecolor, +i.mce-i-pastetext, +i.mce-i-pasteword, +i.mce-i-removeformat, +i.mce-i-charmap, +i.mce-i-outdent, +i.mce-i-indent, +i.mce-i-undo, +i.mce-i-redo, +i.mce-i-help, +i.mce-i-wp_help, +i.mce-i-wp-media-library, +i.mce-i-ltr { font: normal 20px/1 'dashicons'; padding: 0; vertical-align: top; @@ -146,116 +148,117 @@ -moz-osx-font-smoothing: grayscale; } -.mce-i-bold:before { +i.mce-i-bold:before { content: '\f200'; } -.mce-i-italic:before { +i.mce-i-italic:before { content: '\f201'; } -.mce-i-bullist:before { +i.mce-i-bullist:before { content: '\f203'; } -.mce-i-numlist:before { +i.mce-i-numlist:before { content: '\f204'; } -.mce-i-blockquote:before { +i.mce-i-blockquote:before { content: '\f205'; } -.mce-i-alignleft:before { +i.mce-i-alignleft:before { content: '\f206'; } -.mce-i-aligncenter:before { +i.mce-i-aligncenter:before { content: '\f207'; } -.mce-i-alignright:before { +i.mce-i-alignright:before { content: '\f208'; } -.mce-i-link:before { +i.mce-i-link:before { content: '\f103'; } -.mce-i-unlink:before { +i.mce-i-unlink:before { content: '\f225'; } -.mce-i-wp_more:before { +i.mce-i-wp_more:before { content: '\f209'; } -.mce-i-strikethrough:before { +i.mce-i-strikethrough:before { content: '\f224'; } -.mce-i-spellchecker:before { +i.mce-i-spellchecker:before { content: '\f210'; } -.mce-i-fullscreen:before, -.mce-i-wp_fullscreen:before { +i.mce-i-fullscreen:before, +i.mce-i-wp_fullscreen:before { content: '\f211'; } -.mce-i-wp_adv:before { +i.mce-i-wp_adv:before { content: '\f212'; } -.mce-i-underline:before { + +i.mce-i-underline:before { content: '\f213'; } -.mce-i-alignjustify:before { +i.mce-i-alignjustify:before { content: '\f214'; } -.mce-i-forecolor:before { +i.mce-i-forecolor:before { content: '\f215'; } -.mce-i-pastetext:before { +i.mce-i-pastetext:before { content: '\f217'; } -.mce-i-removeformat:before { +i.mce-i-removeformat:before { content: '\f218'; } -.mce-i-charmap:before { +i.mce-i-charmap:before { content: '\f220'; } -.mce-i-outdent:before { +i.mce-i-outdent:before { content: '\f221'; } -.mce-i-indent:before { +i.mce-i-indent:before { content: '\f222'; } -.mce-i-undo:before { +i.mce-i-undo:before { content: '\f171'; } -.mce-i-redo:before { +i.mce-i-redo:before { content: '\f172'; } -.mce-i-help:before, -.mce-i-wp_help:before { +i.mce-i-help:before, +i.mce-i-wp_help:before { content: '\f223'; } -.mce-i-wp-media-library:before { +i.mce-i-wp-media-library:before { content: '\f104'; } -.mce-i-ltr:before { +i.mce-i-ltr:before { content: '\f320'; } @@ -299,8 +302,7 @@ box-shadow: none; } -.quicktags-toolbar, -.wp_themeSkin tr.mceFirst td.mceToolbar { +.quicktags-toolbar { border-bottom: 1px solid #dedede; background: #f5f5f5; } diff --git a/wp-includes/css/editor.min.css b/wp-includes/css/editor.min.css index a2823ee139..56a52893b2 100644 --- a/wp-includes/css/editor.min.css +++ b/wp-includes/css/editor.min.css @@ -1,4 +1,4 @@ -.mce-panel{border:0;background:#fff}.mce-toolbar-grp{border-bottom:1px solid #dedede;background:#f5f5f5}.mce-toolbar{padding:1px 3px}.mce-statusbar{border-top:1px solid #eee}.mce-path{padding:0 8px 1px}.mce-path-item{line-height:1}.mce-toolbar .mce-btn{border-color:transparent;background:transparent;box-shadow:none}#wp-fullscreen-buttons .mce-btn,.mce-toolbar .mce-btn-group .mce-btn{border:1px solid transparent;margin:0 1px;-webkit-border-radius:2px;border-radius:2px}#wp-fullscreen-buttons .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn.mce-active{box-shadow:0 0 transparent;border-color:#bbb;background:#eee;background-image:-webkit-gradient(linear,left bottom,left top,from(#e5e5e5),to(#fff));background-image:-webkit-linear-gradient(bottom,#e5e5e5,#fff);background-image:linear-gradient(to top,#e5e5e5,#fff)}.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover{border-color:transparent;background:transparent}.mce-toolbar .mce-btn-group .mce-first,.mce-toolbar .mce-btn-group .mce-last{border-color:transparent}.mce-toolbar .mce-btn button{padding:2px 3px;line-height:normal}.mce-toolbar .mce-btn i{text-shadow:0}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox{border-radius:0;direction:ltr;background:#fff;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2);box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2)}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover{background-image:none;border-color:#bbb}.mce-toolbar .mce-colorbutton .mce-open{border-right:0}.mce-toolbar .mce-colorbutton .mce-preview{margin-left:-16px}.mce-toolbar .mce-ico{color:#777;line-height:20px;width:20px;height:20px;text-align:center}.mce-toolbar .mce-btn:hover .mce-ico{color:#333}.mce-i-bold,.mce-i-italic,.mce-i-bullist,.mce-i-numlist,.mce-i-blockquote,.mce-i-alignleft,.mce-i-aligncenter,.mce-i-alignright,.mce-i-link,.mce-i-unlink,.mce-i-wp_more,.mce-i-strikethrough,.mce-i-spellchecker,.mce-i-fullscreen,.mce-i-wp_fullscreen,.mce-i-wp_adv,.mce-i-underline,.mce-i-alignjustify,.mce-i-forecolor,.mce-i-pastetext,.mce-i-pasteword,.mce-i-removeformat,.mce-i-charmap,.mce-i-outdent,.mce-i-indent,.mce-i-undo,.mce-i-redo,.mce-i-help,.mce-i-wp_help,.mce-i-wp-media-library,.mce-i-ltr{font:400 20px/1 dashicons;padding:0;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.mce-i-bold:before{content:'\f200'}.mce-i-italic:before{content:'\f201'}.mce-i-bullist:before{content:'\f203'}.mce-i-numlist:before{content:'\f204'}.mce-i-blockquote:before{content:'\f205'}.mce-i-alignleft:before{content:'\f206'}.mce-i-aligncenter:before{content:'\f207'}.mce-i-alignright:before{content:'\f208'}.mce-i-link:before{content:'\f103'}.mce-i-unlink:before{content:'\f225'}.mce-i-wp_more:before{content:'\f209'}.mce-i-strikethrough:before{content:'\f224'}.mce-i-spellchecker:before{content:'\f210'}.mce-i-fullscreen:before,.mce-i-wp_fullscreen:before{content:'\f211'}.mce-i-wp_adv:before{content:'\f212'}.mce-i-underline:before{content:'\f213'}.mce-i-alignjustify:before{content:'\f214'}.mce-i-forecolor:before{content:'\f215'}.mce-i-pastetext:before{content:'\f217'}.mce-i-removeformat:before{content:'\f218'}.mce-i-charmap:before{content:'\f220'}.mce-i-outdent:before{content:'\f221'}.mce-i-indent:before{content:'\f222'}.mce-i-undo:before{content:'\f171'}.mce-i-redo:before{content:'\f172'}.mce-i-help:before,.mce-i-wp_help:before{content:'\f223'}.mce-i-wp-media-library:before{content:'\f104'}.mce-i-ltr:before{content:'\f320'}.wp-editor-wrap{position:relative}.wp-editor-tools{position:relative;z-index:1}.wp-editor-container{clear:both}.wp-editor-area{font-family:Consolas,Monaco,monospace;font-size:13px;padding:10px;margin:1px 0 0;line-height:150%;border:0 none;outline:0;display:block;resize:vertical;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.wp-editor-tools{padding:0}.wp-editor-container textarea.wp-editor-area{width:100%;margin:0;-webkit-box-shadow:none;box-shadow:none}.quicktags-toolbar,.wp_themeSkin tr.mceFirst td.mceToolbar{border-bottom:1px solid #dedede;background:#f5f5f5}.wp-editor-tabs{float:right}.wp-switch-editor{background:#ebebeb;border:1px solid #dedede;color:#777;cursor:pointer;float:right;font:13px/19px "Open Sans",sans-serif;height:19px;margin:5px 0 0 5px;padding:3px 8px 4px;position:relative;top:1px}.wp-switch-editor:active{background-color:#f1f1f1}.wp-switch-editor:hover{text-decoration:none!important;background:#fff}.js .tmce-active .wp-editor-area{color:#fff}.tmce-active .quicktags-toolbar{display:none}.tmce-active .switch-tmce,.html-active .switch-html{background:#f5f5f5;color:#555;height:20px;border-bottom:0}.wp-media-buttons{float:left}.wp-media-buttons .button{margin-right:5px;margin-bottom:4px;padding-left:7px;padding-right:7px}.wp-media-buttons .button:active{position:relative;top:1px;margin-top:-1px;margin-bottom:1px}.wp-media-buttons .insert-media{padding-left:5px}.wp-media-buttons a{text-decoration:none;color:#464646;font-size:12px}.wp-media-buttons img{padding:0 4px;vertical-align:middle}.wp-media-buttons span.wp-media-buttons-icon{display:inline-block;width:18px;height:18px;vertical-align:text-top;margin:0 2px}.wp-media-buttons .add_media span.wp-media-buttons-icon{background:0}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{content:'\f104'}.quicktags-toolbar{border-bottom-style:solid;border-bottom-width:1px;-webkit-border-top-right-radius:3px;-webkit-border-top-left-radius:3px;border-top-right-radius:3px;border-top-left-radius:3px;padding:2px 8px 0;min-height:29px}.quicktags-toolbar>div{padding:2px 4px 0}.quicktags-toolbar input{margin:2px 1px 4px;line-height:18px;display:inline-block;min-width:26px;padding:2px 4px;font:12px/18px "Open Sans",sans-serif;color:#464646;border:1px solid #c3c3c3;-webkit-border-radius:3px;border-radius:3px;background:#eee;background-image:-webkit-gradient(linear,left bottom,left top,from(#e3e3e3),to(#fff));background-image:-webkit-linear-gradient(bottom,#e3e3e3,#fff);background-image:-moz-linear-gradient(bottom,#e3e3e3,#fff);background-image:-o-linear-gradient(bottom,#e3e3e3,#fff);background-image:linear-gradient(to top,#e3e3e3,#fff)}.quicktags-toolbar input:hover{border-color:#aaa;background:#ddd}.quicktags-toolbar input[value=link]{text-decoration:underline}.quicktags-toolbar input[value=del]{text-decoration:line-through}.quicktags-toolbar input[value="i"]{font-style:italic}.quicktags-toolbar input[value="b"]{font-weight:700}#wp_editbtns,#wp_gallerybtns{padding:2px;position:absolute;display:none;z-index:155000}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;margin:2px;padding:2px;border-width:1px;border-style:solid;-webkit-border-radius:3px;border-radius:3px}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc}#wp-link{background-color:#F5F5F5;line-height:1.4em;font-size:12px}#wp-link ol,#wp-link ul{list-style:none;margin:0;padding:0}#wp-link input[type=text]{-webkit-box-sizing:border-box}#wp-link input[type=text],#wp-link textarea{border-width:1px;border-style:solid;-webkit-border-radius:4px;border-radius:4px;font-size:12px;margin:1px;padding:3px}#wp-link #link-options{padding:10px 0 14px;border-bottom:1px solid #dfdfdf;margin:0 6px 14px}#wp-link p.howto{margin:3px}#wp-link #internal-toggle{display:inline-block;cursor:pointer;padding-left:18px}#wp-link .toggle-arrow{background:transparent url(../images/toggle-arrow.png) top left no-repeat;height:23px;line-height:23px}#wp-link .toggle-arrow-active{background-position:center left}#wp-link label input[type=text]{width:360px;margin-top:5px}#wp-link #link-options label span,#wp-link #search-panel label span.search-label{display:inline-block;width:80px;text-align:right;padding-right:5px}#wp-link .link-search-field{float:left;width:220px}#wp-link .link-search-wrapper{margin:5px 6px 9px;display:block;overflow:hidden}#wp-link .link-search-wrapper span{float:left;margin-top:4px}#wp-link .link-search-wrapper .spinner{display:none;vertical-align:text-bottom}#wp-link .link-target{width:auto;padding:3px 0 0;margin:0 0 0 87px;font-size:11px}#wp-link .query-results{border:1px #dfdfdf solid;margin:0 5px 5px;background:#fff;height:185px;overflow:auto;position:relative}#wp-link li,#wp-link .query-notice{clear:both;margin-bottom:0;border-bottom:1px solid #f1f1f1;color:#333;padding:4px 6px;cursor:pointer;position:relative}#wp-link li:hover{background:#eaf2fa;color:#151515}#wp-link li.unselectable{border-bottom:1px solid #dfdfdf}#wp-link li.unselectable:hover{background:#fff;cursor:auto;color:#333}#wp-link li.selected{background:#ddd;color:#333}#wp-link li.selected .item-title{font-weight:700}#wp-link .item-title{display:inline-block;width:80%}#wp-link .item-info{text-transform:uppercase;color:#666;font-size:11px;position:absolute;right:5px;top:4px;bottom:0}#wp-link #search-results{display:none}#wp-link #search-panel{float:left;width:100%}#wp-link .river-waiting{display:none;padding:10px 0}#wp-link .river-waiting .spinner{margin:0 auto;display:block}#wp-link .submitbox{padding:5px 10px;font-size:11px;overflow:auto;height:29px}#wp-link-cancel{line-height:25px;float:left}#wp-link-update{line-height:23px;float:right}/*! +div.mce-panel{border:0;background:#fff;filter:none}div.mce-toolbar-grp{border-bottom:1px solid #dedede;background:#f5f5f5}.mce-toolbar{padding:1px 3px}.mce-statusbar{border-top:1px solid #eee}.mce-path{padding:0 8px 1px}.mce-path-item{line-height:1}.mce-toolbar .mce-btn{border-color:transparent;background:transparent;box-shadow:none}#wp-fullscreen-buttons .mce-btn,.mce-toolbar .mce-btn-group .mce-btn{border:1px solid transparent;margin:0 1px;-webkit-border-radius:2px;border-radius:2px;filter:none}#wp-fullscreen-buttons .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn:hover,.mce-toolbar .mce-btn-group .mce-btn.mce-active{box-shadow:0 0 transparent;border-color:#bbb;background:#eee;background-image:-webkit-gradient(linear,left bottom,left top,from(#e5e5e5),to(#fff));background-image:-webkit-linear-gradient(bottom,#e5e5e5,#fff);background-image:linear-gradient(to top,#e5e5e5,#fff)}.mce-toolbar .mce-btn-group .mce-disabled.mce-btn:hover{border-color:transparent;background:transparent}.mce-toolbar .mce-btn-group .mce-first,.mce-toolbar .mce-btn-group .mce-last{border-color:transparent}.mce-toolbar .mce-btn button{padding:2px 3px;line-height:normal}.mce-toolbar .mce-btn i{text-shadow:0}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox{border-radius:0;direction:ltr;background:#fff;border:1px solid #ddd;-webkit-box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2);box-shadow:inset 0 1px 1px -1px rgba(0,0,0,.2)}.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover{background-image:none;border-color:#bbb}.mce-toolbar .mce-colorbutton .mce-open{border-right:0}.mce-toolbar .mce-colorbutton .mce-preview{margin-left:-16px}.mce-toolbar .mce-ico{color:#777;line-height:20px;width:20px;height:20px;text-align:center}.mce-toolbar .mce-btn:hover .mce-ico{color:#333}i.mce-i-bold,i.mce-i-italic,i.mce-i-bullist,i.mce-i-numlist,i.mce-i-blockquote,i.mce-i-alignleft,i.mce-i-aligncenter,i.mce-i-alignright,i.mce-i-link,i.mce-i-unlink,i.mce-i-wp_more,i.mce-i-strikethrough,i.mce-i-spellchecker,i.mce-i-fullscreen,i.mce-i-wp_fullscreen,i.mce-i-wp_adv,i.mce-i-underline,i.mce-i-alignjustify,i.mce-i-forecolor,i.mce-i-pastetext,i.mce-i-pasteword,i.mce-i-removeformat,i.mce-i-charmap,i.mce-i-outdent,i.mce-i-indent,i.mce-i-undo,i.mce-i-redo,i.mce-i-help,i.mce-i-wp_help,i.mce-i-wp-media-library,i.mce-i-ltr{font:400 20px/1 dashicons;padding:0;vertical-align:top;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}i.mce-i-bold:before{content:'\f200'}i.mce-i-italic:before{content:'\f201'}i.mce-i-bullist:before{content:'\f203'}i.mce-i-numlist:before{content:'\f204'}i.mce-i-blockquote:before{content:'\f205'}i.mce-i-alignleft:before{content:'\f206'}i.mce-i-aligncenter:before{content:'\f207'}i.mce-i-alignright:before{content:'\f208'}i.mce-i-link:before{content:'\f103'}i.mce-i-unlink:before{content:'\f225'}i.mce-i-wp_more:before{content:'\f209'}i.mce-i-strikethrough:before{content:'\f224'}i.mce-i-spellchecker:before{content:'\f210'}i.mce-i-fullscreen:before,i.mce-i-wp_fullscreen:before{content:'\f211'}i.mce-i-wp_adv:before{content:'\f212'}i.mce-i-underline:before{content:'\f213'}i.mce-i-alignjustify:before{content:'\f214'}i.mce-i-forecolor:before{content:'\f215'}i.mce-i-pastetext:before{content:'\f217'}i.mce-i-removeformat:before{content:'\f218'}i.mce-i-charmap:before{content:'\f220'}i.mce-i-outdent:before{content:'\f221'}i.mce-i-indent:before{content:'\f222'}i.mce-i-undo:before{content:'\f171'}i.mce-i-redo:before{content:'\f172'}i.mce-i-help:before,i.mce-i-wp_help:before{content:'\f223'}i.mce-i-wp-media-library:before{content:'\f104'}i.mce-i-ltr:before{content:'\f320'}.wp-editor-wrap{position:relative}.wp-editor-tools{position:relative;z-index:1}.wp-editor-container{clear:both}.wp-editor-area{font-family:Consolas,Monaco,monospace;font-size:13px;padding:10px;margin:1px 0 0;line-height:150%;border:0 none;outline:0;display:block;resize:vertical;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.wp-editor-tools{padding:0}.wp-editor-container textarea.wp-editor-area{width:100%;margin:0;-webkit-box-shadow:none;box-shadow:none}.quicktags-toolbar{border-bottom:1px solid #dedede;background:#f5f5f5}.wp-editor-tabs{float:right}.wp-switch-editor{background:#ebebeb;border:1px solid #dedede;color:#777;cursor:pointer;float:right;font:13px/19px "Open Sans",sans-serif;height:19px;margin:5px 0 0 5px;padding:3px 8px 4px;position:relative;top:1px}.wp-switch-editor:active{background-color:#f1f1f1}.wp-switch-editor:hover{text-decoration:none!important;background:#fff}.js .tmce-active .wp-editor-area{color:#fff}.tmce-active .quicktags-toolbar{display:none}.tmce-active .switch-tmce,.html-active .switch-html{background:#f5f5f5;color:#555;height:20px;border-bottom:0}.wp-media-buttons{float:left}.wp-media-buttons .button{margin-right:5px;margin-bottom:4px;padding-left:7px;padding-right:7px}.wp-media-buttons .button:active{position:relative;top:1px;margin-top:-1px;margin-bottom:1px}.wp-media-buttons .insert-media{padding-left:5px}.wp-media-buttons a{text-decoration:none;color:#464646;font-size:12px}.wp-media-buttons img{padding:0 4px;vertical-align:middle}.wp-media-buttons span.wp-media-buttons-icon{display:inline-block;width:18px;height:18px;vertical-align:text-top;margin:0 2px}.wp-media-buttons .add_media span.wp-media-buttons-icon{background:0}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{font:400 18px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.wp-media-buttons .add_media span.wp-media-buttons-icon:before{content:'\f104'}.quicktags-toolbar{border-bottom-style:solid;border-bottom-width:1px;-webkit-border-top-right-radius:3px;-webkit-border-top-left-radius:3px;border-top-right-radius:3px;border-top-left-radius:3px;padding:2px 8px 0;min-height:29px}.quicktags-toolbar>div{padding:2px 4px 0}.quicktags-toolbar input{margin:2px 1px 4px;line-height:18px;display:inline-block;min-width:26px;padding:2px 4px;font:12px/18px "Open Sans",sans-serif;color:#464646;border:1px solid #c3c3c3;-webkit-border-radius:3px;border-radius:3px;background:#eee;background-image:-webkit-gradient(linear,left bottom,left top,from(#e3e3e3),to(#fff));background-image:-webkit-linear-gradient(bottom,#e3e3e3,#fff);background-image:-moz-linear-gradient(bottom,#e3e3e3,#fff);background-image:-o-linear-gradient(bottom,#e3e3e3,#fff);background-image:linear-gradient(to top,#e3e3e3,#fff)}.quicktags-toolbar input:hover{border-color:#aaa;background:#ddd}.quicktags-toolbar input[value=link]{text-decoration:underline}.quicktags-toolbar input[value=del]{text-decoration:line-through}.quicktags-toolbar input[value="i"]{font-style:italic}.quicktags-toolbar input[value="b"]{font-weight:700}#wp_editbtns,#wp_gallerybtns{padding:2px;position:absolute;display:none;z-index:155000}#wp_editimgbtn,#wp_delimgbtn,#wp_editgallery,#wp_delgallery{border-color:#999;background-color:#eee;margin:2px;padding:2px;border-width:1px;border-style:solid;-webkit-border-radius:3px;border-radius:3px}#wp_editimgbtn:hover,#wp_delimgbtn:hover,#wp_editgallery:hover,#wp_delgallery:hover{border-color:#555;background-color:#ccc}#wp-link{background-color:#F5F5F5;line-height:1.4em;font-size:12px}#wp-link ol,#wp-link ul{list-style:none;margin:0;padding:0}#wp-link input[type=text]{-webkit-box-sizing:border-box}#wp-link input[type=text],#wp-link textarea{border-width:1px;border-style:solid;-webkit-border-radius:4px;border-radius:4px;font-size:12px;margin:1px;padding:3px}#wp-link #link-options{padding:10px 0 14px;border-bottom:1px solid #dfdfdf;margin:0 6px 14px}#wp-link p.howto{margin:3px}#wp-link #internal-toggle{display:inline-block;cursor:pointer;padding-left:18px}#wp-link .toggle-arrow{background:transparent url(../images/toggle-arrow.png) top left no-repeat;height:23px;line-height:23px}#wp-link .toggle-arrow-active{background-position:center left}#wp-link label input[type=text]{width:360px;margin-top:5px}#wp-link #link-options label span,#wp-link #search-panel label span.search-label{display:inline-block;width:80px;text-align:right;padding-right:5px}#wp-link .link-search-field{float:left;width:220px}#wp-link .link-search-wrapper{margin:5px 6px 9px;display:block;overflow:hidden}#wp-link .link-search-wrapper span{float:left;margin-top:4px}#wp-link .link-search-wrapper .spinner{display:none;vertical-align:text-bottom}#wp-link .link-target{width:auto;padding:3px 0 0;margin:0 0 0 87px;font-size:11px}#wp-link .query-results{border:1px #dfdfdf solid;margin:0 5px 5px;background:#fff;height:185px;overflow:auto;position:relative}#wp-link li,#wp-link .query-notice{clear:both;margin-bottom:0;border-bottom:1px solid #f1f1f1;color:#333;padding:4px 6px;cursor:pointer;position:relative}#wp-link li:hover{background:#eaf2fa;color:#151515}#wp-link li.unselectable{border-bottom:1px solid #dfdfdf}#wp-link li.unselectable:hover{background:#fff;cursor:auto;color:#333}#wp-link li.selected{background:#ddd;color:#333}#wp-link li.selected .item-title{font-weight:700}#wp-link .item-title{display:inline-block;width:80%}#wp-link .item-info{text-transform:uppercase;color:#666;font-size:11px;position:absolute;right:5px;top:4px;bottom:0}#wp-link #search-results{display:none}#wp-link #search-panel{float:left;width:100%}#wp-link .river-waiting{display:none;padding:10px 0}#wp-link .river-waiting .spinner{margin:0 auto;display:block}#wp-link .submitbox{padding:5px 10px;font-size:11px;overflow:auto;height:29px}#wp-link-cancel{line-height:25px;float:left}#wp-link-update{line-height:23px;float:right}/*! * jQuery UI CSS Framework 1.10.1 * http://jqueryui.com * diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 4cf15899b1..1fe5aae93e 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -4,10 +4,14 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { last = 0; function toggleToolbars( state ) { - var iframe, - pixels = 0, - initial = state === 'hide', - toolbars = editor.theme.panel && editor.theme.panel.find('.toolbar'); + var iframe, initial, toolbars, + pixels = 0; + + initial = ( state === 'hide' ); + + if ( editor.theme.panel ) { + toolbars = editor.theme.panel.find('.toolbar'); + } if ( ! toolbars || toolbars.length < 2 || ( state === 'hide' && ! toolbars[1].visible() ) ) { return; diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js index 94057c3ed7..66b641b1b8 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d=0,e="hide"===b,f=a.theme.panel&&a.theme.panel.find(".toolbar");!f||f.length<2||"hide"===b&&!f[1].visible()||(!b&&f[1].visible()&&(b="hide"),tinymce.each(f,function(a,c){c>0&&("hide"===b?(a.hide(),d+=30):(a.show(),d-=30))}),d&&!e&&(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+d),"hide"===b?(setUserSetting("hidetb","1"),g&&g.active(!1)):(setUserSetting("hidetb","0"),g&&g.active(!0))))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this}}),a.on("PostRender",function(){"1"===getUserSetting("hidetb","1")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(a){a.content&&(-1!==a.content.indexOf("/g,function(a,b){return''})),-1!==a.content.indexOf("")&&(a.content=a.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf("wp-more-tag")&&(-1!==a.indexOf("mce-wp-more")?((b=a.match(/data-wp-more="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf("mce-wp-nextpage")&&(a="")),a}))}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-more-tag")&&(c.hasClass(d,"mce-wp-more")?b.name="more":c.hasClass(d,"mce-wp-nextpage")&&(b.name="nextpage"))}),a.addCommand("WP_More",function(b){var c,d,e,f="wp-more-tag",g=a.dom,h=a.selection.getNode();return b=b||"more",f+=" mce-wp-"+b,e="more"===b?"More...":"Next Page",d='',"BODY"===h.nodeName?(a.insertContent("

"+d+"

"),void 0):(c=g.getParent(h,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),c&&g.insertAfter(g.create("p",null,d),c),void 0)}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Help",cmd:"WP_Help"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b=tinymce.Env,c=["mceContentBody"],d=a.getBody();"rtl"===a.getParam("directionality")&&c.push("rtl"),b.ie&&(9===parseInt(b.ie,10)?c.push("ie9"):8===parseInt(b.ie,10)?c.push("ie8"):b.ie<8&&c.push("ie7")),c.push("wp-editor"),tinymce.each(c,function(b){b&&a.dom.addClass(d,b)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))})}),"undefined"!=typeof jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return a.isHidden()?(b.content=b.element.value,void 0):(b.content=b.content.replace(/

(
|\u00a0|\uFEFF)?<\/p>/g,"

 

"),a.getParam("wpautop",!0)&&"undefined"!=typeof switchEditors&&(b.content=switchEditors.pre_wpautop(b.content)),void 0)}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+a","","WP_Link"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut("ctrl+s","",function(){"function"==typeof autosave&&autosave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ No newline at end of file +tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d,e,f=0;d="hide"===b,a.theme.panel&&(e=a.theme.panel.find(".toolbar")),!e||e.length<2||"hide"===b&&!e[1].visible()||(!b&&e[1].visible()&&(b="hide"),tinymce.each(e,function(a,c){c>0&&("hide"===b?(a.hide(),f+=30):(a.show(),f-=30))}),f&&!d&&(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+f),"hide"===b?(setUserSetting("hidetb","1"),g&&g.active(!1)):(setUserSetting("hidetb","0"),g&&g.active(!0))))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this}}),a.on("PostRender",function(){"1"===getUserSetting("hidetb","1")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(a){a.content&&(-1!==a.content.indexOf("/g,function(a,b){return''})),-1!==a.content.indexOf("")&&(a.content=a.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf("wp-more-tag")&&(-1!==a.indexOf("mce-wp-more")?((b=a.match(/data-wp-more="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf("mce-wp-nextpage")&&(a="")),a}))}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-more-tag")&&(c.hasClass(d,"mce-wp-more")?b.name="more":c.hasClass(d,"mce-wp-nextpage")&&(b.name="nextpage"))}),a.addCommand("WP_More",function(b){var c,d,e,f="wp-more-tag",g=a.dom,h=a.selection.getNode();return b=b||"more",f+=" mce-wp-"+b,e="more"===b?"More...":"Next Page",d='',"BODY"===h.nodeName?(a.insertContent("

"+d+"

"),void 0):(c=g.getParent(h,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),c&&g.insertAfter(g.create("p",null,d),c),void 0)}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Help",cmd:"WP_Help"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b=tinymce.Env,c=["mceContentBody"],d=a.getBody();"rtl"===a.getParam("directionality")&&c.push("rtl"),b.ie&&(9===parseInt(b.ie,10)?c.push("ie9"):8===parseInt(b.ie,10)?c.push("ie8"):b.ie<8&&c.push("ie7")),c.push("wp-editor"),tinymce.each(c,function(b){b&&a.dom.addClass(d,b)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))})}),"undefined"!=typeof jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return a.isHidden()?(b.content=b.element.value,void 0):(b.content=b.content.replace(/

(
|\u00a0|\uFEFF)?<\/p>/g,"

 

"),a.getParam("wpautop",!0)&&"undefined"!=typeof switchEditors&&(b.content=switchEditors.pre_wpautop(b.content)),void 0)}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+a","","WP_Link"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut("ctrl+s","",function(){"function"==typeof autosave&&autosave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 0c244b1a3f..1bc5a6cfeb 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -49,6 +49,11 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { function getShortcode( content ) { return content.replace( /
]*>([\s\S]+?)<\/div>/g, function( a, b ) { + if ( b.indexOf(']+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi, function( a, b, c, cap ) { var id, cls, w; @@ -129,7 +134,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { captionId = '', captionAlign = '', captionWidth = '', - wrap, parent, html, P, imgId; + wrap, parent, node, html, imgId; // Temp image id so we can find the node later data.id = '__wp-temp-img-id'; @@ -178,7 +183,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } if ( parent && parent.nodeName === 'P' ) { - wrap = dom.create( 'div', { 'class': 'mceTemp' }, html ); + wrap = dom.create( 'div', { 'class': 'mceTemp', 'draggable': 'true' }, html ); dom.insertAfter( wrap, parent ); editor.selection.select( wrap ); editor.nodeChanged(); @@ -187,7 +192,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { dom.remove( parent ); } } else { - editor.selection.setContent( '
' + html + '
' ); + editor.selection.setContent( '
' + html + '
' ); } } else { editor.selection.setContent( html ); @@ -244,7 +249,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { '
'+ html +'
'+ caption +'
'; if ( parent = dom.getParent( imgNode, 'p' ) ) { - wrap = dom.create( 'div', { 'class': 'mceTemp' }, html ); + wrap = dom.create( 'div', { 'class': 'mceTemp', 'draggable': 'true' }, html ); dom.insertAfter( wrap, parent ); editor.selection.select( wrap ); editor.nodeChanged(); @@ -256,7 +261,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { dom.remove( parent ); } } else { - editor.selection.setContent( '
' + html + '
' ); + editor.selection.setContent( '
' + html + '
' ); } } } else { @@ -284,7 +289,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { editor.on( 'wpLoadImageData', function( e ) { var parent, - data = e.imgData.data + data = e.imgData.data, imgNode = e.imgData.node; if ( parent = dom.getParent( imgNode, 'dl.wp-caption' ) ) { diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index a17d8fec70..c90463c65e 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(a){return a.replace(/(?:

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

'+'
'+h+'
'+g+"
"):c})}function c(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var 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});return 0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$2")),c})}return a.on("init",function(){var b=a.dom;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=c.imgData.data,i=c.imgData.node,j=c.imgData.caption,k="",l="",m="";return h.id="__wp-temp-img-id",c.imgData.cancel=!0,h.style||(h.style=null),h.src?(i?(g=i.id||null,b.setAttribs(i,h),d=b.getParent(i,"dl.wp-caption"),j?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=j):(i.className&&(k=i.className.match(/wp-image-([0-9]+)/),l=i.className.match(/align(left|right|center|none)/)),l?(l=l[0],i.className=i.className.replace(/align(left|right|center|none)/g,"")):l="alignnone",l=' class="wp-caption '+l+'"',k&&(k=' id="attachment_'+k[1]+'"'),m=h.width||i.clientWidth,m&&(m=parseInt(m,10)+10,m=' style="width: '+m+'px"'),i.parentNode&&"A"===i.parentNode.nodeName?(f=b.getOuterHTML(i.parentNode),node=i.parentNode):(f=b.getOuterHTML(i),node=i),f="
"+'
'+f+'
'+j+"
",(e=b.getParent(i,"p"))?(d=b.create("div",{"class":"mceTemp"},f),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.remove(node),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+f+"
")):d&&(f="A"===i.parentNode.nodeName?b.getOuterHTML(i.parentNode):b.getOuterHTML(i),e=b.create("p",{},f),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(f=b.createHTML("img",h),j?(node=a.selection.getNode(),h.width&&(m=parseInt(h.width,10)+10,m=' style="width: '+m+'px"'),f='
"+'
'+f+'
'+j+"
",e="P"===node.nodeName?node:b.getParent(node,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},f),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+f+"
")):a.selection.setContent(f)),i=b.get("__wp-temp-img-id"),b.setAttrib(i,"id",g),c.imgData.node=i,void 0):(i&&((d=b.getParent(i,"div.mceTemp"))?b.remove(d):"A"===i.parentNode.nodeName?b.remove(i.parentNode):b.remove(i),a.nodeChanged()),void 0)}),a.on("wpLoadImageData",function(a){var c,d=a.imgData.data;imgNode=a.imgData.node,(c=b.getParent(imgNode,"dl.wp-caption"))&&(c=b.select("dd.wp-caption-dd",c)[0],d.caption=c?c.innerHTML:"")}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault()})}),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)&&(c=a.selection.getNode(),f=g.substr(7).toLowerCase(),f="align"+f,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}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=a.dom;if(b.keyCode===tinymce.util.VK.ENTER)d=h.getParent(a.selection.getNode(),"div.mceTemp"),d&&(h.events.cancel(b),tinymce.each(h.select("dt, dd",d),function(a){h.isEmpty(a)&&h.remove(a)}),f=tinymce.Env.ie?"":'
',e=h.create("p",null,f),h.insertAfter(e,d),g.setCursorLocation(e,0),a.nodeChanged());else if((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&h.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=h.getParent(c,"div.mceTemp")),d))return h.events.cancel(b),d.nextSibling?g.select(d.nextSibling):d.previousSibling?g.select(d.previousSibling):g.select(d.parentNode),g.collapse(!0),a.nodeChanged(),h.remove(d),d=null,!1}),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))}),{_do_shcode:b,_get_shcode:c}}); \ No newline at end of file +tinymce.PluginManager.add("wpeditimage",function(a){function b(a){return a.replace(/(?:

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

'+'
'+h+'
'+g+"
"):c})}function c(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){if(-1===b.indexOf("]+)>\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});return 0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$2")),c})}return a.on("init",function(){var b=a.dom;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?(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)+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",draggable:"true"},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="A"===j.parentNode.nodeName?b.getOuterHTML(j.parentNode):b.getOuterHTML(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)+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",draggable:"true"},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),c.imgData.node=j,void 0):(j&&((d=b.getParent(j,"div.mceTemp"))?b.remove(d):"A"===j.parentNode.nodeName?b.remove(j.parentNode):b.remove(j),a.nodeChanged()),void 0)}),a.on("wpLoadImageData",function(a){var c,d=a.imgData.data,e=a.imgData.node;(c=b.getParent(e,"dl.wp-caption"))&&(c=b.select("dd.wp-caption-dd",c)[0],d.caption=c?c.innerHTML:"")}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault()})}),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)&&(c=a.selection.getNode(),f=g.substr(7).toLowerCase(),f="align"+f,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}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=a.dom;if(b.keyCode===tinymce.util.VK.ENTER)d=h.getParent(a.selection.getNode(),"div.mceTemp"),d&&(h.events.cancel(b),tinymce.each(h.select("dt, dd",d),function(a){h.isEmpty(a)&&h.remove(a)}),f=tinymce.Env.ie?"":'
',e=h.create("p",null,f),h.insertAfter(e,d),g.setCursorLocation(e,0),a.nodeChanged());else if((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&h.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=h.getParent(c,"div.mceTemp")),d))return h.events.cancel(b),d.nextSibling?g.select(d.nextSibling):d.previousSibling?g.select(d.previousSibling):g.select(d.parentNode),g.collapse(!0),a.nodeChanged(),h.remove(d),d=null,!1}),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))}),{_do_shcode:b,_get_shcode:c}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js index f8d5159530..8865bef142 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js @@ -10,11 +10,10 @@ tinymce.PluginManager.add( 'wpfullscreen', function( editor ) { var deltaSize, myHeight, d = editor.getDoc(), body = d.body, - de = d.documentElement, - DOM = tinymce.DOM + DOM = tinymce.DOM, resizeHeight = 250; - if ( ( e && e.type == 'setcontent' && e.initial ) || editor.settings.inline ) { + if ( ( e && e.type === 'setcontent' && e.initial ) || editor.settings.inline ) { return; } diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js index 0cfbfd7512..51e31280d5 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wpfullscreen",function(a){function b(c){var d,e,f=a.getDoc(),h=f.body,i=(f.documentElement,tinymce.DOM);resizeHeight=250,c&&"setcontent"==c.type&&c.initial||a.settings.inline||(e=tinymce.Env.ie?h.scrollHeight:tinymce.Env.webkit&&0===h.clientHeight?0:h.offsetHeight,e>250&&(resizeHeight=e),h.scrollTop=0,resizeHeight!==g&&(d=resizeHeight-g,i.setStyle(i.get(a.id+"_ifr"),"height",resizeHeight+"px"),g=resizeHeight,tinymce.isWebKit&&0>d&&b(c)))}function c(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.on("change setcontent paste keyup",b)}function d(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.off("change setcontent paste keyup",b),g=0}function e(){"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&(a.getParam("wp_fullscreen")?wp.editor.fullscreen.off():wp.editor.fullscreen.on())}var f=a.settings,g=0;a.addCommand("wpAutoResize",b),a.addCommand("wpFullScreenOn",c),a.addCommand("wpFullScreenOff",d),a.addCommand("wpFullScreen",e),a.on("init",function(){a.getParam("wp_fullscreen")&&c(),a.addShortcut("alt+shift+w","","wpFullScreen")}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:e}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",shortcut:"Alt+Shift+W",context:"view",onclick:e})}); \ No newline at end of file +tinymce.PluginManager.add("wpfullscreen",function(a){function b(c){var d,e,f=a.getDoc(),h=f.body,i=tinymce.DOM,j=250;c&&"setcontent"===c.type&&c.initial||a.settings.inline||(e=tinymce.Env.ie?h.scrollHeight:tinymce.Env.webkit&&0===h.clientHeight?0:h.offsetHeight,e>250&&(j=e),h.scrollTop=0,j!==g&&(d=j-g,i.setStyle(i.get(a.id+"_ifr"),"height",j+"px"),g=j,tinymce.isWebKit&&0>d&&b(c)))}function c(){f.wp_fullscreen=!0,a.dom.addClass(a.getDoc().documentElement,"wp-fullscreen"),a.on("change setcontent paste keyup",b)}function d(){f.wp_fullscreen=!1,a.dom.removeClass(a.getDoc().documentElement,"wp-fullscreen"),a.off("change setcontent paste keyup",b),g=0}function e(){"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&(a.getParam("wp_fullscreen")?wp.editor.fullscreen.off():wp.editor.fullscreen.on())}var f=a.settings,g=0;a.addCommand("wpAutoResize",b),a.addCommand("wpFullScreenOn",c),a.addCommand("wpFullScreenOff",d),a.addCommand("wpFullScreen",e),a.on("init",function(){a.getParam("wp_fullscreen")&&c(),a.addShortcut("alt+shift+w","","wpFullScreen")}),a.addButton("wp_fullscreen",{tooltip:"Distraction Free Writing",shortcut:"Alt+Shift+W",onclick:e}),a.addMenuItem("wp_fullscreen",{text:"Distraction Free Writing",shortcut:"Alt+Shift+W",context:"view",onclick:e})}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpgallery/plugin.js b/wp-includes/js/tinymce/plugins/wpgallery/plugin.js index fd23c9bcb3..df2e8fca74 100644 --- a/wp-includes/js/tinymce/plugins/wpgallery/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpgallery/plugin.js @@ -1,5 +1,5 @@ /* global tinymce */ -tinymce.PluginManager.add('wpgallery', function( editor, url ) { +tinymce.PluginManager.add('wpgallery', function( editor ) { function parseGallery( content ) { return content.replace( /\[gallery([^\]]*)\]/g, function( match, attr ) { @@ -69,7 +69,7 @@ tinymce.PluginManager.add('wpgallery', function( editor, url ) { }); */ editor.on( 'mouseup', function( e ) { - if ( e.target.nodeName == 'IMG' && editor.dom.hasClass( e.target, 'wp-gallery' ) ) { + if ( e.target.nodeName === 'IMG' && editor.dom.hasClass( e.target, 'wp-gallery' ) ) { // Don't trigger on right-click if ( e.button !== 2 ) { if ( editor.dom.hasClass( e.target, 'wp-gallery-selected' ) ) { diff --git a/wp-includes/js/tinymce/plugins/wpgallery/plugin.min.js b/wp-includes/js/tinymce/plugins/wpgallery/plugin.min.js index 778158bdc4..aae1f4f571 100644 --- a/wp-includes/js/tinymce/plugins/wpgallery/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpgallery/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wpgallery",function(a){function b(a){return a.replace(/\[gallery([^\]]*)\]/g,function(a,b){var c=tinymce.DOM.encode(b);return''})}function c(a){function b(a,b){return b=new RegExp(b+'="([^"]+)"',"g").exec(a),b?tinymce.DOM.decode(b[1]):""}return a.replace(/(?:]*>)*(]+>)(?:<\/p>)*/g,function(a,c){var d=b(c,"class");return-1!==d.indexOf("wp-gallery")?"

["+tinymce.trim(b(c,"title"))+"]

":a})}return a.addCommand("WP_Gallery",function(){var b,c,d;"undefined"!=typeof wp&&wp.media&&wp.media.gallery&&(d=a.selection.getNode(),b=wp.media.gallery,"IMG"===d.nodeName&&a.dom.hasClass(d,"wp-gallery")&&(c=b.edit("["+a.dom.getAttrib(d,"title")+"]"),c.state("gallery-edit").on("update",function(c){var e=b.shortcode(c).string().slice(1,-1);a.dom.setAttrib(d,"title",e)})))}),a.on("mouseup",function(b){"IMG"==b.target.nodeName&&a.dom.hasClass(b.target,"wp-gallery")?2!==b.button&&(a.dom.hasClass(b.target,"wp-gallery-selected")?(a.execCommand("WP_Gallery"),a.dom.removeClass(b.target,"wp-gallery-selected")):a.dom.addClass(b.target,"wp-gallery-selected")):a.dom.removeClass(a.dom.select("img.wp-gallery-selected"),"wp-gallery-selected")}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-gallery")&&(b.name="gallery")}),a.on("BeforeSetContent",function(a){a.content=b(a.content)}),a.on("PostProcess",function(a){a.get&&(a.content=c(a.content))}),{_do_gallery:b,_get_gallery:c}}); \ No newline at end of file +tinymce.PluginManager.add("wpgallery",function(a){function b(a){return a.replace(/\[gallery([^\]]*)\]/g,function(a,b){var c=tinymce.DOM.encode(b);return''})}function c(a){function b(a,b){return b=new RegExp(b+'="([^"]+)"',"g").exec(a),b?tinymce.DOM.decode(b[1]):""}return a.replace(/(?:]*>)*(]+>)(?:<\/p>)*/g,function(a,c){var d=b(c,"class");return-1!==d.indexOf("wp-gallery")?"

["+tinymce.trim(b(c,"title"))+"]

":a})}return a.addCommand("WP_Gallery",function(){var b,c,d;"undefined"!=typeof wp&&wp.media&&wp.media.gallery&&(d=a.selection.getNode(),b=wp.media.gallery,"IMG"===d.nodeName&&a.dom.hasClass(d,"wp-gallery")&&(c=b.edit("["+a.dom.getAttrib(d,"title")+"]"),c.state("gallery-edit").on("update",function(c){var e=b.shortcode(c).string().slice(1,-1);a.dom.setAttrib(d,"title",e)})))}),a.on("mouseup",function(b){"IMG"===b.target.nodeName&&a.dom.hasClass(b.target,"wp-gallery")?2!==b.button&&(a.dom.hasClass(b.target,"wp-gallery-selected")?(a.execCommand("WP_Gallery"),a.dom.removeClass(b.target,"wp-gallery-selected")):a.dom.addClass(b.target,"wp-gallery-selected")):a.dom.removeClass(a.dom.select("img.wp-gallery-selected"),"wp-gallery-selected")}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-gallery")&&(b.name="gallery")}),a.on("BeforeSetContent",function(a){a.content=b(a.content)}),a.on("PostProcess",function(a){a.get&&(a.content=c(a.content))}),{_do_gallery:b,_get_gallery:c}}); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpview/plugin.js b/wp-includes/js/tinymce/plugins/wpview/plugin.js index c2ec6925ec..0c56ecba1f 100644 --- a/wp-includes/js/tinymce/plugins/wpview/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpview/plugin.js @@ -13,8 +13,9 @@ var wpView = this; // Check if the `wp.mce` API exists. - if ( typeof wp === 'undefined' || ! wp.mce ) + if ( typeof wp === 'undefined' || ! wp.mce ) { return; + } editor.on( 'PreInit', function() { // Add elements so we can set `contenteditable` to false. @@ -26,8 +27,9 @@ // view wrappers. Since the editor's DOM is outdated at this point, // we'll wait to render the views. editor.on( 'BeforeSetContent', function( e ) { - if ( ! e.content ) + if ( ! e.content ) { return; + } e.content = wp.mce.view.toViews( e.content ); }); @@ -42,13 +44,14 @@ var selection = editor.selection; // When a view is selected, ensure content that is being pasted // or inserted is added to a text node (instead of the view). - editor.on( 'BeforeSetContent', function( e ) { + editor.on( 'BeforeSetContent', function() { var walker, target, view = wpView.getParentView( selection.getNode() ); // If the selection is not within a view, bail. - if ( ! view ) + if ( ! view ) { return; + } // If there are no additional nodes or the next node is a // view, create a text node after the current view. @@ -72,13 +75,15 @@ // // Runs on paste and on inserting nodes/html. editor.on( 'SetContent', function( e ) { - if ( ! e.context ) + if ( ! e.context ) { return; + } var node = selection.getNode(); - if ( ! node.innerHTML ) + if ( ! node.innerHTML ) { return; + } node.innerHTML = wp.mce.view.toViews( node.innerHTML ); wp.mce.view.render( node ); @@ -88,8 +93,9 @@ // When the editor's contents are being accessed as a string, // transform any views back to their text representations. editor.on( 'PostProcess', function( e ) { - if ( ( ! e.get && ! e.save ) || ! e.content ) + if ( ( ! e.get && ! e.save ) || ! e.content ) { return; + } e.content = wp.mce.view.toText( e.content ); }); @@ -97,7 +103,7 @@ // Triggers when the selection is changed. // Add the event handler to the top of the stack. editor.on( 'NodeChange', function( e ) { - var view = wpView.getParentView( node ); + var view = wpView.getParentView( e.element ); // Update the selected view. if ( view ) { @@ -117,12 +123,13 @@ view, instance; // If a view isn't selected, let the event go on its merry way. - if ( ! selected ) + if ( ! selected ) { return; + } // If the caret is not within the selected view, deselect the // view and bail. - view = wpView.getParentView( selection.getNode() ); + view = wpView.getParentView( editor.selection.getNode() ); if ( view !== selected ) { wpView.deselect(); return; @@ -138,8 +145,9 @@ // Let keypresses that involve the command or control keys through. // Also, let any of the F# keys through. - if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) ) + if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) ) { return; + } event.preventDefault(); }); @@ -147,8 +155,9 @@ getParentView : function( node ) { while ( node ) { - if ( this.isView( node ) ) + if ( this.isView( node ) ) { return node; + } node = node.parentNode; } @@ -159,8 +168,9 @@ }, select : function( view ) { - if ( view === selected ) + if ( view === selected ) { return; + } this.deselect(); selected = view; @@ -168,8 +178,10 @@ }, deselect : function() { - if ( selected ) + if ( selected ) { wp.mce.view.deselect( selected ); + } + selected = null; } }); diff --git a/wp-includes/js/tinymce/plugins/wpview/plugin.min.js b/wp-includes/js/tinymce/plugins/wpview/plugin.min.js index 205aa1adf2..7a5cf5c992 100644 --- a/wp-includes/js/tinymce/plugins/wpview/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpview/plugin.min.js @@ -1 +1 @@ -!function(){var a,b=tinymce.VK,c=tinymce.dom.TreeWalker;tinymce.create("tinymce.plugins.wpView",{init:function(d){var e=this;"undefined"!=typeof wp&&wp.mce&&(d.on("PreInit",function(){d.schema.addValidElements("div[*],span[*]")}),d.on("BeforeSetContent",function(a){a.content&&(a.content=wp.mce.view.toViews(a.content))}),d.on("SetContent",function(){wp.mce.view.render(d.getDoc())}),d.on("init",function(){var a=d.selection;d.on("BeforeSetContent",function(){var b,f,g=e.getParentView(a.getNode());g&&(!g.nextSibling||e.isView(g.nextSibling)?(f=d.getDoc().createTextNode(""),d.dom.insertAfter(f,g)):(b=new c(g.nextSibling,g.nextSibling),f=b.next()),a.select(f),a.collapse(!0))}),d.on("SetContent",function(b){if(b.context){var c=a.getNode();c.innerHTML&&(c.innerHTML=wp.mce.view.toViews(c.innerHTML),wp.mce.view.render(c))}})}),d.on("PostProcess",function(a){(a.get||a.save)&&a.content&&(a.content=wp.mce.view.toText(a.content))}),d.on("NodeChange",function(){var a=e.getParentView(node);return a?(e.select(a),!1):(e.deselect(),void 0)}),d.on("keydown",function(c){var d,f,g=c.keyCode;if(a){if(d=e.getParentView(selection.getNode()),d!==a)return e.deselect(),void 0;(g===b.DELETE||g===b.BACKSPACE)&&(f=wp.mce.view.instance(a))&&(f.remove(),e.deselect()),c.metaKey||c.ctrlKey||g>=112&&123>=g||c.preventDefault()}}))},getParentView:function(a){for(;a;){if(this.isView(a))return a;a=a.parentNode}},isView:function(a){return/(?:^|\s)wp-view-wrap(?:\s|$)/.test(a.className)},select:function(b){b!==a&&(this.deselect(),a=b,wp.mce.view.select(a))},deselect:function(){a&&wp.mce.view.deselect(a),a=null}}),tinymce.PluginManager.add("wpview",tinymce.plugins.wpView)}(); \ No newline at end of file +!function(){var a,b=tinymce.VK,c=tinymce.dom.TreeWalker;tinymce.create("tinymce.plugins.wpView",{init:function(d){var e=this;"undefined"!=typeof wp&&wp.mce&&(d.on("PreInit",function(){d.schema.addValidElements("div[*],span[*]")}),d.on("BeforeSetContent",function(a){a.content&&(a.content=wp.mce.view.toViews(a.content))}),d.on("SetContent",function(){wp.mce.view.render(d.getDoc())}),d.on("init",function(){var a=d.selection;d.on("BeforeSetContent",function(){var b,f,g=e.getParentView(a.getNode());g&&(!g.nextSibling||e.isView(g.nextSibling)?(f=d.getDoc().createTextNode(""),d.dom.insertAfter(f,g)):(b=new c(g.nextSibling,g.nextSibling),f=b.next()),a.select(f),a.collapse(!0))}),d.on("SetContent",function(b){if(b.context){var c=a.getNode();c.innerHTML&&(c.innerHTML=wp.mce.view.toViews(c.innerHTML),wp.mce.view.render(c))}})}),d.on("PostProcess",function(a){(a.get||a.save)&&a.content&&(a.content=wp.mce.view.toText(a.content))}),d.on("NodeChange",function(a){var b=e.getParentView(a.element);return b?(e.select(b),!1):(e.deselect(),void 0)}),d.on("keydown",function(c){var f,g,h=c.keyCode;if(a){if(f=e.getParentView(d.selection.getNode()),f!==a)return e.deselect(),void 0;(h===b.DELETE||h===b.BACKSPACE)&&(g=wp.mce.view.instance(a))&&(g.remove(),e.deselect()),c.metaKey||c.ctrlKey||h>=112&&123>=h||c.preventDefault()}}))},getParentView:function(a){for(;a;){if(this.isView(a))return a;a=a.parentNode}},isView:function(a){return/(?:^|\s)wp-view-wrap(?:\s|$)/.test(a.className)},select:function(b){b!==a&&(this.deselect(),a=b,wp.mce.view.select(a))},deselect:function(){a&&wp.mce.view.deselect(a),a=null}}),tinymce.PluginManager.add("wpview",tinymce.plugins.wpView)}(); \ 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 a7e1aae054..92e1f35369 100644 --- a/wp-includes/js/tinymce/skins/wordpress/wp-content.css +++ b/wp-includes/js/tinymce/skins/wordpress/wp-content.css @@ -50,8 +50,12 @@ dl.aligncenter { border: 0 none; } -.wp-caption img, -.wp-caption a { +div.mceTemp { + -ms-user-select: element; +} + +dl.wp-caption, +dl.wp-caption * { -webkit-user-drag: none; } diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index 9cf7ec64824ba1e88362cc8efc81d1e80ceb48c8..d04fc1a23d42355c100e7f31a98f4538125fd391 100644 GIT binary patch delta 13372 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 SLU>!+p8ppCD4bQIXaxXO{!4WL delta 13357 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 DKR+ja