You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2007/07/12 01:21:47 UTC
svn commit: r555453 - in /incubator/xap/trunk/codebase/src/xap:
bridges/dojo/ widgets/ widgets/dojo/
Author: jmargaris
Date: Wed Jul 11 18:21:45 2007
New Revision: 555453
URL: http://svn.apache.org/viewvc?view=rev&rev=555453
Log:
added border-style solid or else IE gets confused
for margin-box operations, thinks there is no border width
Modified:
incubator/xap/trunk/codebase/src/xap/bridges/dojo/TableBridge.js
incubator/xap/trunk/codebase/src/xap/widgets/Label.js
incubator/xap/trunk/codebase/src/xap/widgets/XapComboBox.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/FreePanel.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/GridPanel.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalFlowPane.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalPanel.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/PasswordField.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/ScrollPane.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextArea.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextField.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/TreeTable.js
incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js
Modified: incubator/xap/trunk/codebase/src/xap/bridges/dojo/TableBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/bridges/dojo/TableBridge.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/bridges/dojo/TableBridge.js (original)
+++ incubator/xap/trunk/codebase/src/xap/bridges/dojo/TableBridge.js Wed Jul 11 18:21:45 2007
@@ -130,10 +130,6 @@
"expandedImage"];
};
-xap.bridges.dojo.TableBridge.prototype.setHeightAttribute = function(value){
- this.getPeer().setHeight(value);
-};
-
xap.bridges.dojo.TableBridge.prototype.addChild = function(childHandler, index){
var childPeer = childHandler.getPeer();
Modified: incubator/xap/trunk/codebase/src/xap/widgets/Label.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/Label.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/Label.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/Label.js Wed Jul 11 18:21:45 2007
@@ -64,7 +64,8 @@
xap.widgets.styleSet(this.td, {width:"100%", height: "100%"});
xap.widgets.styleSet(this._rootDomNode, {overflow:"hidden", position:"relative"});
-
+ this._rootDomNode.style.borderStyle = "solid";
+
this.enabled = true;
this.text = "";
this.imgURL = "";
Modified: incubator/xap/trunk/codebase/src/xap/widgets/XapComboBox.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/XapComboBox.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/XapComboBox.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/XapComboBox.js Wed Jul 11 18:21:45 2007
@@ -40,7 +40,7 @@
dojo.inherits(xap.widgets.XapComboBox, dojo.widget.HtmlWidget);
dojo.lang.extend(xap.widgets.XapComboBox, {
- templateString: '<div></div>',
+ templateString: '<div style="border-style:solid"></div>',
templateCssPath: null,
widgetType: 'XapComboBox',
isContainer: true,
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js Wed Jul 11 18:21:45 2007
@@ -40,7 +40,7 @@
dojo.inherits(xap.widgets.dojo.BorderPanel,dojo.widget.HtmlWidget);
dojo.lang.extend(xap.widgets.dojo.BorderPanel, {
- templateString: '<div></div>',
+ templateString: '<div style="border-style:solid"></div>',
templateCssPath: null ,
widgetType: "BorderPanel",
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/FreePanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/FreePanel.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/FreePanel.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/FreePanel.js Wed Jul 11 18:21:45 2007
@@ -46,7 +46,7 @@
//TODO using minWidth and minHeight for the sizes of the td and div would be a lot better
//as it is because the positioning is abolute and sizes are 100% the preferred size calculation
//doesn't really work at all.
- templateString: '<table cellPadding="0" cellSpacing="0" style="overflow:hidden"><tr><td style="width:100%; height:100%; overflow:hidden"><div dojoAttachPoint="containerNode" style="width: 100%; height: 100%; position:relative; overflow:hidden"></td></tr></table>',
+ templateString: '<table cellPadding="0" cellSpacing="0" style="overflow:hidden; border-style:solid"><tr><td style="width:100%; height:100%; overflow:hidden"><div dojoAttachPoint="containerNode" style="width: 100%; height: 100%; position:relative; overflow:hidden"></td></tr></table>',
templateCssPath: null ,
widgetType: "FreePanel",
isContainer: true,
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/GridPanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/GridPanel.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/GridPanel.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/GridPanel.js Wed Jul 11 18:21:45 2007
@@ -45,7 +45,7 @@
dojo.inherits(xap.widgets.dojo.GridPanel, dojo.widget.HtmlWidget);
dojo.lang.extend(xap.widgets.dojo.GridPanel, {
- templateString: '<table cellPadding="0" cellSpacing="0"><tbody dojoAttachPoint="tbody">' +
+ templateString: '<table cellPadding="0" cellSpacing="0" style="border-style:solid"><tbody dojoAttachPoint="tbody">' +
'</tbody></table>',
templateCssPath: null ,
widgetType: "GridPanel",
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalFlowPane.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalFlowPane.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalFlowPane.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalFlowPane.js Wed Jul 11 18:21:45 2007
@@ -46,7 +46,7 @@
//TODO revisit this and see if it is really a problem,
//in theiry display:block should create a block that absolute children
//are relative to.
- templateString: '<table cellPadding="0" cellSpacing="0" style="overflow:hidden"><tbody>'
+ templateString: '<table cellPadding="0" cellSpacing="0" style="overflow:hidden; border-style:solid"><tbody>'
+ '<tr><td style="width:100%;height:100%">'
+ '<div dojoAttachPoint="containerNode" style="width: 100%; height: 100%; position:relative;"></div>'
+ '</td></tr>'
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalPanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalPanel.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalPanel.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/HorizontalPanel.js Wed Jul 11 18:21:45 2007
@@ -40,7 +40,7 @@
dojo.inherits(xap.widgets.dojo.HorizontalPanel, dojo.widget.HtmlWidget);
dojo.lang.extend(xap.widgets.dojo.HorizontalPanel, {
- templateString: '<table cellPadding="0" cellSpacing="0" dojoAttachPoint="table"><tbody dojoAttachPoint="tbody">'
+ templateString: '<table cellPadding="0" cellSpacing="0" dojoAttachPoint="table" style="border-style:solid"><tbody dojoAttachPoint="tbody">'
+ '<tr dojoAttachPoint="centerRow" style="height:100%; width:100%">'
+ '<td dojoAttachPoint="centerTd" valign="top" align="left" style="width:100%;height:100%">'
+ '<table dojoAttachPoint="centerTable" border="0" cellspacing="0" cellpadding="0" style="height:100%">'
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/PasswordField.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/PasswordField.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/PasswordField.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/PasswordField.js Wed Jul 11 18:21:45 2007
@@ -36,7 +36,7 @@
xap.widgets.dojo.TextField.call(this);
// These will override the equivalent fields
// that would otherwise be picked up in extend:
- this.templateString ="<input type=\"password\" dojoAttachEvent=\"onkeyup;onchange;onmouseup;\"></input>" ;
+ this.templateString ="<input style='border-style:solid' type='password' dojoAttachEvent='onkeyup;onchange;onmouseup;'></input>" ;
this.widgetType = "PasswordField" ;
}
dojo.inherits(xap.widgets.dojo.PasswordField, xap.widgets.dojo.TextField);
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/ScrollPane.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/ScrollPane.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/ScrollPane.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/ScrollPane.js Wed Jul 11 18:21:45 2007
@@ -42,7 +42,7 @@
//If you set absolute position on a div then it creates a block in the box
//model but then the div is absolute which we don't want.
//so we put stuff in a table which DOES define a block in the box model
- templateString: '<table cellPadding="0" cellSpacing="0" style="overflow:hidden"><tr><td style="width:100%; height:100%; overflow:hidden"><div dojoAttachPoint="containerNode" style="width: 100%; height: 100%; position:relative; overflow:auto"></td></tr></table>',
+ templateString: '<table cellPadding="0" cellSpacing="0" style="overflow:hidden; border-style:solid"><tr><td style="width:100%; height:100%; overflow:hidden"><div dojoAttachPoint="containerNode" style="width: 100%; height: 100%; position:relative; overflow:auto"></td></tr></table>',
templateCssPath: null ,
widgetType: "ScrollPane",
isContainer: true,
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextArea.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextArea.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextArea.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextArea.js Wed Jul 11 18:21:45 2007
@@ -37,7 +37,7 @@
xap.widgets.dojo.TextField.call(this);
// These will override the equivalent fields
// that would otherwise be picked up in extend:
- this.templateString ="<textarea wrap=\"hard\" dojoAttachEvent=\"onselect;onkeyup;onchange;onmousedown;\"></textarea>" ;
+ this.templateString ="<textarea style='border-style:solid' wrap='hard' dojoAttachEvent='onselect;onkeyup;onchange;onmousedown;'></textarea>" ;
this.widgetType = "TextArea" ;
}
dojo.inherits(xap.widgets.dojo.TextArea, xap.widgets.dojo.TextField );
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextField.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextField.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextField.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/TextField.js Wed Jul 11 18:21:45 2007
@@ -42,7 +42,7 @@
var toMixIn =
{
- templateString: '<input type="text" dojoAttachEvent="onkeyup;onchange;onmouseout"></input>',
+ templateString: '<input style="border-style:solid; margin:0px; padding:0px; border-width:1px" type="text" dojoAttachEvent="onkeyup;onchange;onmouseout"></input>',
templateCssPath: null ,
widgetType: "TextField",
isContainer: false,
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/TreeTable.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/TreeTable.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/TreeTable.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/TreeTable.js Wed Jul 11 18:21:45 2007
@@ -64,7 +64,7 @@
//TODO calc padding after laying out headers?
//this is a bad strategy in general, the problem is we want the inner table
//to be sized at 100%
- templateString: '<div style="padding:0px 0px 0px 0px; overflow:hidden;position:relative;text-align:left">' +
+ templateString: '<div style="border-style:solid; padding:0px 0px 0px 0px; overflow:hidden;position:relative;text-align:left">' +
'<div dojoAttachPoint="headerDiv"><table dojoAttachPoint="headerTable" style="position:relative;width:100%;table-layout:fixed;">' +
'<tbody dojoAttachPoint="headerTbody"><tr dojoAttachPoint="headerRow"></tr></tbody></table></div>'+
'<div dojoAttachPoint="scrollDiv" style="overflow:auto;width:100%;height:100%;">' +
@@ -416,14 +416,6 @@
isAlternateRow = this._recolorRow(row._rows[i], isAlternateRow);
}
return isAlternateRow;
- },
-
- /*
- * Support for dynamic sizing
- */
- setHeight:function(value){
- if (this.domNode) this.domNode.style.height = value;
- this.onResized();
},
Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js?view=diff&rev=555453&r1=555452&r2=555453
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js Wed Jul 11 18:21:45 2007
@@ -41,7 +41,7 @@
dojo.inherits(xap.widgets.dojo.VerticalPanel, dojo.widget.HtmlWidget);
dojo.lang.extend(xap.widgets.dojo.VerticalPanel, {
- templateString: '<table cellPadding="0" cellSpacing="0"><tr><td dojoAttachPoint="containerNode"></td></tr></table>',
+ templateString: '<table style="border-style:solid" cellPadding="0" cellSpacing="0"><tr><td dojoAttachPoint="containerNode"></td></tr></table>',
templateCssPath: null ,
widgetType: "VerticalPanel",
isContainer: true,