Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dongwoo committed Aug 31, 2015
2 parents b4adb5b + 1ab9126 commit 763ffa7
Show file tree
Hide file tree
Showing 15 changed files with 316 additions and 1,897 deletions.
16 changes: 7 additions & 9 deletions grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -2513,16 +2513,16 @@ Model.Renderer = Model.Base.extend(/**@lends Model.Renderer.prototype */{
'use strict';

/**
* The width of the border of the dimension.
* @const
* @type {number}
* The width of the border of the dimension.
*/
var BORDER_WIDTH = 1,

/**
* The width of the border of table row.
* @const
* @type {number}
* The width of the border of table row.
*/
ROW_BORDER_WIDTH = 1;

Expand Down Expand Up @@ -2563,14 +2563,14 @@ Model.Dimension = Model.Base.extend(/**@lends Model.Dimension.prototype */{
Model.Base.prototype.initialize.apply(this, arguments);

/**
* @type {boolean[]}
* An array of the fixed flags of the columns
* @type {boolean[]}
*/
this._columnWidthFixedFlags = null;

/**
* @type {number[]}
* An array of the minimum width of the columns
* @type {number[]}
*/
this._minColumnWidthList = null;

Expand Down Expand Up @@ -2687,7 +2687,8 @@ Model.Dimension = Model.Base.extend(/**@lends Model.Dimension.prototype */{
* This method will be called recursively by _reduceExcessColumnWidth.
* @param {number[]} columnWidthList - An array of column Width
* @param {number} totalRemainWidth - Remaining excess width (negative number)
* @param {{index:number, width:number}[]} availableList - An array of infos about available column
* @param {object[]} availableList - An array of infos about available column.
* Each item of the array has {index:number, width:number}.
* @return {number[]} - A new array of column widths
* @private
*/
Expand Down Expand Up @@ -9987,7 +9988,6 @@ var Core = View.Base.extend(/**@lends Core.prototype */{
* @return {(Number|String)} 행 데이터의 고유 키
*/
getSelectedRowKey: function() {
console.log('selectedRowKey', this.focusModel.which().rowKey);
return this.focusModel.which().rowKey;
},
/**
Expand Down Expand Up @@ -10583,7 +10583,6 @@ var Core = View.Base.extend(/**@lends Core.prototype */{
* @param {String} className 지정할 디자인 클래스명
*/
removeRowClassName: function(rowKey, className) {
console.log('removeRowClassName', rowKey, className);
this.dataModel.get(rowKey).removeRowClassName(className);
},
/**
Expand Down Expand Up @@ -11351,7 +11350,6 @@ ne.Grid = View.Base.extend(/**@lends ne.Grid.prototype */{
* @param {string} className - The css class name to be removed
*/
removeCellClassName: function(rowKey, columnName, className) {
console.log('removeCellClassName', rowKey, columnName, className);
this.core.removeCellClassName(rowKey, className);
},
/**
Expand Down Expand Up @@ -11412,4 +11410,4 @@ ne.Grid.getInstanceById = function(id) {
return Core.prototype.__instance[id];
};

})();
})();
2 changes: 1 addition & 1 deletion grid.min.map

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions samples/js/grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -2513,16 +2513,16 @@ Model.Renderer = Model.Base.extend(/**@lends Model.Renderer.prototype */{
'use strict';

/**
* The width of the border of the dimension.
* @const
* @type {number}
* The width of the border of the dimension.
*/
var BORDER_WIDTH = 1,

/**
* The width of the border of table row.
* @const
* @type {number}
* The width of the border of table row.
*/
ROW_BORDER_WIDTH = 1;

Expand Down Expand Up @@ -2563,14 +2563,14 @@ Model.Dimension = Model.Base.extend(/**@lends Model.Dimension.prototype */{
Model.Base.prototype.initialize.apply(this, arguments);

/**
* @type {boolean[]}
* An array of the fixed flags of the columns
* @type {boolean[]}
*/
this._columnWidthFixedFlags = null;

/**
* @type {number[]}
* An array of the minimum width of the columns
* @type {number[]}
*/
this._minColumnWidthList = null;

Expand Down Expand Up @@ -2687,7 +2687,8 @@ Model.Dimension = Model.Base.extend(/**@lends Model.Dimension.prototype */{
* This method will be called recursively by _reduceExcessColumnWidth.
* @param {number[]} columnWidthList - An array of column Width
* @param {number} totalRemainWidth - Remaining excess width (negative number)
* @param {{index:number, width:number}[]} availableList - An array of infos about available column
* @param {object[]} availableList - An array of infos about available column.
* Each item of the array has {index:number, width:number}.
* @return {number[]} - A new array of column widths
* @private
*/
Expand Down
2 changes: 1 addition & 1 deletion samples/sample1.html
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,4 @@
});
grid.setRowList(dummyRowList);
</script>
</html>
</html>
2 changes: 1 addition & 1 deletion samples/sample2.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,4 +264,4 @@ <h1>테스트 영역</h1>
net.request('modifyData');
});
</script>
</html>
</html>
2 changes: 1 addition & 1 deletion samples/sample3.html
Original file line number Diff line number Diff line change
Expand Up @@ -432,4 +432,4 @@

]);
</script>
</html>
</html>
2 changes: 1 addition & 1 deletion samples/sample4.html
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,4 @@
"receiverPhone": "0809998877"
}]);
</script>
</html>
</html>
2 changes: 1 addition & 1 deletion samples/sample_name.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"sample4": {
"title": "_extraData 의 사용"
}
}
}
11 changes: 6 additions & 5 deletions src/Model/Dimension.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
'use strict';

/**
* The width of the border of the dimension.
* @const
* @type {number}
* The width of the border of the dimension.
*/
var BORDER_WIDTH = 1,

/**
* The width of the border of table row.
* @const
* @type {number}
* The width of the border of table row.
*/
ROW_BORDER_WIDTH = 1;

Expand Down Expand Up @@ -56,14 +56,14 @@ Model.Dimension = Model.Base.extend(/**@lends Model.Dimension.prototype */{
Model.Base.prototype.initialize.apply(this, arguments);

/**
* @type {boolean[]}
* An array of the fixed flags of the columns
* @type {boolean[]}
*/
this._columnWidthFixedFlags = null;

/**
* @type {number[]}
* An array of the minimum width of the columns
* @type {number[]}
*/
this._minColumnWidthList = null;

Expand Down Expand Up @@ -180,7 +180,8 @@ Model.Dimension = Model.Base.extend(/**@lends Model.Dimension.prototype */{
* This method will be called recursively by _reduceExcessColumnWidth.
* @param {number[]} columnWidthList - An array of column Width
* @param {number} totalRemainWidth - Remaining excess width (negative number)
* @param {{index:number, width:number}[]} availableList - An array of infos about available column
* @param {object[]} availableList - An array of infos about available column.
* Each item of the array has {index:number, width:number}.
* @return {number[]} - A new array of column widths
* @private
*/
Expand Down
Loading

0 comments on commit 763ffa7

Please sign in to comment.