Merge branch 'master' of github.com:gnuboard/g4s

2013-01-08 17:08:26 +09:00
parent 751a38a2ab 2ff9657293
commit e422fd0b12
14 changed files with 381 additions and 311 deletions
--- a/head.sub.php
+++ b/head.sub.php
@ -73,7 +73,9 @@ var g4_is_ie     = navigator.userAgent.toLowerCase().indexOf("msie") != -1;
 <script src="<?=$g4['path']?>/js/jquery-1.4.2.min.js"></script>
 <script src="<?=$g4['path']?>/js/common.js"></script>
 <script src="<?=$g4['path']?>/js/wrest.js"></script>
+<!--[if lte IE 8]>
 <script src="<?=$g4['path']?>/js/html5.js"></script>
+<![endif]-->
 <?
 if (!empty($g4['js_file'])) {
    foreach ($g4['js_file'] as $key=>$value) {