git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.3.1 - Released 11/30/2010
[extjs.git]
/
src
/
widgets
/
DataView.js
diff --git
a/src/widgets/DataView.js
b/src/widgets/DataView.js
index
58c72a3
..
45d3731
100644
(file)
--- a/
src/widgets/DataView.js
+++ b/
src/widgets/DataView.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
2.0
- * Copyright(c) 2006-2010
Ext JS,
Inc.
- * licensing@
extjs
.com
- * http://www.
extjs
.com/license
+ * Ext JS Library 3.
3.1
+ * Copyright(c) 2006-2010
Sencha
Inc.
+ * licensing@
sencha
.com
+ * http://www.
sencha
.com/license
*/
/**
* @class Ext.DataView
*/
/**
* @class Ext.DataView
@@
-260,9
+260,10
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
*/
refresh : function() {
this.clearSelections(false, true);
*/
refresh : function() {
this.clearSelections(false, true);
- var el = this.getTemplateTarget();
- el.update("");
- var records = this.store.getRange();
+ var el = this.getTemplateTarget(),
+ records = this.store.getRange();
+
+ el.update('');
if(records.length < 1){
if(!this.deferEmptyText || this.hasSkippedEmptyText){
el.update(this.emptyText);
if(records.length < 1){
if(!this.deferEmptyText || this.hasSkippedEmptyText){
el.update(this.emptyText);
@@
-306,17
+307,19
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
* contain <i>named</i> properties.
*/
collectData : function(records, startIndex){
* contain <i>named</i> properties.
*/
collectData : function(records, startIndex){
- var r = [];
- for(var i = 0, len = records.length; i < len; i++){
- r[r.length] = this.prepareData(records[i].data, startIndex+i, records[i]);
+ var r = [],
+ i = 0,
+ len = records.length;
+ for(; i < len; i++){
+ r[r.length] = this.prepareData(records[i].data, startIndex + i, records[i]);
}
return r;
},
// private
}
return r;
},
// private
- bufferRender : function(records){
+ bufferRender : function(records
, index
){
var div = document.createElement('div');
var div = document.createElement('div');
- this.tpl.overwrite(div, this.collectData(records));
+ this.tpl.overwrite(div, this.collectData(records
, index
));
return Ext.query(this.itemSelector, div);
},
return Ext.query(this.itemSelector, div);
},
@@
-324,9
+327,9
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
onUpdate : function(ds, record){
var index = this.store.indexOf(record);
if(index > -1){
onUpdate : function(ds, record){
var index = this.store.indexOf(record);
if(index > -1){
- var sel = this.isSelected(index)
;
- var original = this.all.elements[index];
-
var
node = this.bufferRender([record], index)[0];
+ var sel = this.isSelected(index)
,
+ original = this.all.elements[index],
+
node = this.bufferRender([record], index)[0];
this.all.replaceElement(index, node, true);
if(sel){
this.all.replaceElement(index, node, true);
if(sel){
@@
-449,9
+452,10
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
// private
onClick : function(e){
// private
onClick : function(e){
- var item = e.getTarget(this.itemSelector, this.getTemplateTarget());
+ var item = e.getTarget(this.itemSelector, this.getTemplateTarget()),
+ index;
if(item){
if(item){
-
var
index = this.indexOf(item);
+ index = this.indexOf(item);
if(this.onItemClick(item, index, e) !== false){
this.fireEvent("click", this, index, item, e);
}
if(this.onItemClick(item, index, e) !== false){
this.fireEvent("click", this, index, item, e);
}
@@
-565,9
+569,13
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
* @return {Array} An array of numeric indexes
*/
getSelectedIndexes : function(){
* @return {Array} An array of numeric indexes
*/
getSelectedIndexes : function(){
- var indexes = [], s = this.selected.elements;
- for(var i = 0, len = s.length; i < len; i++){
- indexes.push(s[i].viewIndex);
+ var indexes = [],
+ selected = this.selected.elements,
+ i = 0,
+ len = selected.length;
+
+ for(; i < len; i++){
+ indexes.push(selected[i].viewIndex);
}
return indexes;
},
}
return indexes;
},
@@
-577,11
+585,7
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
* @return {Array} An array of {@link Ext.data.Record} objects
*/
getSelectedRecords : function(){
* @return {Array} An array of {@link Ext.data.Record} objects
*/
getSelectedRecords : function(){
- var r = [], s = this.selected.elements;
- for(var i = 0, len = s.length; i < len; i++){
- r[r.length] = this.store.getAt(s[i].viewIndex);
- }
- return r;
+ return this.getRecords(this.selected.elements);
},
/**
},
/**
@@
-590,11
+594,14
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
* @return {Array} records The {@link Ext.data.Record} objects
*/
getRecords : function(nodes){
* @return {Array} records The {@link Ext.data.Record} objects
*/
getRecords : function(nodes){
- var r = [], s = nodes;
- for(var i = 0, len = s.length; i < len; i++){
- r[r.length] = this.store.getAt(s[i].viewIndex);
+ var records = [],
+ i = 0,
+ len = nodes.length;
+
+ for(; i < len; i++){
+ records[records.length] = this.store.getAt(nodes[i].viewIndex);
}
}
- return r;
+ return r
ecords
;
},
/**
},
/**
@@
-722,10
+729,12
@@
Ext.DataView = Ext.extend(Ext.BoxComponent, {
* @return {Array} An array of nodes
*/
getNodes : function(start, end){
* @return {Array} An array of nodes
*/
getNodes : function(start, end){
- var ns = this.all.elements;
+ var ns = this.all.elements,
+ nodes = [],
+ i;
+
start = start || 0;
end = !Ext.isDefined(end) ? Math.max(ns.length - 1, 0) : end;
start = start || 0;
end = !Ext.isDefined(end) ? Math.max(ns.length - 1, 0) : end;
- var nodes = [], i;
if(start <= end){
for(i = start; i <= end && ns[i]; i++){
nodes.push(ns[i]);
if(start <= end){
for(i = start; i <= end && ns[i]; i++){
nodes.push(ns[i]);