Code:
--- ext3/adapter/ext/ext-base-debug.js
+++ ext3/adapter/ext/ext-base-debug.js
@@ -68,7 +68,8 @@ Ext.apply = function(o, c, defaults){
isIE7 = isIE && (check(/msie 7/) || docMode == 7),
isIE8 = isIE && (check(/msie 8/) && docMode != 7),
isIE9 = isIE && check(/msie 9/),
- isIE6 = isIE && !isIE7 && !isIE8 && !isIE9,
+ isIE10 = isIE && check(/msie 10/),
+ isIE6 = isIE && !isIE7 && !isIE8 && !isIE9 && !isIE10,
isGecko = !isWebKit && check(/gecko/),
isGecko2 = isGecko && check(/rv:1\.8/),
isGecko3 = isGecko && check(/rv:1\.9/),
@@ -782,6 +783,11 @@ function(el){
*/
isIE9 : isIE9,
/**
+ * True if the detected browser is Internet Explorer 10.x.
+ * @type Boolean
+ */
+ isIE10 : isIE10,
+ /**
* True if the detected browser uses the Gecko layout engine (e.g. Mozilla, Firefox).
* @type Boolean
*/
diff --git ext3/resources/css/ext-all-notheme.css ext3/resources/css/ext-all-notheme.css
index 6bc6765..a9179f9 100644
--- ext3/resources/css/ext-all-notheme.css
+++ ext3/resources/css/ext-all-notheme.css
@@ -1361,7 +1361,8 @@ textarea {
margin-bottom:10px;
}
-.ext-strict .ext-ie9 .x-fieldset legend.x-fieldset-header {
+.ext-strict .ext-ie9 .x-fieldset legend.x-fieldset-header,
+.ext-strict .ext-ie10 .x-fieldset legend.x-fieldset-header {
padding-top: 1px;
}
diff --git ext3/resources/css/ext-all.css ext3/resources/css/ext-all.css
index 8ef5ab6..edad2ab 100644
--- ext3/resources/css/ext-all.css
+++ ext3/resources/css/ext-all.css
@@ -1864,7 +1864,8 @@ textarea {
margin-bottom:10px;
}
-.ext-strict .ext-ie9 .x-fieldset legend.x-fieldset-header {
+.ext-strict .ext-ie9 .x-fieldset legend.x-fieldset-header,
+.ext-strict .ext-ie10 .x-fieldset legend.x-fieldset-header {
padding-top: 1px;
}
diff --git ext3/resources/css/structure/form.css ext3/resources/css/structure/form.css
index 9e7684b..f9df08f 100644
--- ext3/resources/css/structure/form.css
+++ ext3/resources/css/structure/form.css
@@ -491,7 +491,8 @@ textarea {
margin-bottom:10px;
}
-.ext-strict .ext-ie9 .x-fieldset legend.x-fieldset-header {
+.ext-strict .ext-ie9 .x-fieldset legend.x-fieldset-header,
+.ext-strict .ext-ie10 .x-fieldset legend.x-fieldset-header {
padding-top: 1px;
}
diff --git ext3/src/ext-core/src/core/EventManager.js ext3/src/ext-core/src/core/EventManager.js
index f97e525..bf01392 100644
--- ext3/src/ext-core/src/core/EventManager.js
+++ ext3/src/ext-core/src/core/EventManager.js
@@ -602,7 +602,7 @@ Ext.onReady = Ext.EventManager.onDocumentReady;
}
var cls = [' ',
- Ext.isIE ? "ext-ie " + (Ext.isIE6 ? 'ext-ie6' : (Ext.isIE7 ? 'ext-ie7' : (Ext.isIE8 ? 'ext-ie8' : 'ext-ie9')))
+ Ext.isIE ? "ext-ie " + (Ext.isIE6 ? 'ext-ie6' : (Ext.isIE7 ? 'ext-ie7' : (Ext.isIE8 ? 'ext-ie8' : (Ext.isIE9 ? 'ext-ie9' : 'ext-ie10'))))
: Ext.isGecko ? "ext-gecko " + (Ext.isGecko2 ? 'ext-gecko2' : 'ext-gecko3')
: Ext.isOpera ? "ext-opera"
: Ext.isWebKit ? "ext-webkit" : ""];
diff --git ext3/src/widgets/Shadow.js ext3/src/widgets/Shadow.js
index 666b25b..067d311 100644
--- ext3/src/widgets/Shadow.js
+++ ext3/src/widgets/Shadow.js
@@ -29,7 +29,7 @@ Ext.Shadow = function(config) {
a.w = 0;
a.l = a.t = o;
a.t -= 1;
- if (Ext.isIE) {
+ if (Ext.isIE6 || Ext.isIE7 || Ext.isIE8 || Ext.isIE9) { // starting from IE10, it does not support legacy DX filters anymore
a.l -= this.offset + rad;
a.t -= this.offset + rad;
a.w -= rad;
@@ -41,7 +41,7 @@ Ext.Shadow = function(config) {
a.w = (o * 2);
a.l = -o;
a.t = o - 1;
- if (Ext.isIE) {
+ if (Ext.isIE6 || Ext.isIE7 || Ext.isIE8 || Ext.isIE9) {
a.l -= (this.offset - rad);
a.t -= this.offset + rad;
a.l += 1;
@@ -55,7 +55,7 @@ Ext.Shadow = function(config) {
a.l = a.t = -o;
a.t += 1;
a.h -= 2;
- if (Ext.isIE) {
+ if (Ext.isIE6 || Ext.isIE7 || Ext.isIE8 || Ext.isIE9) {
a.l -= (this.offset - rad);
a.t -= (this.offset - rad);
a.l += 1;
@@ -100,7 +100,7 @@ Ext.Shadow.prototype = {
}
}
this.el.setStyle("z-index", this.zIndex || parseInt(target.getStyle("z-index"), 10) - 1);
- if (Ext.isIE) {
+ if (Ext.isIE6 || Ext.isIE7 || Ext.isIE8 || Ext.isIE9) {
this.el.dom.style.filter = "progidXImageTransform.Microsoft.alpha(opacity=50) progidXImageTransform.Microsoft.Blur(pixelradius=" + (this.offset) + ")";
}
this.realign(
@@ -146,7 +146,7 @@ Ext.Shadow.prototype = {
if (s.width != sws || s.height != shs) {
s.width = sws;
s.height = shs;
- if (!Ext.isIE) {
+ if (!Ext.isIE6 && !Ext.isIE7 && !Ext.isIE8 && !Ext.isIE9) {
cn = d.childNodes;
sww = Math.max(0, (sw - 12)) + "px";
cn[0].childNodes[1].style.width = sww;
@@ -183,7 +183,7 @@ Ext.Shadow.prototype = {
// Private utility class that manages the internal Shadow cache
Ext.Shadow.Pool = function() {
var p = [],
- markup = Ext.isIE ?
+ markup = Ext.isIE6 || Ext.isIE7 || Ext.isIE8 || Ext.isIE9 ?
'<div class="x-ie-shadow"></div>':
'<div class="x-shadow"><div class="xst"><div class="xstl"></div><div class="xstc"></div><div class="xstr"></div></div><div class="xsc"><div class="xsml"></div><div class="xsmc"></div><div class="xsmr"></div></div><div class="xsb"><div class="xsbl"></div><div class="xsbc"></div><div class="xsbr"></div></div></div>';
return {
diff --git ext3/src/widgets/layout/MenuLayout.js ext3/src/widgets/layout/MenuLayout.js
index 1e3dd0b..c46fd00 100644
--- ext3/src/widgets/layout/MenuLayout.js
+++ ext3/src/widgets/layout/MenuLayout.js
@@ -92,7 +92,7 @@
if(w){
ct.setWidth(w);
}else if(Ext.isIE){
- ct.setWidth(Ext.isStrict && (Ext.isIE7 || Ext.isIE8 || Ext.isIE9) ? 'auto' : ct.minWidth);
+ ct.setWidth(Ext.isStrict && (Ext.isIE7 || Ext.isIE8 || Ext.isIE9 || Ext.isIE10) ? 'auto' : ct.minWidth);
var el = ct.getEl(), t = el.dom.offsetWidth; // force recalc
ct.setWidth(ct.getLayoutTarget().getWidth() + el.getFrameWidth('lr'));
}
diff --git a/web/core/module/resources/webapp/js/nice2/app/LoginWindow.js b/web/core/module/resources/webapp/js/nice2/app/LoginWindow.js
index 8d48554..e0d1bed 100644
--- a/web/core/module/resources/webapp/js/nice2/app/LoginWindow.js
+++ b/web/core/module/resources/webapp/js/nice2/app/LoginWindow.js
@@ -121,7 +121,7 @@ Ext.extend(nice2.app.LoginWindow, Ext.util.Observable, {
this.loginPanel.initPanel();
- if (!Ext.isWebKit && !Ext.isGecko && !Ext.isIE7 && !Ext.isIE8 && !Ext.isIE9) {
+ if (!Ext.isWebKit && !Ext.isGecko && !Ext.isIE7 && !Ext.isIE8 && !Ext.isIE9 && !Ext.isIE10) {
this.unsupportedBrowser.show();
}
if ((Ext.isIE7 || Ext.isIE8)) {
--
1.8.1.5