Skip to content

Commit

Permalink
Merge pull request Automattic#11650 from Automattic/fix/ie-design-gli…
Browse files Browse the repository at this point in the history
…tches

Fix IE11 & MS Edge components design glitches
  • Loading branch information
DanReyLop authored Mar 6, 2017
2 parents 18ca6ae + 942eb2a commit 05c1314
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion client/components/accordion/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ $accordion-background-expanded: $white;
font-style: italic;
color: $gray-dark;
white-space: nowrap;
overflow-x: hidden;
overflow: hidden;
position: relative;
height: $accordion-subtitle-height;
}
Expand Down
2 changes: 1 addition & 1 deletion client/components/spinner-button/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.spinner-button__spinner {
float: right;
padding: 8px;
margin: 8px;
}
6 changes: 2 additions & 4 deletions client/components/spinner/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ import classNames from 'classnames';

/**
* Defines whether the current browser supports CSS animations for SVG
* elements. Specifically, this returns false for Internet Explorer versions
* 11 and below.
* elements. Specifically, this returns false for Internet Explorer and Edge.
*
* @see http://dev.modern.ie/platform/status/csstransitionsanimationsforsvgelements/
* @type {Boolean} True if the browser supports CSS animations for SVG
* elements, or false otherwise.
*/
Expand All @@ -22,7 +20,7 @@ const isSVGCSSAnimationSupported = ( () => {
return false;
}

return ! /(MSIE |Trident\/)/.test( global.window.navigator.userAgent );
return ! /(MSIE |Trident\/|Edge\/)/.test( global.window.navigator.userAgent );
} )();

export default class Spinner extends PureComponent {
Expand Down
3 changes: 0 additions & 3 deletions client/lib/wrap-es6-functions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,4 @@ export default function() {

[ 'codePointAt', 'normalize', 'repeat', 'startsWith', 'endsWith', 'includes' ]
.map( partial( wrapObjectFn, String.prototype, 'String#' ) );

[ 'flags' ].map( partial( wrapObjectFn, RegExp.prototype, 'RegExp#' ) );

}
5 changes: 0 additions & 5 deletions client/lib/wrap-es6-functions/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ describe( 'wrap-es6-functions', () => {
fromPairs( [
[ Array, [ 'keys', 'entries', 'values', 'findIndex', 'fill', 'find' ] ],
[ String, [ 'codePointAt', 'normalize', 'repeat', 'startsWith', 'endsWith', 'includes' ] ],
[ RegExp, [ 'flags' ] ]
], ( object, keys ) => {
keys.forEach( ( key ) => {
if ( isFunction( object.prototype[ key ] ) ) {
Expand All @@ -48,8 +47,4 @@ describe( 'wrap-es6-functions', () => {
[ 'startsWith', 'endsWith', 'includes' ].forEach( partial( assertCall, 'hello', [ 'a' ] ) );
[ 'normalize' ].forEach( partial( assertCall, 'hello', [] ) );
} );

describe( 'RegExp', () => {
[ 'flags' ].forEach( partial( assertCall, /a/, [ 'g' ] ) );
} );
} );

0 comments on commit 05c1314

Please sign in to comment.