From 95d58beab242491257659b27cb6c76974f69c471 Mon Sep 17 00:00:00 2001
From: ngleader <ngleader@gmail.com>
Date: Thu, 4 Dec 2008 01:13:04 +0000
Subject: [PATCH] jquery.noconflict change

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5037 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php | 1 -
 common/js/common.js               | 3 +++
 common/js/jquery.noconflict.js    | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 common/js/jquery.noconflict.js

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 59713da61..29394c30d 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -135,7 +135,6 @@
 
             // 기본 JS/CSS 등록
             $this->addJsFile("./common/js/jquery-1.2.6.js");
-            $this->addJsFile("./common/js/jquery.noconflict.js");
             $this->addJsFile("./common/js/x.js");
             $this->addJsFile("./common/js/common.js");
             $this->addJsFile("./common/js/xml_handler.js");
diff --git a/common/js/common.js b/common/js/common.js
index 25ce1e680..d89dd1587 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -4,6 +4,9 @@
  * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음
  **/
 
+
+if(jQuery) jQuery.noConflict();
+
 /**
  * @brief location.href에서 특정 key의 값을 return
  **/
diff --git a/common/js/jquery.noconflict.js b/common/js/jquery.noconflict.js
deleted file mode 100644
index 542e93529..000000000
--- a/common/js/jquery.noconflict.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-jQuery.noConflict();