Changeset 20434 for branches/version-2_5-dev/data/class/pages

Timestamp:

2011/02/28 11:26:53 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/pages/admin/LC_Page_Admin_Home.php 15287@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin_Home.php
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 17293@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_ProductSelect.php
data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php 16839@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fupgrade%2Fhelper%2FLC_Upgrade_Helper_Json.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/require_classes.php 18500@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4-dev%2Fdata%2Frequire_classes.php
html/test/upgrade/index.php 16949@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ftest%2Fupgrade%2Findex.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

3162

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/pages/admin/LC_Page_Admin_Home.php [email protected]
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php [email protected]
data/class/pages/products/LC_Page_Products_Detail.php [email protected]
data/class/pages/products/LC_Page_Products_List.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]
data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php [email protected]
data/require_classes.php [email protected]
html/test/upgrade/index.php [email protected]

bzr:timestamp:

2011-02-28 11:26:35.789000034 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-28T02:26:35.789000Z

Message:

#803(JSON モジュールの統一及び高速化)

Location:

branches/version-2_5-dev/data/class/pages

Files:

• admin/LC_Page_Admin_Home.php (modified) (1 diff)
• admin/order/LC_Page_Admin_Order_ProductSelect.php (modified) (1 diff)
• products/LC_Page_Products_Detail.php (modified) (2 diffs)
• products/LC_Page_Products_List.php (modified) (1 diff)
• shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)
• upgrade/helper/LC_Upgrade_Helper_Json.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php

@@ -317 +317 @@
         $jsonStr = @file_get_contents($url, false, stream_context_create($context));
 
-        $objJson = new Services_JSON;
-        $arrTmpData = is_string($jsonStr) ? $objJson->decode($jsonStr) : null;
+        $arrTmpData = is_string($jsonStr) ? SC_Utils_Ex::jsonDecode($jsonStr) : null;
 
         if (empty($arrTmpData)) {

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php

@@ -159 +159 @@
      */
     function getTplJavascript(&$objProduct){
-        $objJson = new Services_JSON();
-        return  'productsClassCategories = ' . $objJson->encode($objProduct->classCategories) . '; ';
+        return  'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
     }
 

branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php

@@ -132 +132 @@
         $this->tpl_product_type = $objProduct->classCategories[$product_id]['']['']['product_type'];
 
-        $objJson = new Services_JSON();
-        $this->tpl_javascript .= 'classCategories = ' . $objJson->encode($objProduct->classCategories[$product_id]) . ';';
+        $this->tpl_javascript .= 'classCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories[$product_id]) . ';';
         $this->tpl_javascript .= 'function lnOnLoad(){' . $this->js_lnOnload . '}';
         $this->tpl_onload .= 'lnOnLoad();';
@@ -316 +315 @@
         return  'fnSetClassCategories('
             . 'document.form1, '
-            . Services_JSON::encode($this->objFormParam->getValue('classcategory_id2'))
+            . SC_Utils_Ex::jsonEncode($this->objFormParam->getValue('classcategory_id2'))
             . '); ';
     }

branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -152 +152 @@
         $this->productStatus = $this->arrProducts["productStatus"];
         unset($this->arrProducts["productStatus"]);
-
-        $objJson = new Services_JSON();
-        $this->tpl_javascript .= 'var productsClassCategories = ' . $objJson->encode($objProduct->classCategories) . ';';
-
+        $this->tpl_javascript .= 'var productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . ';';
         //onloadスクリプトを設定
         foreach ($this->arrProducts as $arrProduct) {

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -143 +143 @@
 
             if (SC_Display::detectDevice() != DEVICE_TYPE_MOBILE) {
-                $objJson = new Services_JSON();
-                echo $objJson->encode($arrSelectedDeliv);
+                echo SC_Utils_Ex::jsonEncode($arrSelectedDeliv);
                 exit;
             } else {

branches/version-2_5-dev/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php

@@ -83 +83 @@
      * @param string $str
      * @return StdClass
+     * @see SC_Utils_Ex::jsonDecode
      */
     function decode($str) {
-        if (function_exists('json_decode')) {
-            LC_Upgrade_Helper_Log::log(' *use json_decode()');
-            return json_decode($str);
-        }
-
-        LC_Upgrade_Helper_Log::log(' *use Services_JSON::decode()');
-        return parent::decode($str);
+        return SC_Utils_Ex::jsonDecode($str);
     }
 }