Changeset 23140 for branches/version-2_13_0/html/js/eccube.js

Timestamp:

2013/08/28 09:41:18 (11 years ago)

Author:

m_uehara

Message:

#2348 r23128 - r23137 をマージ

File:

• branches/version-2_13_0/html/js/eccube.js (modified) (3 diffs)

branches/version-2_13_0/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();
-    };
-
-    eccube.setValueAndSubmit = function(form, key, val) {
-        var formElement = $("form#" + form);
-        formElement.find("*[name=" + key + "]").val(val);
-        formElement.submit();
+            values[keyname] = keyid;
+        }
+        eccube.submitForm(values, form);
+    };
+
+    eccube.setValueAndSubmit = function(form, key, val, msg) {
+        var ret;
+        if (msg !== undefined) {
+            ret = window.confirm(msg);
+        } else {
+            ret = true;
+        }
+        if (ret) {
+            var formElement = $("form#" + form);
+            formElement.find("*[name=" + key + "]").val(val);
+            formElement.submit();
+        }
         return false;
     };
@@ -208 +215 @@
     // ページナビで使用する。
     eccube.movePage = function(pageno, mode, form) {
-        if (typeof form === 'undefined') {
+        if (form === undefined) {
             form = eccube.defaults.formId;
         }
         var formElement = $("form#" + form);
         formElement.find("input[name=pageno]").val(pageno);
-        if (typeof mode !== 'undefined') {
-            formElement.find("input[name='mode']").val('search');
+        if (mode !== undefined) {
+            formElement.find("input[name='mode']").val(mode);
         }
         formElement.submit();
     };
 
-    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();
     };