Ticket #34204: 34204.diff
File 34204.diff, 12.3 KB (added by , 9 years ago) |
---|
-
Gruntfile.js
diff --git Gruntfile.js Gruntfile.js index 8bc1b48..3e1689a 100644
module.exports = function(grunt) { 233 233 234 234 // Exceptions 235 235 '!wp-includes/css/dashicons.css', 236 '!wp-includes/css/wp-embed-template.css' 236 '!wp-includes/css/wp-embed-template.css', 237 '!wp-includes/css/wp-embed-template-ie.css' 237 238 ] 238 239 }, 239 240 colors: { -
new file src/wp-includes/css/wp-embed-template-ie.css
diff --git src/wp-includes/css/wp-embed-template-ie.css src/wp-includes/css/wp-embed-template-ie.css new file mode 100644 index 0000000..dca8c07
- + 1 /* Dashicons */ 2 .dashicons { 3 *display: inline; 4 *zoom: 1; 5 } 6 7 .dashicons-no { 8 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAQAAAAngNWGAAAAcElEQVR4AdXRVxmEMBAGwJMQCUhAIhKQECmRsFJwMFfp7HfP/E8pk0173CuKpt/0R+WaBaaZqogLagBMuh+DdoKbyRCwqZ/SnM0R5oQuZ2UHS8Z6k23qPxZCTrV5UlHMi8bsfHVXP7K/GXZHaTO7S54CWLdHlN2YIwAAAABJRU5ErkJggg==); 9 *background-image: url(../images/embed/close.png); 10 } 11 12 .dashicons-admin-comments { 13 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAATUlEQVR4AWMYWqCpvUcAiA8A8X9iMFStAD4DG0AKScQNVDZw1MBRAwvIMLCA5jmFlCD4AMQGlOTtBgoNwzQQ3TCKDaTcMMxYN2AYVgAAYPKsEBxN0PIAAAAASUVORK5CYII=); 14 *background-image: url(../images/embed/comment.png); 15 *background-position: 0 0; 16 } 17 18 .wp-embed-comments a:hover .dashicons-admin-comments { 19 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAATElEQVR4AWMYYqB4lQAQHwDi/8RgqFoBfAY2gBSSiBuobOCogaMGFpBhYAEdcwrhIPgAxAaU5O0GCg3DNBDdMIoNpNwwzFg3YBhWAABG71qAFYcFqgAAAABJRU5ErkJggg==); 20 *background-image: url(../images/embed/comment.png); 21 *background-position: 0 -40px; 22 } 23 24 .dashicons-share { 25 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAc0lEQVR4AWMYfqCpvccAiBcA8X8gfgDEBZQaeAFkGBoOoMR1/7HgDeQa2ECZgQiDHID4AMwAor0MCmBoQP+HBnwAskFQdgBRkQJViGk7wiAHUr21AYdhDTA1dDOQHl6mPFLokmwoT9j0z3qUFw70L77oDwAiuzCIub1XpQAAAABJRU5ErkJggg==); 26 *background-image: url(../images/embed/share.png); 27 *background-position: 0 0; 28 } 29 30 .wp-embed-share-dialog-open:hover .dashicons-share { 31 background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAc0lEQVR4AWMYhqB4lQEQLwDi/0D8AIgLKDXwAsgwNBxAiev+Y8EbyDWwgTIDEQY5APEBmAFEexkUwNCA/g8N+ABkg6DsAKIiBaoQ03aEQQ6kemsDDsMaYEroZiA9vEx5pNAl2VCesOmf9SgvHOhffNEfAAAMqPR5IEZH5wAAAABJRU5ErkJggg==); 32 *background-image: url(../images/embed/share.png); 33 *background-position: 0 -40px; 34 } 35 36 .wp-embed-share-dialog { 37 *background-color: #222; 38 } 39 No newline at end of file -
src/wp-includes/css/wp-embed-template.css
diff --git src/wp-includes/css/wp-embed-template.css src/wp-includes/css/wp-embed-template.css index 9ea586b..3db0216 100644
body { 19 19 /* Dashicons */ 20 20 .dashicons { 21 21 display: inline-block; 22 *display: inline; 23 *zoom: 1; 22 24 width: 20px; 23 25 height: 20px; 24 26 background-color: transparent; … … body { 46 48 47 49 .dashicons-share { 48 50 background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E"); 51 display: none; 52 } 53 54 .js .dashicons-share { 55 display: block; 49 56 } 50 57 51 58 .wp-embed-share-dialog-open:hover .dashicons-share { … … p.wp-embed-heading { 139 146 .wp-embed-site-title a { 140 147 position: relative; 141 148 display: inline-block; 149 *display: inline; 150 *zoom: 1; 142 151 padding-left: 35px; 143 152 } 144 153 145 154 .wp-embed-site-title, 146 155 .wp-embed-meta { 147 156 display: table-cell; 157 *display: inline; 158 *zoom: 1; 148 159 } 149 160 150 161 .wp-embed-meta { … … p.wp-embed-heading { 156 167 .wp-embed-comments, 157 168 .wp-embed-share { 158 169 display: inline; 170 *zoom: 1; 159 171 } 160 172 161 173 .wp-embed-meta a:hover { … … p.wp-embed-heading { 166 178 .wp-embed-comments a { 167 179 line-height: 25px; 168 180 display: inline-block; 181 *display: inline; 182 *zoom: 1; 169 183 } 170 184 171 185 .wp-embed-comments + .wp-embed-share { … … p.wp-embed-heading { 178 192 left: 0; 179 193 right: 0; 180 194 bottom: 0; 195 background-color: #222; 181 196 background-color: rgba(10, 10, 10, 0.9); 182 197 color: #fff; 183 198 opacity: 1; … … p.wp-embed-heading { 254 269 } 255 270 256 271 .wp-embed-share-tab-button { 257 display: inline; 272 display: inline-block; 273 *display: inline; 274 *zoom: 1; 258 275 } 259 276 260 277 .wp-embed-share-tab-button button { -
src/wp-includes/default-filters.php
diff --git src/wp-includes/default-filters.php src/wp-includes/default-filters.php index 31284d5..504b964 100644
add_action( 'parse_query', 'wp_oembed_parse_query' ); 446 446 add_action( 'wp_head', 'wp_oembed_add_discovery_links' ); 447 447 add_action( 'wp_head', 'wp_oembed_add_host_js' ); 448 448 449 add_action( 'embed_head', 'enqueue_embed_scripts', 1 ); 449 450 add_action( 'embed_head', 'print_emoji_detection_script' ); 450 add_action( 'embed_head', 'print_emoji_styles' );451 451 add_action( 'embed_head', 'print_embed_styles' ); 452 452 add_action( 'embed_head', 'print_embed_scripts' ); 453 453 add_action( 'embed_head', 'wp_print_head_scripts', 20 ); -
src/wp-includes/embed-functions.php
diff --git src/wp-includes/embed-functions.php src/wp-includes/embed-functions.php index eff7ae4..a1a0d09 100644
function wp_oembed_add_host_js() { 373 373 wp_enqueue_script( 'wp-oembed' ); 374 374 } 375 375 376 377 376 /** 378 377 * Retrieves the URL to embed a specific post in an iframe. 379 378 * … … function wp_embed_excerpt_attachment( $content ) { 802 801 } 803 802 804 803 /** 804 * Enqueue embed iframe default CSS and JS & fire do_action('enqueue_embed_scripts') 805 * 806 * Enqueue PNG fallback CSS for embed iframe for legacy versions of IE. 807 * 808 * Allows plugins to queue scripts for the embed iframe end using wp_enqueue_script(). 809 * Runs first in oembed_head(). 810 * 811 * @since 4.4.0 812 */ 813 function enqueue_embed_scripts() { 814 wp_enqueue_style( 'open-sans' ); 815 wp_enqueue_style( 'wp-embed-template-ie' ); 816 817 /** 818 * Fires when scripts and styles are enqueued for the embed iframe. 819 * 820 * @since 4.4.0 821 */ 822 do_action( 'enqueue_embed_scripts' ); 823 } 824 825 /** 805 826 * Prints the CSS in the embed iframe header. 806 827 * 807 828 * @since 4.4.0 -
src/wp-includes/embed-template.php
diff --git src/wp-includes/embed-template.php src/wp-includes/embed-template.php index d7bda9f..e0513d1 100644
if ( ! headers_sent() ) { 14 14 header( 'X-WP-embed: true' ); 15 15 } 16 16 17 wp_enqueue_style( 'open-sans' );18 19 17 ?> 20 18 <!DOCTYPE html> 21 <html <?php language_attributes(); ?> >19 <html <?php language_attributes(); ?> class="no-js"> 22 20 <head> 23 21 <title><?php wp_title( '-', true, 'right' ); ?></title> 24 22 <meta http-equiv="X-UA-Compatible" content="IE=edge"> -
src/wp-includes/js/wp-embed-template.js
diff --git src/wp-includes/js/wp-embed-template.js src/wp-includes/js/wp-embed-template.js index 847ebcf..b1dc73a 100644
2 2 'use strict'; 3 3 4 4 var secret = window.location.hash.replace( /.*secret=([\d\w]{10}).*/, '$1' ), 5 supportedBrowser = ( document.querySelector && window.addEventListener ), 6 loaded = false, 5 7 resizing; 6 8 7 9 function sendEmbedMessage( message, value ) { … … 13 15 } 14 16 15 17 function onLoad() { 18 if ( loaded ) { 19 return; 20 } 21 loaded = true; 22 16 23 var share_dialog = document.querySelector( '.wp-embed-share-dialog' ), 17 24 share_dialog_open = document.querySelector( '.wp-embed-share-dialog-open' ), 18 25 share_dialog_close = document.querySelector( '.wp-embed-share-dialog-close' ), … … 141 148 } 142 149 } 143 150 144 document.addEventListener( 'DOMContentLoaded', onLoad, false );145 146 151 /** 147 152 * Iframe resize handler. 148 153 */ … … 158 163 }, 100 ); 159 164 } 160 165 161 window.addEventListener( 'resize', onResize, false ); 166 if ( supportedBrowser ) { 167 document.documentElement.className = document.documentElement.className.replace( /\bno-js\b/, '' ) + ' js'; 168 document.addEventListener( 'DOMContentLoaded', onLoad, false ); 169 window.addEventListener( 'load', onLoad, false ); 170 window.addEventListener( 'resize', onResize, false ); 171 } 162 172 })( window, document ); -
src/wp-includes/js/wp-embed.js
diff --git src/wp-includes/js/wp-embed.js src/wp-includes/js/wp-embed.js index dd03bc0..167d8c2 100644
1 1 (function ( window, document ) { 2 2 'use strict'; 3 3 4 var supportedBrowser = ( document.querySelector && window.addEventListener ), 5 loaded = false; 6 4 7 window.wp = window.wp || {}; 5 8 6 9 if ( !! window.wp.receiveEmbedMessage ) { … … 44 47 } 45 48 }; 46 49 47 window.addEventListener( 'message', window.wp.receiveEmbedMessage, false );48 49 50 function onLoad() { 51 if ( loaded ) { 52 return; 53 } 54 loaded = true; 55 50 56 var isIE10 = -1 !== navigator.appVersion.indexOf( 'MSIE 10' ), 51 57 isIE11 = !!navigator.userAgent.match( /Trident.*rv\:11\./ ); 52 58 … … 57 63 for ( var i = 0; i < iframes.length; i++ ) { 58 64 iframeClone = iframes[ i ].cloneNode( true ); 59 65 iframeClone.removeAttribute( 'security' ); 60 iframes[ i ].parentNode.insertBefore( iframeClone, iframes[ i ].nextSibling ); 61 iframes[ i ].parentNode.removeChild( iframes[ i ] ); 66 iframes[ i ].parentNode.replaceChild( iframeClone, iframes[ i ] ); 62 67 } 63 68 } 64 69 } 65 70 66 document.addEventListener( 'DOMContentLoaded', onLoad, false ); 71 if ( supportedBrowser ) { 72 window.addEventListener( 'message', window.wp.receiveEmbedMessage, false ); 73 document.addEventListener( 'DOMContentLoaded', onLoad, false ); 74 window.addEventListener( 'load', onLoad, false ); 75 } 67 76 })( window, document ); -
src/wp-includes/script-loader.php
diff --git src/wp-includes/script-loader.php src/wp-includes/script-loader.php index d0fd4a3..ae29c7b 100644
function wp_default_scripts( &$scripts ) { 466 466 ), 467 467 ) ); 468 468 469 $scripts->add( 'wp- oembed', "/wp-includes/js/wp-oembed$suffix.js" );469 $scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js" ); 470 470 471 471 // To enqueue media-views or media-editor, call wp_enqueue_media(). 472 472 // Both rely on numerous settings, styles, and templates to operate correctly. … … function wp_default_styles( &$styles ) { 729 729 $styles->add( 'open-sans', $open_sans_font_url ); 730 730 731 731 // Includes CSS 732 $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) ); 733 $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) ); 734 $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) ); 735 $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) ); 736 $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) ); 737 $styles->add( 'customize-preview', "/wp-includes/css/customize-preview$suffix.css" ); 732 $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) ); 733 $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) ); 734 $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) ); 735 $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) ); 736 $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) ); 737 $styles->add( 'customize-preview', "/wp-includes/css/customize-preview$suffix.css" ); 738 $styles->add( 'wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css" ); 739 $styles->add_data( 'wp-embed-template-ie', 'conditional', 'lte IE 8' ); 738 740 739 741 // External libraries and friends 740 742 $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );