diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index 20240d657..54e02568a 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -396,8 +396,8 @@ class HTMLDisplayHandler // add common JS/CSS files if(__DEBUG__) { - $oContext->loadFile(array('./common/js/jquery.js', 'head', '', -110000), true); - $oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -109000), true); + $oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -111000), true); + $oContext->loadFile(array('./common/js/jquery.js', 'head', 'gte IE 9', -110000), true); $oContext->loadFile(array('./common/js/x.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/common.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true); @@ -407,8 +407,8 @@ class HTMLDisplayHandler } else { - $oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -110000), true); - $oContext->loadFile(array('./common/js/jquery-1.x.min.js', 'head', 'lt IE 9', -109000), true); + $oContext->loadFile(array('./common/js/jquery-1.x.min.js', 'head', 'lt IE 9', -111000), true); + $oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -110000), true); $oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/css/xe.min.css', '', '', -1000000), true); diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index e2aee3781..b4488b786 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -25,7 +25,7 @@ -