From b72b6344c67865ac3ccbbd50ea44791ca9bd4015 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 3 Feb 2014 11:08:03 +0900 Subject: [PATCH] =?UTF-8?q?#3=20IE=209=EB=AF=B8=EB=A7=8C=EC=97=90=EC=84=9C?= =?UTF-8?q?=20jQuery=EB=A5=BC=20=EB=A1=9C=EB=93=9C=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EB=AA=BB=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/display/HTMLDisplayHandler.php | 8 ++++---- common/tpl/common_layout.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 @@ -