Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions public/cui.js
Original file line number Diff line number Diff line change
Expand Up @@ -24045,7 +24045,9 @@ CUI.DataField = (function(superClass) {
return this.__isRendered;
};

DataField.prototype.render = function() {
DataField.prototype.render = function(arg) {
var callOnRender, ref;
callOnRender = (ref = (arg != null ? arg : {}).callOnRender) != null ? ref : true;
CUI.util.assert(!this.__isRendered, this.__cls + ".render", "Cannot be called when already rendered.", {
opts: this.opts,
dataField: this
Expand All @@ -24058,8 +24060,10 @@ CUI.DataField = (function(superClass) {
if (this.isHidden()) {
this.hide(true);
}
if (typeof this._onRender === "function") {
this._onRender(this);
if (callOnRender) {
if (typeof this._onRender === "function") {
this._onRender(this);
}
}
return this;
};
Expand Down Expand Up @@ -39721,7 +39725,9 @@ CUI.DataTable = (function(superClass) {

DataTable.prototype.render = function() {
var cls, colClasses, cols, f, i, idx, j, label, len1, len2, maxis, name, ref, ref1, ref2, ref3, ref4, ref5;
DataTable.__super__.render.call(this);
DataTable.__super__.render.call(this, {
callOnRender: false
});
cols = [];
colClasses = [];
maxis = [];
Expand Down Expand Up @@ -39817,6 +39823,9 @@ CUI.DataTable = (function(superClass) {
this.listView.setInactive(true, null);
}
this.replace(this.listView.render());
if (typeof this._onRender === "function") {
this._onRender(this);
}
CUI.Events.listen({
type: "data-changed",
node: this.listView,
Expand Down
2 changes: 1 addition & 1 deletion public/cui.min.js

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions src/base/DataField/DataField.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ class CUI.DataField extends CUI.DOMElement
isRendered: ->
@__isRendered

render: ->
render: ({ callOnRender = true } = {}) ->
CUI.util.assert(not @__isRendered, "#{@__cls}.render", "Cannot be called when already rendered.", opts: @opts, dataField: @)
# for p of @__tmpl.map
# content = @["__#{p}"]
Expand All @@ -347,7 +347,8 @@ class CUI.DataField extends CUI.DOMElement
@disable()
if @isHidden()
@hide(true)
@_onRender?(@)
if callOnRender
@_onRender?(@)
@

displayValue: ->
Expand Down Expand Up @@ -674,4 +675,4 @@ class CUI.DataField extends CUI.DOMElement

CUI.Events.registerEvent
type: "data-changed"
bubble: true
bubble: true
7 changes: 5 additions & 2 deletions src/elements/DataTable/DataTable.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ class CUI.DataTable extends CUI.DataFieldInput
return null

render: ->
super()
super(callOnRender: false)
cols = []
colClasses = []
maxis = []
Expand Down Expand Up @@ -342,6 +342,8 @@ class CUI.DataTable extends CUI.DataFieldInput

@replace(@listView.render())

@_onRender?(@)

CUI.Events.listen
type: "data-changed"
node: @listView
Expand All @@ -354,7 +356,8 @@ class CUI.DataTable extends CUI.DataFieldInput

@storeValue(CUI.util.copyObject(@rows, true))
return
@

return @

loadPage: (page) ->
maxPage = Math.floor(@rows?.length / @_chunk_size)
Expand Down