[email protected] 그리드 모바일 뷰모드 페이징 버그 픽스

thomasJang · Oct 14, 2016 · 6942053 · 6942053
1 parent 3337043
commit 6942053
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 19 deletions.
diff --git a/dist/AXJ.all.js b/dist/AXJ.all.js
@@ -1,8 +1,8 @@
 /*! 
-axisj - v1.1.9 - 2016-08-25 
+axisj - v1.1.10 - 2016-10-14 
 */
 /*! 
-axisj - v1.1.9 - 2016-08-25 
+axisj - v1.1.10 - 2016-10-14 
 */
 
 if(!window.AXConfig){
@@ -18204,8 +18204,8 @@ var AXGrid = Class.create(AXJ, {
                 }
                 po.push('<select name="inline_editor_item" id="' + cfg.targetID + '_inline_editor" class="inline_editor_select ' + cond.type + '">');
 
-                if($.isFunction(cond.options)){
-                    (function(options){
+                if ($.isFunction(cond.options)) {
+                    (function (options) {
                         for (var oi = 0; oi < options.length; oi++) {
                             var value, text;
                             value = options[oi][cond.optionValue || "optionValue"], text = options[oi][cond.optionText || "optionText"];
@@ -21409,9 +21409,15 @@ var AXGrid = Class.create(AXJ, {
             var pgCount = this.page.pageCount.number();
             var pageNo = this.page.pageNo.number();
 
-            if (pageNo + pageAdd < 1) pageNo = 1;
-            else if (pageNo + pageAdd > pgCount) pageNo = pgCount;
-            else pageNo += pageAdd;
+            if (pageNo + pageAdd < 1) {
+                return false;
+            }
+            else if (pageNo + pageAdd > pgCount) {
+                return false;
+            }
+            else {
+                pageNo += pageAdd;
+            }
 
             if (cfg.viewMode == "mobile") {
                 axdom("#" + cfg.targetID + "_AX_gridToolTopPageNo").val(pageNo);
@@ -21617,7 +21623,7 @@ var AXGrid = Class.create(AXJ, {
                                     item: item,
                                     page: this.page,
                                     key: CH.key,
-                                    value: item[CH.key]||""
+                                    value: item[CH.key] || ""
                                 };
                                 result = CH.formatter.call(sendObj, itemIndex, item);
                                 result = ("" + result).delHtml();

diff --git a/dist/AXJ.min.js b/dist/AXJ.min.js
diff --git a/dist/AXJ.tiny.js b/dist/AXJ.tiny.js
@@ -1,8 +1,8 @@
 /*! 
-axisj - v1.1.9 - 2016-08-25 
+axisj - v1.1.10 - 2016-10-14 
 */
 /*! 
-axisj - v1.1.9 - 2016-08-25 
+axisj - v1.1.10 - 2016-10-14 
 */
 
 if(!window.AXConfig){

diff --git a/lib/AXGrid.js b/lib/AXGrid.js
@@ -2,7 +2,7 @@
  * AXGrid
  * @class AXGrid
  * @extends AXJ
- * @version v4.6.7
+ * @version v4.6.8
  * @author [email protected]
  * @example
  *```
@@ -5907,8 +5907,8 @@ var AXGrid = Class.create(AXJ, {
                 }
                 po.push('<select name="inline_editor_item" id="' + cfg.targetID + '_inline_editor" class="inline_editor_select ' + cond.type + '">');
 
-                if($.isFunction(cond.options)){
-                    (function(options){
+                if ($.isFunction(cond.options)) {
+                    (function (options) {
                         for (var oi = 0; oi < options.length; oi++) {
                             var value, text;
                             value = options[oi][cond.optionValue || "optionValue"], text = options[oi][cond.optionText || "optionText"];
@@ -9112,9 +9112,15 @@ var AXGrid = Class.create(AXJ, {
             var pgCount = this.page.pageCount.number();
             var pageNo = this.page.pageNo.number();
 
-            if (pageNo + pageAdd < 1) pageNo = 1;
-            else if (pageNo + pageAdd > pgCount) pageNo = pgCount;
-            else pageNo += pageAdd;
+            if (pageNo + pageAdd < 1) {
+                return false;
+            }
+            else if (pageNo + pageAdd > pgCount) {
+                return false;
+            }
+            else {
+                pageNo += pageAdd;
+            }
 
             if (cfg.viewMode == "mobile") {
                 axdom("#" + cfg.targetID + "_AX_gridToolTopPageNo").val(pageNo);
@@ -9320,7 +9326,7 @@ var AXGrid = Class.create(AXJ, {
                                     item: item,
                                     page: this.page,
                                     key: CH.key,
-                                    value: item[CH.key]||""
+                                    value: item[CH.key] || ""
                                 };
                                 result = CH.formatter.call(sendObj, itemIndex, item);
                                 result = ("" + result).delHtml();

diff --git a/lib/AXJ.js b/lib/AXJ.js
@@ -1,5 +1,5 @@
 /*! 
-axisj - v1.1.9 - 2016-08-25 
+axisj - v1.1.10 - 2016-10-14 
 */
 
 if(!window.AXConfig){