Skip to content

Commit

Permalink
https://github.com/axisj/axisj/issues/915 axisj@1.1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomasJang
thomasJang committed Aug 25, 2016
1 parent 59a2c06 commit c3dff88
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 45 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "axisj",
"version": "1.1.9",
"version": "1.1.10",
"homepage": "https://github.com/axisj-com/axisj",
"authors": [
"tom@axisj.com thomasJ and team axisj"
Expand Down
23 changes: 13 additions & 10 deletions dist/AXJ.all.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
axisj - v1.1.9 - 2016-08-23
axisj - v1.1.9 - 2016-08-25
*/
/*!
axisj - v1.1.9 - 2016-08-23
axisj - v1.1.9 - 2016-08-25
*/

if(!window.AXConfig){
Expand Down Expand Up @@ -13678,7 +13678,7 @@ var AXGrid = Class.create(AXJ, {

/* grid 뼈대 그리기 ----------------------------------------------------------------------------------------------------- */
var ol = [];
ol.push("<a id=\"" + cfg.targetID + "_AX_grid_focus\" href=\"#axtree\" ></a>");
//ol.push("<a id=\"" + cfg.targetID + "_AX_grid_focus\" href=\"#axtree\" ></a>");
ol.push("<div class=\"" + theme + "\" id=\"" + cfg.targetID + "_AX_grid\" style=\"" + gridCss.join('') + "\">");
ol.push(" <div class=\"AXgridScrollBody\" id=\"" + cfg.targetID + "_AX_gridScrollBody\" style=\"z-index:2;\">");
ol.push(" <div class=\"AXGridColHead AXUserSelectNone\" id=\"" + cfg.targetID + "_AX_gridColHead\" onselectstart=\"return false;\"></div>");
Expand Down Expand Up @@ -13711,7 +13711,7 @@ var AXGrid = Class.create(AXJ, {
/* grid 뼈대 그리기 ----------------------------------------------------------------------------------------------------- */

/* 주요 타깃 설정 */
this.gridFocus = axdom("#" + cfg.targetID + "_AX_grid_focus");
//this.gridFocus = axdom("#" + cfg.targetID + "_AX_grid_focus");
this.gridBody = axdom("#" + cfg.targetID + "_AX_grid");
this.scrollBody = axdom("#" + cfg.targetID + "_AX_gridScrollBody");
this.colHead = axdom("#" + cfg.targetID + "_AX_gridColHead");
Expand Down Expand Up @@ -13793,10 +13793,10 @@ var AXGrid = Class.create(AXJ, {
if (this.editorOpend || this.inline_edit) return;
var e = e || window.event;
if (e.target.tagName == "INPUT" || e.target.tagName == "SELECT" || e.target.tagName == "TEXTAREA" || e.target.tagName == "BUTTON") return;
this.gridFocus.focus();
//this.gridFocus.focus();
}).bind(this));

this.gridFocus.unbind("keydown.axgrid").bind("keydown.axgrid", this.onKeydown.bind(this));
//this.gridFocus.unbind("keydown.axgrid").bind("keydown.axgrid", this.onKeydown.bind(this));

if (cfg.contextMenu) {
AXContextMenu.bind({
Expand Down Expand Up @@ -21374,7 +21374,6 @@ var AXGrid = Class.create(AXJ, {
oi++;
}
}
/*alert(axf.getId(cfg.targetID + "_AX_gridPageNo").options[axf.getId(cfg.targetID + "_AX_gridPageNo").options.selectedIndex].value); */
}
axdom("#" + cfg.targetID + "_AX_gridPageCount").html("/ " + pgCount.money() + " " + cfg.pageCountMSG);

Expand Down Expand Up @@ -35075,6 +35074,7 @@ var AXSelectConverter = Class.create(AXJ, {

if (jqueryTargetObjID.data("disabled")) return;


if (isToggle) { // 활성화 여부가 토글 이면
if (AXgetId(cfg.targetID + "_AX_" + objID + "_AX_expandBox")) {
if (obj.config.isChangedSelect) {
Expand Down Expand Up @@ -35105,10 +35105,12 @@ var AXSelectConverter = Class.create(AXJ, {
po.push(" <div class=\"AXLoadingSmall\"></div>");
po.push("</div>");
po.push("</div>");

axdom(document.body).append(po.join(''));
axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_SelectBoxArrow").addClass("on");

var expandBox = axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_expandBox");

if (obj.config.positionFixed) {
expandBox.css({"position": "fixed"});
}
Expand Down Expand Up @@ -35177,6 +35179,7 @@ var AXSelectConverter = Class.create(AXJ, {
bindSelectClose: function (objID, objSeq, event) {
var obj = this.objects[objSeq], options, sendObj;
//trace("bindSelectorClose");

var cfg = this.config;
if (AXgetId(cfg.targetID + "_AX_" + objID + "_AX_expandBox")) {
axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_expandBox").remove(); // 개체 삭제 처리
Expand Down Expand Up @@ -35250,14 +35253,14 @@ var AXSelectConverter = Class.create(AXJ, {
obj.documentKeyup = function (event) {
bindSelectKeyup(objID, objSeq, event);
};
axdom(document).bind("click.AXSelect", obj.documentclickEvent);
axdom(document).unbind("click.AXSelect").bind("click.AXSelect", obj.documentclickEvent);
/*
axdom(document.body).bind("focus.AXSelect", function(e){
console.log(e);
});
*/
axdom(document).bind("keydown.AXSelect", obj.documentKeyup);
axdom(document.body).on("focus.AXSelect", "input,select,button,a,textarea", obj.documentclickEvent);
axdom(document).unbind("keydown.AXSelect").bind("keydown.AXSelect", obj.documentKeyup);
axdom(document.body).off("focus.AXSelect").on("focus.AXSelect", "input,select,button,a,textarea", obj.documentclickEvent);

if (obj.myUIScroll) obj.myUIScroll.unbind();
obj.myUIScroll = new AXScroll();
Expand Down
32 changes: 16 additions & 16 deletions dist/AXJ.min.js
View file

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions dist/AXJ.tiny.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
axisj - v1.1.9 - 2016-08-23
axisj - v1.1.9 - 2016-08-25
*/
/*!
axisj - v1.1.9 - 2016-08-23
axisj - v1.1.9 - 2016-08-25
*/

if(!window.AXConfig){
Expand Down Expand Up @@ -16874,6 +16874,7 @@ var AXSelectConverter = Class.create(AXJ, {

if (jqueryTargetObjID.data("disabled")) return;


if (isToggle) { // 활성화 여부가 토글 이면
if (AXgetId(cfg.targetID + "_AX_" + objID + "_AX_expandBox")) {
if (obj.config.isChangedSelect) {
Expand Down Expand Up @@ -16904,10 +16905,12 @@ var AXSelectConverter = Class.create(AXJ, {
po.push(" <div class=\"AXLoadingSmall\"></div>");
po.push("</div>");
po.push("</div>");

axdom(document.body).append(po.join(''));
axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_SelectBoxArrow").addClass("on");

var expandBox = axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_expandBox");

if (obj.config.positionFixed) {
expandBox.css({"position": "fixed"});
}
Expand Down Expand Up @@ -16976,6 +16979,7 @@ var AXSelectConverter = Class.create(AXJ, {
bindSelectClose: function (objID, objSeq, event) {
var obj = this.objects[objSeq], options, sendObj;
//trace("bindSelectorClose");

var cfg = this.config;
if (AXgetId(cfg.targetID + "_AX_" + objID + "_AX_expandBox")) {
axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_expandBox").remove(); // 개체 삭제 처리
Expand Down Expand Up @@ -17049,14 +17053,14 @@ var AXSelectConverter = Class.create(AXJ, {
obj.documentKeyup = function (event) {
bindSelectKeyup(objID, objSeq, event);
};
axdom(document).bind("click.AXSelect", obj.documentclickEvent);
axdom(document).unbind("click.AXSelect").bind("click.AXSelect", obj.documentclickEvent);
/*
axdom(document.body).bind("focus.AXSelect", function(e){
console.log(e);
});
*/
axdom(document).bind("keydown.AXSelect", obj.documentKeyup);
axdom(document.body).on("focus.AXSelect", "input,select,button,a,textarea", obj.documentclickEvent);
axdom(document).unbind("keydown.AXSelect").bind("keydown.AXSelect", obj.documentKeyup);
axdom(document.body).off("focus.AXSelect").on("focus.AXSelect", "input,select,button,a,textarea", obj.documentclickEvent);

if (obj.myUIScroll) obj.myUIScroll.unbind();
obj.myUIScroll = new AXScroll();
Expand Down
4 changes: 2 additions & 2 deletions dist/AXJ.tinymin.js
View file

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions lib/AXGrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* AXGrid
* @class AXGrid
* @extends AXJ
* @version v4.6.6
* @version v4.6.7
* @author tom@axisj.com
* @example
*```
Expand Down Expand Up @@ -1381,7 +1381,7 @@ var AXGrid = Class.create(AXJ, {

/* grid 뼈대 그리기 ----------------------------------------------------------------------------------------------------- */
var ol = [];
ol.push("<a id=\"" + cfg.targetID + "_AX_grid_focus\" href=\"#axtree\" ></a>");
//ol.push("<a id=\"" + cfg.targetID + "_AX_grid_focus\" href=\"#axtree\" ></a>");
ol.push("<div class=\"" + theme + "\" id=\"" + cfg.targetID + "_AX_grid\" style=\"" + gridCss.join('') + "\">");
ol.push(" <div class=\"AXgridScrollBody\" id=\"" + cfg.targetID + "_AX_gridScrollBody\" style=\"z-index:2;\">");
ol.push(" <div class=\"AXGridColHead AXUserSelectNone\" id=\"" + cfg.targetID + "_AX_gridColHead\" onselectstart=\"return false;\"></div>");
Expand Down Expand Up @@ -1414,7 +1414,7 @@ var AXGrid = Class.create(AXJ, {
/* grid 뼈대 그리기 ----------------------------------------------------------------------------------------------------- */

/* 주요 타깃 설정 */
this.gridFocus = axdom("#" + cfg.targetID + "_AX_grid_focus");
//this.gridFocus = axdom("#" + cfg.targetID + "_AX_grid_focus");
this.gridBody = axdom("#" + cfg.targetID + "_AX_grid");
this.scrollBody = axdom("#" + cfg.targetID + "_AX_gridScrollBody");
this.colHead = axdom("#" + cfg.targetID + "_AX_gridColHead");
Expand Down Expand Up @@ -1496,10 +1496,10 @@ var AXGrid = Class.create(AXJ, {
if (this.editorOpend || this.inline_edit) return;
var e = e || window.event;
if (e.target.tagName == "INPUT" || e.target.tagName == "SELECT" || e.target.tagName == "TEXTAREA" || e.target.tagName == "BUTTON") return;
this.gridFocus.focus();
//this.gridFocus.focus();
}).bind(this));

this.gridFocus.unbind("keydown.axgrid").bind("keydown.axgrid", this.onKeydown.bind(this));
//this.gridFocus.unbind("keydown.axgrid").bind("keydown.axgrid", this.onKeydown.bind(this));

if (cfg.contextMenu) {
AXContextMenu.bind({
Expand Down Expand Up @@ -9077,7 +9077,6 @@ var AXGrid = Class.create(AXJ, {
oi++;
}
}
/*alert(axf.getId(cfg.targetID + "_AX_gridPageNo").options[axf.getId(cfg.targetID + "_AX_gridPageNo").options.selectedIndex].value); */
}
axdom("#" + cfg.targetID + "_AX_gridPageCount").html("/ " + pgCount.money() + " " + cfg.pageCountMSG);

Expand Down
2 changes: 1 addition & 1 deletion lib/AXJ.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
axisj - v1.1.9 - 2016-08-23
axisj - v1.1.9 - 2016-08-25
*/

if(!window.AXConfig){
Expand Down
10 changes: 7 additions & 3 deletions lib/AXSelect.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,7 @@ var AXSelectConverter = Class.create(AXJ, {

if (jqueryTargetObjID.data("disabled")) return;


if (isToggle) { // 활성화 여부가 토글 이면
if (AXgetId(cfg.targetID + "_AX_" + objID + "_AX_expandBox")) {
if (obj.config.isChangedSelect) {
Expand Down Expand Up @@ -631,10 +632,12 @@ var AXSelectConverter = Class.create(AXJ, {
po.push(" <div class=\"AXLoadingSmall\"></div>");
po.push("</div>");
po.push("</div>");

axdom(document.body).append(po.join(''));
axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_SelectBoxArrow").addClass("on");

var expandBox = axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_expandBox");

if (obj.config.positionFixed) {
expandBox.css({"position": "fixed"});
}
Expand Down Expand Up @@ -703,6 +706,7 @@ var AXSelectConverter = Class.create(AXJ, {
bindSelectClose: function (objID, objSeq, event) {
var obj = this.objects[objSeq], options, sendObj;
//trace("bindSelectorClose");

var cfg = this.config;
if (AXgetId(cfg.targetID + "_AX_" + objID + "_AX_expandBox")) {
axdom("#" + cfg.targetID + "_AX_" + objID + "_AX_expandBox").remove(); // 개체 삭제 처리
Expand Down Expand Up @@ -776,14 +780,14 @@ var AXSelectConverter = Class.create(AXJ, {
obj.documentKeyup = function (event) {
bindSelectKeyup(objID, objSeq, event);
};
axdom(document).bind("click.AXSelect", obj.documentclickEvent);
axdom(document).unbind("click.AXSelect").bind("click.AXSelect", obj.documentclickEvent);
/*
axdom(document.body).bind("focus.AXSelect", function(e){
console.log(e);
});
*/
axdom(document).bind("keydown.AXSelect", obj.documentKeyup);
axdom(document.body).on("focus.AXSelect", "input,select,button,a,textarea", obj.documentclickEvent);
axdom(document).unbind("keydown.AXSelect").bind("keydown.AXSelect", obj.documentKeyup);
axdom(document.body).off("focus.AXSelect").on("focus.AXSelect", "input,select,button,a,textarea", obj.documentclickEvent);

if (obj.myUIScroll) obj.myUIScroll.unbind();
obj.myUIScroll = new AXScroll();
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "axisj",
"version": "1.1.9",
"version": "1.1.10",
"description": "Javascript UI Library (jQuery)",
"_comment:publishConfig": {
"registry": "http://npm.axboot.com"
Expand Down
1 change: 1 addition & 0 deletions samples/AXGrid/ajax.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

<script type="text/javascript" src="../../jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../dist/AXJ.min.js"></script>
<script type="text/javascript" src="../../lib/AXSelect.js"></script>
<script type="text/javascript" src="../../lib/AXGrid.js"></script>

<script type="text/javascript" src="../page.js"></script>
Expand Down

0 comments on commit c3dff88

Please sign in to comment.