Changeset 23066 for branches/version-2_13-dev/html/js/eccube.js

Timestamp:

2013/08/15 08:54:40 (11 years ago)

Author:

pineray

Message:

#2342 JavaScript?のグローバルな宣言を減らす
eccubeオブジェクト内の階層を減らす.

File:

• branches/version-2_13-dev/html/js/eccube.js (modified) (29 diffs)

branches/version-2_13-dev/html/js/eccube.js

@@ -23 +23 @@
 (function( window, undefined ){
 
-    var common = {};
-
-    common.win01 = function(URL,Winname,Wwidth,Wheight){
+
+    // 名前空間の重複を防ぐ
+    if (window.eccube === undefined) {
+        window.eccube = {};
+    }
+
+    var eccube = window.eccube;
+
+    eccube.win01 = function(URL,Winname,Wwidth,Wheight){
         var WIN;
         WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=no,resizable=no,toolbar=no,location=no,directories=no,status=no");
@@ -31 +37 @@
     };
 
-    common.win02 = function(URL,Winname,Wwidth,Wheight){
+    eccube.win02 = function(URL,Winname,Wwidth,Wheight){
         var WIN;
         WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
@@ -37 +43 @@
     };
 
-    common.win03 = function(URL,Winname,Wwidth,Wheight){
+    eccube.win03 = function(URL,Winname,Wwidth,Wheight){
         var WIN;
         WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no");
@@ -43 +49 @@
     };
 
-    common.winSubmit = function(URL,formName,Winname,Wwidth,Wheight){
+    eccube.winSubmit = function(URL,formName,Winname,Wwidth,Wheight){
         var WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no");
         document.forms[formName].target = Winname;
@@ -49 +55 @@
     };
 
-    common.openWindow = function(URL,name,width,height) {
+    eccube.openWindow = function(URL,name,width,height) {
         window.open(URL,name,"width="+width+",height="+height+",scrollbars=yes,resizable=no,toolbar=no,location=no,directories=no,status=no");
     };
 
     // 親ウィンドウの存在確認.
-    common.isOpener = function() {
+    eccube.isOpener = function() {
         var ua = navigator.userAgent;
         if( !!window.opener ) {
@@ -67 +73 @@
     };
 
-    common.chgImg = function(fileName,img){
+    eccube.chgImg = function(fileName,img){
         if (typeof(img) == "object") {
             img.src = fileName;
@@ -75 +81 @@
     };
 
-    common.chgImgImageSubmit = function(fileName,imgObj){
+    eccube.chgImgImageSubmit = function(fileName,imgObj){
         imgObj.src = fileName;
     };
 
     // 郵便番号入力呼び出し.
-    common.getAddress = function(php_url, tagname1, tagname2, input1, input2) {
+    eccube.getAddress = function(php_url, tagname1, tagname2, input1, input2) {
         var zip1 = document.form1[tagname1].value;
         var zip2 = document.form1[tagname2].value;
@@ -91 +97 @@
                     var arrData = data.split("|");
                     if (arrData.length > 1) {
-                        eccube.common.putAddress(input1, input2, arrData[0], arrData[1], arrData[2]);
+                        eccube.putAddress(input1, input2, arrData[0], arrData[1], arrData[2]);
                     } else {
                         alert(data);
@@ -103 +109 @@
 
     // 郵便番号から検索した住所を渡す.
-    common.putAddress = function(input1, input2, state, city, town) {
+    eccube.putAddress = function(input1, input2, state, city, town) {
         if(state != "") {
             // 項目に値を入力する.
@@ -111 +117 @@
     };
 
-    common.setFocus = function(name) {
+    eccube.setFocus = function(name) {
         if(document.form1[name]) {
             document.form1[name].focus();
@@ -118 +124 @@
 
     // モードとキーを指定してSUBMITを行う。
-    common.setModeAndSubmit = function(mode, keyname, keyid) {
+    eccube.setModeAndSubmit = function(mode, keyname, keyid) {
         switch(mode) {
             case 'delete_category':
@@ -150 +156 @@
     };
 
-    common.fnFormModeSubmit = function(form, mode, keyname, keyid) {
+    eccube.fnFormModeSubmit = function(form, mode, keyname, keyid) {
         switch(mode) {
             case 'delete':
@@ -177 +183 @@
     };
 
-    common.setValueAndSubmit = function(form, key, val) {
+    eccube.setValueAndSubmit = function(form, key, val) {
         document.forms[form][key].value = val;
         document.forms[form].submit();
@@ -183 +189 @@
     };
 
-    common.setValue = function(key, val, form) {
+    eccube.setValue = function(key, val, form) {
         if (typeof form === 'undefined') {
             form = 'form1';
@@ -190 +196 @@
     };
 
-    common.changeAction = function(url) {
+    eccube.changeAction = function(url) {
         document.form1.action = url;
     };
 
     // ページナビで使用する。
-    common.movePage = function(pageno, mode, form) {
+    eccube.movePage = function(pageno, mode, form) {
         if (typeof form !== 'undefined') {
             form = 'form1';
@@ -206 +212 @@
     };
 
-    common.submitForm = function(form){
+    eccube.submitForm = function(form){
         if (typeof form !== 'undefined') {
             form = 'form1';
         }
         document.forms[form].submit();
-    }
+    };
 
     // ポイント入力制限。
-    common.togglePointForm = function() {
+    eccube.togglePointForm = function() {
         if(document.form1['point_check']) {
             var list = ['use_point'];
@@ -241 +247 @@
             }
         }
-    }
+    };
 
     // 別のお届け先入力制限。
-    common.toggleDeliveryForm = function() {
+    eccube.toggleDeliveryForm = function() {
         if(!document.form1) {
             return;
@@ -265 +271 @@
 
             if(!document.form1['deliv_check'].checked) {
-                eccube.common.changeDisabled(list, '#dddddd');
+                eccube.changeDisabled(list, '#dddddd');
             } else {
-                eccube.common.changeDisabled(list, '');
+                eccube.changeDisabled(list, '');
             }
         }
@@ -273 +279 @@
 
     // 最初に設定されていた色を保存しておく。
-    common.savedColor = [];
-
-    common.changeDisabled = function(list, color) {
+    eccube.savedColor = [];
+
+    eccube.changeDisabled = function(list, color) {
         var len = list.length;
 
@@ -283 +289 @@
                     // 有効にする。
                     document.form1[list[i]].disabled = false;
-                    document.form1[list[i]].style.backgroundColor = eccube.common.savedColor[list[i]];
+                    document.form1[list[i]].style.backgroundColor = eccube.savedColor[list[i]];
                 } else {
                     // 無効にする。
                     document.form1[list[i]].disabled = true;
-                    eccube.common.savedColor[list[i]] = document.form1[list[i]].style.backgroundColor;
+                    eccube.savedColor[list[i]] = document.form1[list[i]].style.backgroundColor;
                     document.form1[list[i]].style.backgroundColor = color;//"#f0f0f0";
                 }
@@ -295 +301 @@
 
     // ログイン時の入力チェック
-    common.checkLoginFormInputted = function(form, emailKey, passKey) {
+    eccube.checkLoginFormInputted = function(form, emailKey, passKey) {
         var checkItems = [];
 
@@ -330 +336 @@
 
     //親ウィンドウのページを変更する.
-    common.changeParentUrl = function(url) {
+    eccube.changeParentUrl = function(url) {
         // 親ウィンドウの存在確認
-        if(eccube.common.isOpener()) {
+        if(eccube.isOpener()) {
             window.opener.location.href = url;
         } else {
@@ -343 +349 @@
     //引数2：文字数カウント対象
     //引数3：カウント結果格納対象
-    common.countChars = function(form,sch,cnt) {
+    eccube.countChars = function(form,sch,cnt) {
         document.forms[form][cnt].value= document.forms[form][sch].value.length;
     };
 
     // テキストエリアのサイズを変更する.
-    common.toggleRows = function(buttonSelector, textAreaSelector, max, min) {
+    eccube.toggleRows = function(buttonSelector, textAreaSelector, max, min) {
         if ($(textAreaSelector).attr('rows') <= min) {
             $(textAreaSelector).attr('rows', max);
@@ -361 +367 @@
      * 規格2のプルダウンを設定する.
      */
-    common.setClassCategories = function($form, product_id, $sele1, $sele2, selected_id2) {
+    eccube.setClassCategories = function($form, product_id, $sele1, $sele2, selected_id2) {
         if ($sele1 && $sele1.length) {
             var classcat_id1 = $sele1.val() ? $sele1.val() : '';
@@ -389 +395 @@
                     $sele2.append(option);
                 }
-                eccube.common.checkStock($form, product_id, $sele1.val() ? $sele1.val() : '__unselected2',
+                eccube.checkStock($form, product_id, $sele1.val() ? $sele1.val() : '__unselected2',
                     $sele2.val() ? $sele2.val() : '');
             }
@@ -398 +404 @@
      * 規格の選択状態に応じて, フィールドを設定する.
      */
-    common.checkStock = function($form, product_id, classcat_id1, classcat_id2) {
+    eccube.checkStock = function($form, product_id, classcat_id1, classcat_id2) {
 
         classcat_id2 = classcat_id2 ? classcat_id2 : '';
@@ -492 +498 @@
     };
 
-    // 名前空間の重複を防ぐ
-    if (window.eccube === undefined) {
-        window.eccube = {};
-    }
     // グローバルに使用できるようにする
-    window.eccube.common = common;
+    window.eccube = eccube;
 
     /**
@@ -513 +515 @@
                 // 規格1のみの場合
                 if (!$sele2.length) {
-                    eccube.common.checkStock($form, product_id, $sele1.val(), '0');
+                    eccube.checkStock($form, product_id, $sele1.val(), '0');
                     // 規格2ありの場合
                 } else {
-                    eccube.common.setClassCategories($form, product_id, $sele1, $sele2);
+                    eccube.setClassCategories($form, product_id, $sele1, $sele2);
                 }
             });
@@ -527 +529 @@
                 var $sele1 = $form.find('select[name=classcategory_id1]');
                 var $sele2 = $(this);
-                eccube.common.checkStock($form, product_id, $sele1.val(), $sele2.val());
+                eccube.checkStock($form, product_id, $sele1.val(), $sele2.val());
             });
     });