Skip to content

Commit

Permalink
AXInput bindDate, bindInputDisabled 버그픽스
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomasJang
thomasJang committed Jun 23, 2016
1 parent 49e573f commit e0311a2
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 42 deletions.
13 changes: 7 additions & 6 deletions dist/AXJ.all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23383,18 +23383,16 @@ var AXInputConverter = Class.create(AXJ, {
var obj = this.objects[findIndex];
var cfg = this.config;

if (typeof _disabled == "boolean") {
axf.getId(objID).disabled = _disabled;
}
else {
axf.getId(objID).disabled = !AXgetId(objID).disabled;
var elDisabled = !axf.getId(objID).disabled;
axf.getId(objID).disabled = (typeof _disabled == "boolean") ? _disabled : elDisabled;
if(obj.bindType == "twinDate"){
axf.getId(obj.config.startTargetID).disabled = (typeof _disabled == "boolean") ? _disabled : elDisabled;
}

obj.bindAnchorTarget.data("disabled", axf.getId(objID).disabled);
if (axf.getId(objID).disabled) {
obj.bindAnchorTarget.addClass("disable");
obj.bindAnchorTarget.attr("disable", "disable");

obj.bindAnchorTarget.find("a").bind("mousedown.AXInputDisabled", function (e) {
//alert("block");
var event = window.event || e;
Expand All @@ -23403,6 +23401,7 @@ var AXInputConverter = Class.create(AXJ, {
event.cancelBubble = true;
return false;
});

}
else {
obj.bindAnchorTarget.removeClass("disable");
Expand Down Expand Up @@ -26771,6 +26770,7 @@ var AXInputConverter = Class.create(AXJ, {
var yy = nDate.getFullYear();
var dd = 1;
obj.nDate = new Date(Date.UTC(yy, myMonth, dd, 12));
axdom("#" + objID).val(obj.nDate.print("yyyy" + separator + "mm"));
this.bindDateExpandClose(objID, objSeq, event);
}
else {
Expand All @@ -26786,6 +26786,7 @@ var AXInputConverter = Class.create(AXJ, {
var mm = 0;
var dd = 1;
obj.nDate = new Date(Date.UTC(myYear, mm, dd, 12));
axdom("#" + objID).val(obj.nDate.print("yyyy"));
this.bindDateExpandClose(objID, objSeq, event);
}
else {
Expand Down
30 changes: 15 additions & 15 deletions dist/AXJ.min.js
View file

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions dist/AXJ.tiny.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9218,18 +9218,16 @@ var AXInputConverter = Class.create(AXJ, {
var obj = this.objects[findIndex];
var cfg = this.config;

if (typeof _disabled == "boolean") {
axf.getId(objID).disabled = _disabled;
}
else {
axf.getId(objID).disabled = !AXgetId(objID).disabled;
var elDisabled = !axf.getId(objID).disabled;
axf.getId(objID).disabled = (typeof _disabled == "boolean") ? _disabled : elDisabled;
if(obj.bindType == "twinDate"){
axf.getId(obj.config.startTargetID).disabled = (typeof _disabled == "boolean") ? _disabled : elDisabled;
}

obj.bindAnchorTarget.data("disabled", axf.getId(objID).disabled);
if (axf.getId(objID).disabled) {
obj.bindAnchorTarget.addClass("disable");
obj.bindAnchorTarget.attr("disable", "disable");

obj.bindAnchorTarget.find("a").bind("mousedown.AXInputDisabled", function (e) {
//alert("block");
var event = window.event || e;
Expand All @@ -9238,6 +9236,7 @@ var AXInputConverter = Class.create(AXJ, {
event.cancelBubble = true;
return false;
});

}
else {
obj.bindAnchorTarget.removeClass("disable");
Expand Down Expand Up @@ -12606,6 +12605,7 @@ var AXInputConverter = Class.create(AXJ, {
var yy = nDate.getFullYear();
var dd = 1;
obj.nDate = new Date(Date.UTC(yy, myMonth, dd, 12));
axdom("#" + objID).val(obj.nDate.print("yyyy" + separator + "mm"));
this.bindDateExpandClose(objID, objSeq, event);
}
else {
Expand All @@ -12621,6 +12621,7 @@ var AXInputConverter = Class.create(AXJ, {
var mm = 0;
var dd = 1;
obj.nDate = new Date(Date.UTC(myYear, mm, dd, 12));
axdom("#" + objID).val(obj.nDate.print("yyyy"));
this.bindDateExpandClose(objID, objSeq, event);
}
else {
Expand Down
16 changes: 8 additions & 8 deletions dist/AXJ.tinymin.js
View file

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions lib/AXInput.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* input element에 "search", "number", "money", "slider", "twinSlider", "selector", "switch", "segment", "date", "dateTime", "twinDate", "twinDateTime", "checked"등을 바인드 할 수 있도록 지원하는 클랙스 입니다.
* @class AXInputConverter
* @extends AXJ
* @version v1.77
* @version v1.78
* @author tom@axisj.com
* @example
```
Expand Down Expand Up @@ -321,18 +321,16 @@ var AXInputConverter = Class.create(AXJ, {
var obj = this.objects[findIndex];
var cfg = this.config;

if (typeof _disabled == "boolean") {
axf.getId(objID).disabled = _disabled;
}
else {
axf.getId(objID).disabled = !AXgetId(objID).disabled;
var elDisabled = !axf.getId(objID).disabled;
axf.getId(objID).disabled = (typeof _disabled == "boolean") ? _disabled : elDisabled;
if(obj.bindType == "twinDate"){
axf.getId(obj.config.startTargetID).disabled = (typeof _disabled == "boolean") ? _disabled : elDisabled;
}

obj.bindAnchorTarget.data("disabled", axf.getId(objID).disabled);
if (axf.getId(objID).disabled) {
obj.bindAnchorTarget.addClass("disable");
obj.bindAnchorTarget.attr("disable", "disable");

obj.bindAnchorTarget.find("a").bind("mousedown.AXInputDisabled", function (e) {
//alert("block");
var event = window.event || e;
Expand All @@ -341,6 +339,7 @@ var AXInputConverter = Class.create(AXJ, {
event.cancelBubble = true;
return false;
});

}
else {
obj.bindAnchorTarget.removeClass("disable");
Expand Down Expand Up @@ -3709,6 +3708,7 @@ var AXInputConverter = Class.create(AXJ, {
var yy = nDate.getFullYear();
var dd = 1;
obj.nDate = new Date(Date.UTC(yy, myMonth, dd, 12));
axdom("#" + objID).val(obj.nDate.print("yyyy" + separator + "mm"));
this.bindDateExpandClose(objID, objSeq, event);
}
else {
Expand All @@ -3724,6 +3724,7 @@ var AXInputConverter = Class.create(AXJ, {
var mm = 0;
var dd = 1;
obj.nDate = new Date(Date.UTC(myYear, mm, dd, 12));
axdom("#" + objID).val(obj.nDate.print("yyyy"));
this.bindDateExpandClose(objID, objSeq, event);
}
else {
Expand Down

0 comments on commit e0311a2

Please # to comment.