Changeset 23136

Timestamp:

2013/08/27 17:38:18 (11 years ago)

Author:

pineray

Message:

#2342 JavaScript?のグローバルな宣言を減らす
form2のID指定漏れ。
フォーム送信関数の変更。

Location:

branches/version-2_13-dev

Files:

• data/Smarty/templates/admin/design/template.tpl (modified) (1 diff)
• html/js/eccube.js (modified) (3 diffs)

branches/version-2_13-dev/data/Smarty/templates/admin/design/template.tpl

@@ -84 +84 @@
     </div>
 </form>
-<form name="form2" method="post" action="?">
+<form name="form2" id="form2" method="post" action="?">
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
     <input type="hidden" name="mode" value="" />

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

@@ -160 +160 @@
 
     eccube.fnFormModeSubmit = function(form, mode, keyname, keyid) {
-        var formElement = $("form#" + form);
         switch(mode) {
             case 'delete':
@@ -180 +179 @@
                 break;
         }
-        formElement.find("input[name='mode']").val(mode);
+        var values = {mode:mode};
         if(keyname !== undefined && keyname !== "" && keyid !== undefined && keyid !== "") {
-            formElement.find("*[name=" + keyname + "]").val(keyid);
-        }
-        formElement.submit();
+            values[keyname] = keyid;
+        }
+        eccube.submitForm(values, form);
     };
 
@@ -227 +226 @@
     };
 
-    eccube.submitForm = function(form){
-        if (typeof form === 'undefined') {
-            form = eccube.defaults.formId;
-        }
-        $("form#" + form).submit();
+    eccube.submitForm = function(values, form){
+        var formElement;
+        if (form !== undefined && typeof form === "string" && form !== "") {
+            formElement = $("form#" + form);
+        } else if (form !== undefined && typeof form === "object") {
+            formElement = form;
+        } else {
+            formElement = $("form#" + eccube.defaults.formId);
+        }
+        if (values !== undefined && typeof values === "object") {
+            $.each(values, function(index, value) {
+                formElement.find("input,select").filter("[name='" + index + "']").val(value);
+            });
+        }
+        formElement.submit();
     };