Merge branch 'stable-2.13'
* stable-2.13: Add IE 10 and 11 and also microsoft edge as supported browsers Fix copying text in Internet Explorer Change-Id: Ie5345d23b81ed5ab0ce439cff579e461b8126038
This commit is contained in:
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
* Ported from JavaScript in {@code com.google.gwt.user.UserAgent.gwt.xml}.
|
* Ported from JavaScript in {@code com.google.gwt.user.UserAgent.gwt.xml}.
|
||||||
*/
|
*/
|
||||||
public class UserAgentRule {
|
public class UserAgentRule {
|
||||||
private static final Pattern msie = compile(".*msie ([0-9]+)\\.([0-9]+).*");
|
private static final Pattern msie = compile(".*msie ([0-11]+)\\.([0-11]+).*");
|
||||||
private static final Pattern gecko = compile(".*rv:([0-9]+)\\.([0-9]+).*");
|
private static final Pattern gecko = compile(".*rv:([0-9]+)\\.([0-9]+).*");
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
@@ -58,6 +58,9 @@ public class UserAgentRule {
|
|||||||
Matcher m = msie.matcher(ua);
|
Matcher m = msie.matcher(ua);
|
||||||
if (m.matches() && m.groupCount() == 2) {
|
if (m.matches() && m.groupCount() == 2) {
|
||||||
int v = makeVersion(m);
|
int v = makeVersion(m);
|
||||||
|
if (v >= 11000) {
|
||||||
|
return "ie11";
|
||||||
|
}
|
||||||
if (v >= 10000) {
|
if (v >= 10000) {
|
||||||
return "ie10";
|
return "ie10";
|
||||||
}
|
}
|
||||||
@@ -70,6 +73,8 @@ public class UserAgentRule {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
|
} else if (ua.contains("edge")) {
|
||||||
|
return "edge";
|
||||||
} else if (ua.contains("gecko")) {
|
} else if (ua.contains("gecko")) {
|
||||||
Matcher m = gecko.matcher(ua);
|
Matcher m = gecko.matcher(ua);
|
||||||
if (m.matches() && m.groupCount() == 2) {
|
if (m.matches() && m.groupCount() == 2) {
|
||||||
|
|||||||
@@ -18,12 +18,14 @@ BROWSERS = [
|
|||||||
'firefox',
|
'firefox',
|
||||||
'gecko1_8',
|
'gecko1_8',
|
||||||
'safari',
|
'safari',
|
||||||
'msie', 'ie8', 'ie9',
|
'msie', 'ie8', 'ie9', 'ie10', 'ie11',
|
||||||
|
'edge',
|
||||||
]
|
]
|
||||||
ALIASES = {
|
ALIASES = {
|
||||||
'chrome': 'safari',
|
'chrome': 'safari',
|
||||||
'firefox': 'gecko1_8',
|
'firefox': 'gecko1_8',
|
||||||
'msie': 'ie9',
|
'msie': 'ie11',
|
||||||
|
'edge': 'edge',
|
||||||
}
|
}
|
||||||
MODULE = 'com.google.gerrit.GerritGwtUI'
|
MODULE = 'com.google.gerrit.GerritGwtUI'
|
||||||
CPU_COUNT = cpu_count()
|
CPU_COUNT = cpu_count()
|
||||||
|
|||||||
@@ -34,6 +34,8 @@
|
|||||||
<when-property-is name="user.agent" value="ie8"/>
|
<when-property-is name="user.agent" value="ie8"/>
|
||||||
<when-property-is name="user.agent" value="ie9"/>
|
<when-property-is name="user.agent" value="ie9"/>
|
||||||
<when-property-is name="user.agent" value="ie10"/>
|
<when-property-is name="user.agent" value="ie10"/>
|
||||||
|
<when-property-is name="user.agent" value="ie11"/>
|
||||||
|
<when-property-is name="user.agent" value="edge"/>
|
||||||
</any>
|
</any>
|
||||||
</replace-with>
|
</replace-with>
|
||||||
</module>
|
</module>
|
||||||
|
|||||||
@@ -63,7 +63,8 @@
|
|||||||
-webkit-user-select: initial;
|
-webkit-user-select: initial;
|
||||||
-khtml-user-select: initial;
|
-khtml-user-select: initial;
|
||||||
-moz-user-select: text;
|
-moz-user-select: text;
|
||||||
-ms-user-select: initial;
|
-ms-user-select: text;
|
||||||
|
user-select: initial;
|
||||||
}
|
}
|
||||||
|
|
||||||
.commentBox {
|
.commentBox {
|
||||||
|
|||||||
Reference in New Issue
Block a user