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]
/
examples
/
ux
/
RowEditor.js
diff --git
a/examples/ux/RowEditor.js
b/examples/ux/RowEditor.js
index
813a4db
..
a01a861
100644
(file)
--- a/
examples/ux/RowEditor.js
+++ b/
examples/ux/RowEditor.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
*/
Ext.ns('Ext.ux.grid');
*/
Ext.ns('Ext.ux.grid');
@@
-265,7
+265,12
@@
Ext.ux.grid.RowEditor = Ext.extend(Ext.Panel, {
} else if(i == len - 1){
ed.margins = pm('0 0 2 1');
} else{
} else if(i == len - 1){
ed.margins = pm('0 0 2 1');
} else{
- ed.margins = pm('0 1 2');
+ if (Ext.isIE) {
+ ed.margins = pm('0 0 2 0');
+ }
+ else {
+ ed.margins = pm('0 1 2 0');
+ }
}
ed.setWidth(cm.getColumnWidth(i));
ed.column = c;
}
ed.setWidth(cm.getColumnWidth(i));
ed.column = c;
@@
-468,6
+473,17
@@
Ext.ux.grid.RowEditor = Ext.extend(Ext.Panel, {
this.fireEvent('validation', this, valid);
},
this.fireEvent('validation', this, valid);
},
+ lastVisibleColumn : function() {
+ var i = this.items.getCount() - 1,
+ c;
+ for(; i >= 0; i--) {
+ c = this.items.items[i];
+ if (!c.hidden) {
+ return c;
+ }
+ }
+ },
+
showTooltip: function(msg){
var t = this.tooltip;
if(!t){
showTooltip: function(msg){
var t = this.tooltip;
if(!t){
@@
-488,7
+504,7
@@
Ext.ux.grid.RowEditor = Ext.extend(Ext.Panel, {
h = this.el.getHeight();
if(top + h >= scroll){
h = this.el.getHeight();
if(top + h >= scroll){
- t.initTarget(this.
items.last
().getEl());
+ t.initTarget(this.
lastVisibleColumn
().getEl());
if(!t.rendered){
t.show();
t.hide();
if(!t.rendered){
t.show();
t.hide();