yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0

Browse Source
This commit is contained in:
Sebastiaan Janssen
2015-12-15 15:42:50 +01:00
parent d123967b14 9a8273b784
commit cdeb82e7cc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbautoresize.directive.js
View File

@@ -19,7 +19,7 @@ angular.module("umbraco.directives")
var ua = window.navigator.userAgent;
var msie = ua.indexOf("MSIE ");
if (msie > 0 || !!navigator.userAgent.match(/Trident.*rv\:11\./)) {
if (msie > 0 || !!navigator.userAgent.match(/Trident.*rv\:11\./) || navigator.userAgent.match(/Edge\/\d+/)) {
return true;
} else {
return false;