X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo%2FView.js;h=e6b134de4dd187ac558ee2257ab5e4d55fb7816d;hp=39785dc5c4cd368bd2283306186ef175531b38ff;hb=75cbc4ce04c9c01ac47671cb01320ce699128d00;hpb=ddae9d4b13a85898d241317d816d6cb3d735d232 diff --git a/Roo/View.js b/Roo/View.js index 39785dc5c4..e6b134de4d 100644 --- a/Roo/View.js +++ b/Roo/View.js @@ -49,6 +49,8 @@ */ Roo.View = function(config, depreciated_tpl, depreciated_config){ + this.parent = false; + if (typeof(depreciated_tpl) == 'undefined') { // new way.. - universal constructor. Roo.apply(this, config); @@ -73,9 +75,6 @@ Roo.View = function(config, depreciated_tpl, depreciated_config){ this.tpl.compile(); - this.tickItems = []; - - /** @private */ this.addEvents({ /** @@ -162,7 +161,7 @@ Roo.View = function(config, depreciated_tpl, depreciated_config){ var fctr = this.wrapEl.appendChild(document.createElement("div")); - this.footer.dataSource = this.store + this.footer.dataSource = this.store; this.footer.container = fctr; this.footer = Roo.factory(this.footer, Roo); fctr.insertFirst(this.el); @@ -245,7 +244,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { * Refreshes the view. - called by datachanged on the store. - do not call directly. */ refresh : function(){ - Roo.log('refresh'); + //Roo.log('refresh'); var t = this.tpl; // if we are using something like 'domtemplate', then @@ -284,12 +283,16 @@ Roo.extend(Roo.View, Roo.util.Observable, { if(this.tickable){ Roo.apply(d, {'roo-id' : Roo.id()}); - } - Roo.log(this.tickItems); - - Roo.log([data]); - Roo.log(this.tickItems.indexOf(data) * 1); + + var _this = this; + Roo.each(this.parent.item, function(item){ + if(item[_this.parent.valueField] != data[_this.parent.valueField]){ + return; + } + Roo.apply(d, {'roo-data-checked' : 'checked'}); + }); + } html[html.length] = Roo.util.Format.trim( this.dataName ? @@ -320,7 +323,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { }, onUpdate : function(ds, record){ - Roo.log('on update'); + // Roo.log('on update'); this.clearSelections(); var index = this.store.indexOf(record); var n = this.nodes[index]; @@ -334,7 +337,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { // --------- FIXME onAdd : function(ds, records, index) { - Roo.log(['on Add', ds, records, index] ); + //Roo.log(['on Add', ds, records, index] ); this.clearSelections(); if(this.nodes.length == 0){ this.refresh(); @@ -354,7 +357,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { }, onRemove : function(ds, record, index){ - Roo.log('onRemove'); + // Roo.log('onRemove'); this.clearSelections(); var el = this.dataName ? this.el.child('.roo-tpl-' + this.dataName) : @@ -418,7 +421,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { */ onBeforeLoad : function(store,opts) { - Roo.log('onBeforeLoad'); + //Roo.log('onBeforeLoad'); if (!opts.add) { this.el.update(""); } @@ -489,7 +492,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { } if (this.toggleSelect) { var m = this.isSelected(item) ? 'unselect' : 'select'; - Roo.log(m); + //Roo.log(m); var _t = this; _t[m](item, true, false); return true; @@ -590,6 +593,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { if(!keepExisting){ this.clearSelections(true); } + if(this.fireEvent("beforeselect", this, node, this.selections) !== false){ Roo.fly(node).addClass(this.selectedClass); this.selections.push(node); @@ -616,7 +620,7 @@ Roo.extend(Roo.View, Roo.util.Observable, { } var node = this.getNode(nodeInfo); if(!node || !this.isSelected(node)){ - Roo.log("not selected"); + //Roo.log("not selected"); return; // not selected. } // fireevent???