Changeset 23187 for branches/version-2_13_0/html

Timestamp:

2013/09/04 14:34:12 (13 years ago)

Author:

h_yoshimoto

Message:

#2348 r23171 - r23176 r23178 - r23180 をマージ

Location:

branches/version-2_13_0/html

Files:

• js/eccube.js (modified) (3 diffs)
• user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js (modified) (1 diff)

branches/version-2_13_0/html/js/eccube.js

@@ -194 +194 @@
         }
         if (ret) {
-            var formElement = $("form#" + form);
-            formElement.find("*[name=" + key + "]").val(val);
-            formElement.submit();
+            var values = {};
+            values[key] = val;
+            eccube.submitForm(values, form);
         }
         return false;
@@ -202 +202 @@
 
     eccube.setValue = function(key, val, form) {
-        if (typeof form === 'undefined') {
-            form = eccube.defaults.formId;
-        }
-        var formElement = $("form#" + form);
+        var formElement = eccube.getFormElement(form);
         formElement.find("*[name=" + key + "]").val(val);
     };
 
-    eccube.changeAction = function(url) {
-        document['form1'].action = url;
+    eccube.changeAction = function(url, form) {
+        var formElement = eccube.getFormElement(form);
+        formElement.attr("action", url);
     };
 
     // ページナビで使用する。
     eccube.movePage = function(pageno, mode, form) {
-        if (form === undefined) {
-            form = eccube.defaults.formId;
-        }
-        var formElement = $("form#" + form);
-        formElement.find("input[name=pageno]").val(pageno);
+        var values = {pageno: pageno};
         if (mode !== undefined) {
-            formElement.find("input[name='mode']").val(mode);
+            values.mode = mode;
+        }
+        eccube.submitForm(values, form);
+    };
+
+    /**
+     * フォームを送信する.
+     *
+     * @param values
+     * @param form
+     */
+    eccube.submitForm = function(values, form){
+        var formElement = eccube.getFormElement(form);
+        if (values !== undefined && typeof values === "object") {
+            $.each(values, function(index, value) {
+                eccube.setValue(index, value, formElement);
+            });
         }
         formElement.submit();
     };
 
-    eccube.submitForm = function(values, form){
+    /**
+     * フォームを特定してエレメントを返す.
+     *
+     * @param form
+     * @returns {*}
+     */
+    eccube.getFormElement = function(form){
         var formElement;
         if (form !== undefined && typeof form === "string" && form !== "") {
@@ -235 +251 @@
             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();
+        return formElement;
     };
 

branches/version-2_13_0/html/user_data/packages/sphone/js/jquery.autoResizeTextAreaQ-0.1.js

@@ -1 @@
-/* * jQuery autoResizeTextAreaQ plugin * @requires jQuery v1.4.2 or later * * Copyright (c) 2010 M. Brown (mbrowniebytes A gmail.com) * Licensed under the Revised BSD license: * http://www.opensource.org/licenses/bsd-license.php * http://en.wikipedia.org/wiki/BSD_licenses  * * Versions: * 0.1 - 2010-07-21 *       initial *  * usage: *  $(document).ready( function() { *      $('textarea').autoResizeTextAreaQ({"max_rows":8}); *  }); * */(function($) {   $.fn.autoResizeTextAreaQ = function(options) {  var opts = $.extend({       // ya prob want to use      max_rows: 10,   // # - max rows to resize too               // ya may want to use, but defaults should be ok        extra_rows: 1,  // # - nbr extra rows after last line ie padding; 0|1 optimal               // ya should really specify in html     rows: null,     // null|# - null infer from html; # override html       cols: null,     // null|# - null infer from html; # override html               debug: false    // true|false - turn on|off console.log()   }, options);        // extra padding based on browser   if ($.browser.msie) {       opts.extra_rows += 1;   } else if ($.browser.webkit) {      opts.extra_rows += 1;   } // else $.browser.mozilla             // iterate over passed in selector, only process actual textareas   return $(this).filter('textarea').each(function(index) {        var ta = $(this);       var orig = {};              // textarea rows cols current state     if (opts.cols != null && opts.cols > 0) {                           ta.attr('cols', opts.cols);     }       orig.cols = ta.attr('cols');                            if (opts.rows != null && opts.rows > 0) {                           ta.attr('rows', opts.rows);     }       orig.rows = ta.attr('rows');                // validate max extra_rows      if (opts.max_rows == null || opts.max_rows < orig.rows) {           opts.max_rows = orig.rows;      }       if (opts.extra_rows == null || opts.extra_rows < 0) {           opts.extra_rows = 0;        }               if (opts.debug) {           console.log('opts: ', opts, ' orig: ', orig);       }       // resize textares on load      resize(ta, orig);               // check resize on key input        ta.bind('keyup', function(e) {          resize(ta, orig);       });             }); // end each()   function resize(ta, orig) {             // nbr explicit rows        var nl_rows = ta.val().split('\n');             // nbr inferred rows        var nbr_ta_rows = 0;                    for (index in nl_rows) {            // overly simple check to account for text being auto wrapped and thus a new line           nbr_ta_rows += Math.floor((nl_rows[index].length / orig.cols)) + 1;     }               // get final nbr ta rows        var final_nbr_ta_rows = nbr_ta_rows - 1; // deduct for current line     final_nbr_ta_rows += opts.extra_rows; // add on extra rows              // resize textarea      // note: $.animate() doesnt work well here since only inc/dec row by one        if (final_nbr_ta_rows >= opts.max_rows) {           ta.attr('rows', opts.max_rows);                                 } else if (final_nbr_ta_rows >= orig.rows) {            ta.attr('rows', final_nbr_ta_rows);                 } else {            ta.attr('rows', orig.rows);     }               if (opts.debug) {           console.log('rows: ', ta.attr('rows'), ' nbr nl_rows: ', nl_rows.length, ' nbr_ta_rows: ', nbr_ta_rows, ' final_nbr_ta_rows: ', final_nbr_ta_rows);     }   } // end resize()}; // end autoResizeTextAreaQ()})(jQuery);
+/*
+ * jQuery autoResizeTextAreaQ plugin
+ * @requires jQuery v1.4.2 or later
+ *
+ * Copyright (c) 2010 M. Brown (mbrowniebytes A gmail.com)
+ * Licensed under the Revised BSD license:
+ * http://www.opensource.org/licenses/bsd-license.php
+ * http://en.wikipedia.org/wiki/BSD_licenses
+ *
+ * Versions:
+ * 0.1 - 2010-07-21
+ *       initial
+ *
+ * usage:
+ *  $(document).ready( function() {
+ *      $('textarea').autoResizeTextAreaQ({"max_rows":8});
+ *  });
+ *
+ */
+
+(function($) {
+
+$.fn.autoResizeTextAreaQ = function(options) {
+    var opts = $.extend({
+        // ya prob want to use
+        max_rows: 10,   // # - max rows to resize too
+
+        // ya may want to use, but defaults should be ok
+        extra_rows: 1,  // # - nbr extra rows after last line ie padding; 0|1 optimal
+
+        // ya should really specify in html
+        rows: null,     // null|# - null infer from html; # override html
+        cols: null,     // null|# - null infer from html; # override html
+
+        debug: false    // true|false - turn on|off console.log()
+    }, options);
+
+    // extra padding based on browser
+    /* Removed jQuery 1.9.x
+    if ($.browser.msie) {
+        opts.extra_rows += 1;
+    } else if ($.browser.webkit) {
+        opts.extra_rows += 1;
+    } // else $.browser.mozilla
+     */
+    opts.extra_rows += 1;       // use webkit only.
+
+    // iterate over passed in selector, only process actual textareas
+    return $(this).filter('textarea').each(function(index) {
+
+        var ta = $(this);
+        var orig = {};
+
+        // textarea rows cols current state
+        if (opts.cols != null && opts.cols > 0) {
+            ta.attr('cols', opts.cols);
+        }
+        orig.cols = ta.attr('cols');
+
+        if (opts.rows != null && opts.rows > 0) {
+            ta.attr('rows', opts.rows);
+        }
+        orig.rows = ta.attr('rows');
+
+        // validate max extra_rows
+        if (opts.max_rows == null || opts.max_rows < orig.rows) {
+            opts.max_rows = orig.rows;
+        }
+        if (opts.extra_rows == null || opts.extra_rows < 0) {
+            opts.extra_rows = 0;
+        }
+
+        if (opts.debug) {
+            console.log('opts: ', opts, ' orig: ', orig);
+        }
+
+        // resize textares on load
+        resize(ta, orig);
+
+        // check resize on key input
+        ta.bind('keyup', function(e) {
+            resize(ta, orig);
+        });
+    }); // end each()
+
+    function resize(ta, orig) {
+
+        // nbr explicit rows
+        var nl_rows = ta.val().split('\n');
+
+        // nbr inferred rows
+        var nbr_ta_rows = 0;
+        for (index in nl_rows) {
+            // overly simple check to account for text being auto wrapped and thus a new line
+            nbr_ta_rows += Math.floor((nl_rows[index].length / orig.cols)) + 1;
+        }
+
+        // get final nbr ta rows
+        var final_nbr_ta_rows = nbr_ta_rows - 1; // deduct for current line
+        final_nbr_ta_rows += opts.extra_rows; // add on extra rows
+
+        // resize textarea
+        // note: $.animate() doesnt work well here since only inc/dec row by one
+        if (final_nbr_ta_rows >= opts.max_rows) {
+            ta.attr('rows', opts.max_rows);
+
+        } else if (final_nbr_ta_rows >= orig.rows) {
+            ta.attr('rows', final_nbr_ta_rows);
+
+        } else {
+            ta.attr('rows', orig.rows);
+        }
+
+        if (opts.debug) {
+            console.log('rows: ', ta.attr('rows'), ' nbr nl_rows: ', nl_rows.length, ' nbr_ta_rows: ', nbr_ta_rows, ' final_nbr_ta_rows: ', final_nbr_ta_rows);
+        }
+    } // end resize()
+
+}; // end autoResizeTextAreaQ()
+
+})(jQuery);