Changeset 23416 for branches/version-2_13-dev/html

Timestamp:

2014/05/14 11:54:06 (12 years ago)

Author:

pineray

Message:

#2359 jQuery のバージョンアップ(PC)

r23410 r23411 r23413 を dev に再実装。
ついでに jQuery のバージョンを最新版に変更。
管理画面のブロック配置が動作するように修正。

Location:

branches/version-2_13-dev/html

Files:

• install/templates/install_frame.tpl (modified) (1 diff)
• js/jquery-1.11.1.min.js (added)
• js/jquery-1.4.2.min.js (deleted)
• js/jquery-2.1.1.min.js (added)
• js/jquery.ui (added)
• js/jquery.ui/jquery.ui.core.min.js (added)
• js/jquery.ui/jquery.ui.mouse.min.js (added)
• js/jquery.ui/jquery.ui.sortable.min.js (added)
• js/jquery.ui/jquery.ui.widget.min.js (added)
• js/ui.core.js (deleted)
• js/ui.sortable.js (deleted)

branches/version-2_13-dev/html/install/templates/install_frame.tpl

@@ -28 +28 @@
 <link rel="stylesheet" href="css/admin_contents.css" type="text/css" media="all" />
 <link rel="stylesheet" href="../js/jquery.colorbox/colorbox.css" type="text/css" media="all" />
-<script type="text/javascript" src="../js/jquery-1.4.2.min.js"></script>
+<!--[if lt IE 9]>
+<script src="../js/jquery-1.11.1.min.js"></script>
+<![endif]-->
+<!--[if gte IE 9]><!-->
+<script src="../js/jquery-2.1.1.min.js"></script>
+<!--<![endif]-->
 <script type="text/javascript" src="../js/eccube.js"></script>
 <script type="text/javascript" src="../js/jquery.colorbox/jquery.colorbox-min.js"></script>