Skip to content

Commit

Permalink
fix #2098 회원 가입폼 설정에서 사용자정의 항목 폼이 잘못 표시되는 문제 고침
Browse files Browse the repository at this point in the history
- exec_xml() 사용 시 XML 데이터를 JSON 변환하는 용도의 라이브러리를 대체 함
  • Loading branch information
bnu committed Jun 2, 2017
1 parent 08d07d3 commit bb076d6
Show file tree
Hide file tree
Showing 4 changed files with 610 additions and 217 deletions.
4 changes: 3 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = function(grunt) {
"use strict";

var banner = '/*! Copyright (C) NAVER <http://www.navercorp.com> */\n';
var banner_xe_js = banner + '/**!\n * @concat modernizr.js + common.js + js_app.js + xml_handler.js + xml_js_filter.js\n * @brief XE Common JavaScript\n **/\n';
var banner_xe_js = banner + '/**!\n * @concat modernizr.js + common.js + js_app.js + xml2json.js + xml_handler.js + xml_js_filter.js\n * @brief XE Common JavaScript\n **/\n';

grunt.file.defaultEncoding = 'utf8';

Expand All @@ -25,6 +25,7 @@ module.exports = function(grunt) {
'common/js/modernizr.js',
'common/js/common.js',
'common/js/js_app.js',
'common/js/xml2json.js',
'common/js/xml_handler.js',
'common/js/xml_js_filter.js'
],
Expand Down Expand Up @@ -178,6 +179,7 @@ module.exports = function(grunt) {
'common/js/html5.js',
'common/js/x.js',
'common/js/xe.js',
'common/js/xml2json.js',
'common/js/modernizr.js',
'vendor/**',
'tests/**',
Expand Down
2 changes: 2 additions & 0 deletions classes/display/HTMLDisplayHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ function _loadJSCSS()
$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);
$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/css/xe.css', '', '', -1000000), true);
Expand Down Expand Up @@ -454,6 +455,7 @@ private function _loadMobileJSCSS()
$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);
$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/css/xe.css', '', '', -1000000), true);
Expand Down
Loading

0 comments on commit bb076d6

Please sign in to comment.