Changeset 22814 for branches/version-2_12_4en

Timestamp:

2013/05/13 16:13:25 (11 years ago)

Author:

michael_nelson

Message:

#2238 Merged r22797,r22802

Location:

branches/version-2_12_4en

Files:

• . (modified) (1 prop)
• data (modified) (1 prop)
• data/Smarty/templates/sphone/popup_header.tpl (modified) (2 diffs)
• data/Smarty/templates/sphone/site_frame.tpl (modified) (2 diffs)
• html/user_data/packages/sphone/js/jquery-1.6.4.min.js (deleted)
• html/user_data/packages/sphone/js/jquery-1.8.1.min.js (copied) (copied from branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery-1.8.1.min.js)
• html/user_data/packages/sphone/js/jquery.mobile/jquery.mobile-1.0.1.min.css (deleted)
• html/user_data/packages/sphone/js/jquery.mobile/jquery.mobile-1.0.1.min.js (deleted)
• html/user_data/packages/sphone/js/jquery.mobile/jquery.mobile-1.2.1.min.css (copied) (copied from branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.mobile/jquery.mobile-1.2.1.min.css)
• html/user_data/packages/sphone/js/jquery.mobile/jquery.mobile-1.2.1.min.js (copied) (copied from branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.mobile/jquery.mobile-1.2.1.min.js)

branches/version-2_12_4en/data/Smarty/templates/sphone/popup_header.tpl

@@ -44 +44 @@
     <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/win_op.js"></script>
     <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/site.js"></script>
-    <script src="<!--{$TPL_URLPATH}-->js/jquery-1.6.4.min.js"></script>
+    <script src="<!--{$TPL_URLPATH}-->js/jquery-1.8.1.min.js"></script>
     <script src="<!--{$TPL_URLPATH}-->js/jquery.biggerlink.js"></script>
     <script type="text/javascript">
@@ -57 +57 @@
 
     <!--{* jQuery Mobile *}-->
-    <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.css" />
+    <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.css" />
     <script src="<!--{$TPL_URLPATH}-->js/config.js"></script>
-    <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.js"></script>
+    <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.js"></script>
 
     <!--{* スマートフォンカスタマイズ用JS *}-->

branches/version-2_12_4en/data/Smarty/templates/sphone/site_frame.tpl

@@ -43 +43 @@
         <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/win_op.js"></script>
         <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/site.js"></script>
-        <script src="<!--{$TPL_URLPATH}-->js/jquery-1.6.4.min.js"></script>
+        <script src="<!--{$TPL_URLPATH}-->js/jquery-1.8.1.min.js"></script>
         <script src="<!--{$TPL_URLPATH}-->js/jquery.biggerlink.js"></script>
         <script>//<![CDATA[
@@ -56 +56 @@
 
         <!--{* jQuery Mobile *}-->
-        <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.css" />
+        <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.css" />
         <script src="<!--{$TPL_URLPATH}-->js/config.js"></script>
-        <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.js"></script>
+        <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.js"></script>
 
         <!--{* スマートフォンカスタマイズ用CSS *}-->