fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-04 17:44:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix #1084 load modernizr

Browse source
This commit is contained in:
bnu 2014-12-24 14:01:55 +09:00
parent 10b91d8ef4
commit 86be308a76
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gruntfile.js
View file

@ -2,7 +2,7 @@ module.exports = function(grunt) {
"use strict"; "use strict";
var banner = '/*! Copyright (C) NAVER <http://www.navercorp.com> */\n'; var banner = '/*! Copyright (C) NAVER <http://www.navercorp.com> */\n';
var banner_xe_js = banner + '/**!\n * @file 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 * @file modernizr.js + common.js + js_app.js + xml_handler.js + xml_js_filter.js\n * @brief XE Common JavaScript\n **/\n';
grunt.file.defaultEncoding = 'utf8'; grunt.file.defaultEncoding = 'utf8';
@ -22,6 +22,7 @@ module.exports = function(grunt) {
banner: banner_xe_js banner: banner_xe_js
}, },
src: [ src: [
'common/js/modernizr.js',
'common/js/common.js', 'common/js/common.js',
'common/js/js_app.js', 'common/js/js_app.js',
'common/js/xml_handler.js', 'common/js/xml_handler.js',

8
classes/display/HTMLDisplayHandler.php
View file

@ -398,6 +398,7 @@ class HTMLDisplayHandler
{ {
$oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -111000), 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/jquery.js', 'head', 'gte IE 9', -110000), true);
$oContext->loadFile(array('./common/js/modernizr.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/x.js', 'head', '', -100000), 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/common.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true);
@ -451,8 +452,8 @@ class HTMLDisplayHandler
// add common JS/CSS files // add common JS/CSS files
if(__DEBUG__ || !__XE_VERSION_STABLE__) if(__DEBUG__ || !__XE_VERSION_STABLE__)
{ {
$oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -111000), true); $oContext->loadFile(array('./common/js/jquery.js', 'head', '', -110000), true);
$oContext->loadFile(array('./common/js/jquery.js', 'head', 'gte IE 9', -110000), true); $oContext->loadFile(array('./common/js/modernizr.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/x.js', 'head', '', -100000), 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/common.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true);
@ -463,8 +464,7 @@ class HTMLDisplayHandler
} }
else else
{ {
$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', '', -110000), 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/x.min.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xe.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); $oContext->loadFile(array('./common/css/xe.min.css', '', '', -1000000), true);

2
common/tpl/common_layout.html
View file

@ -29,7 +29,7 @@
<script src="{$js_file['file']}"></script> <script src="{$js_file['file']}"></script>
<block cond="$js_file['targetie']"><![endif]--></block> <block cond="$js_file['targetie']"><![endif]--></block>
</block> </block>
<!--[if lt IE 9]><script src="../js/html5.js"></script><![endif]-->
<!-- RSS --> <!-- RSS -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" cond="$rss_url" /> <link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" cond="$rss_url" />
<link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" cond="$general_rss_url" /> <link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" cond="$general_rss_url" />

1
common/tpl/mobile_layout.html
View file

@ -23,7 +23,6 @@
<script src="{$js_file['file']}"></script> <script src="{$js_file['file']}"></script>
<block cond="$js_file['targetie']"><![endif]--></block> <block cond="$js_file['targetie']"><![endif]--></block>
</block> </block>
<!--[if lt IE 9]><script src="../js/html5.js"></script><![endif]-->
<!--// RSS --> <!--// RSS -->
<!--@if($rss_url)--> <!--@if($rss_url)-->