incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtu...@apache.org
Subject svn commit: r518361 - in /incubator/xap/trunk/codebase/src/xap: bridges/basic/ bridges/dojo/ widgets/dojo/
Date Wed, 14 Mar 2007 22:28:39 GMT
Author: mturyn
Date: Wed Mar 14 15:28:27 2007
New Revision: 518361

URL: http://svn.apache.org/viewvc?view=rev&rev=518361
Log:
Files altered to comport with Dojo 0.4, post its replacing 0.3.  All widget test pages except
editableComboBox load.
Known bugs list will follow the list of general changes (things done more than one place):
General changes limited to:

-dojo.widget.html.FloatingPane
+dojo.widget.FloatingPane

-dojo.html.layout
+dojo.widget.html.layout

-dojo.html.shadow
+dojo.lfx.shadow

-dojo.widget.html.Tooltip
+dojo.widget.Tooltip

-dojo_ie_clobber
+dojo._ie_clobber

Known bugs:

borderpane remove/add

tooltip broken

editable combo box broken

combobox insert item between not working properly, appends at end








Modified:
    incubator/xap/trunk/codebase/src/xap/bridges/basic/AbstractWidgetBridge.js
    incubator/xap/trunk/codebase/src/xap/bridges/dojo/DesktopPaneBridge.js
    incubator/xap/trunk/codebase/src/xap/bridges/dojo/DojoLayoutContainerBridge.js
    incubator/xap/trunk/codebase/src/xap/bridges/dojo/HorizontalSeparatorBridge.js
    incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js
    incubator/xap/trunk/codebase/src/xap/widgets/dojo/RichtextTooltip.js
    incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js
    incubator/xap/trunk/codebase/src/xap/widgets/dojo/Window.js

Modified: incubator/xap/trunk/codebase/src/xap/bridges/basic/AbstractWidgetBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/bridges/basic/AbstractWidgetBridge.js?view=diff&rev=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/bridges/basic/AbstractWidgetBridge.js (original)
+++ incubator/xap/trunk/codebase/src/xap/bridges/basic/AbstractWidgetBridge.js Wed Mar 14
15:28:27 2007
@@ -85,10 +85,10 @@
  */
 xap.bridges.basic.AbstractWidgetBridge.cleanNode = function(node){
 	var tna = node.all || node.getElementsByTagName("*");
-	dojo_ie_clobber.clobber(node);
-	xap.util.ArrayHelper.removeElement(dojo_ie_clobber.clobberNodes,node);
+	dojo._ie_clobber.clobber(node);
+	xap.util.ArrayHelper.removeElement(dojo._ie_clobber.clobberNodes,node);
 	for (var i = 0; i<tna.length;i++){
-		xap.util.ArrayHelper.removeElement(dojo_ie_clobber.clobberNodes,tna[i]);
+		xap.util.ArrayHelper.removeElement(dojo._ie_clobber.clobberNodes,tna[i]);
 	}
 }
 

Modified: incubator/xap/trunk/codebase/src/xap/bridges/dojo/DesktopPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/bridges/dojo/DesktopPaneBridge.js?view=diff&rev=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/bridges/dojo/DesktopPaneBridge.js (original)
+++ incubator/xap/trunk/codebase/src/xap/bridges/dojo/DesktopPaneBridge.js Wed Mar 14 15:28:27
2007
@@ -80,7 +80,7 @@
 
 xap.bridges.dojo.DesktopPaneBridge.prototype.addChild = function(childHandler, index){
 	var childPeer = childHandler.getPeer();
-	if (childPeer instanceof dojo.widget.html.FloatingPane){
+	if (childPeer instanceof dojo.widget.FloatingPane){
 		childPeer._isWindow = true;
 	}
 	xap.bridges.dojo.DesktopPaneBridge.superclass.addChild.call(this,childHandler,index);

Modified: incubator/xap/trunk/codebase/src/xap/bridges/dojo/DojoLayoutContainerBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/bridges/dojo/DojoLayoutContainerBridge.js?view=diff&rev=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/bridges/dojo/DojoLayoutContainerBridge.js (original)
+++ incubator/xap/trunk/codebase/src/xap/bridges/dojo/DojoLayoutContainerBridge.js Wed Mar
14 15:28:27 2007
@@ -74,7 +74,7 @@
 			) {                        
   
 
-        var peer = new dojo.html.layout(parentPeer, [], "none" ) ;
+        var peer = new dojo.widget.html.layout(parentPeer, [], "none" ) ;
    
 		this.setPeer( peer );
 		//peer.addSelectionListener(new AjxListener(this, this._onSelectEvent));

Modified: incubator/xap/trunk/codebase/src/xap/bridges/dojo/HorizontalSeparatorBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/bridges/dojo/HorizontalSeparatorBridge.js?view=diff&rev=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/bridges/dojo/HorizontalSeparatorBridge.js (original)
+++ incubator/xap/trunk/codebase/src/xap/bridges/dojo/HorizontalSeparatorBridge.js Wed Mar
14 15:28:27 2007
@@ -49,22 +49,15 @@
 
 xap.bridges.dojo.HorizontalSeparatorBridge.prototype.init = function() {
 	xap.bridges.dojo.HorizontalSeparatorBridge.superclass.init.call(this);
-	this.getPeer().layoutItem();
+	// TODO: See if something like this method, not available in Dojo 0.4
+	// is really needed:
+	//this.getPeer().layoutItem();
 }
 
 xap.bridges.dojo.HorizontalSeparatorBridge.prototype.getPeerString = function(){
     return "MenuSeparator2" ;
 }
 
-dojo.widget.MenuSeparator2.prototype.postCreate = function(){
-	
-	//the dojo version of this calls layoutItem inline, which
-	//gives us an error because we don't have a parent yet
-	//and that code relies on it. SO we move the layoutItem()
-	//call to the init(). TODO is that going to work if tail recursion
-	//is off? Do we care?
-	dojo.html.disableSelection(this.domNode);
-};
 
  
 /**

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=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/BorderPanel.js Wed Mar 14 15:28:27 2007
@@ -27,7 +27,7 @@
 dojo.require("dojo.html");
 dojo.require("dojo.style");
 dojo.require("dojo.event");
-dojo.require("dojo.html.layout");
+dojo.require("dojo.widget.html.layout");
 
  //IMPORTNT move this to some shared area
 dojo.widget.manager.registerWidgetPackage("xap.widgets.dojo");
@@ -103,7 +103,7 @@
 		if (this.center){
 			children.push({domNode: this.center.domNode, layoutAlign: "client"});
 		}
-		dojo.html.layout(this.domNode,children);
+		dojo.widget.html.layout(this.domNode,children);
 	}
 }
 );

Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/RichtextTooltip.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/RichtextTooltip.js?view=diff&rev=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/RichtextTooltip.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/RichtextTooltip.js Wed Mar 14 15:28:27
2007
@@ -21,7 +21,7 @@
 
 Xap.provide("xap.widgets.dojo.RichtextTooltip");
 
-dojo.require("dojo.widget.html.Tooltip") ;
+dojo.require("dojo.widget.Tooltip") ;
 dojo.require("dojo.widget.*");
 dojo.require("dojo.dom");
 dojo.require("dojo.html");
@@ -33,7 +33,7 @@
 dojo.widget.tags.addParseTreeHandler("dojo:RichtextTooltip");
 
 xap.widgets.dojo.RichtextTooltip = function(){
-	dojo.widget.html.Tooltip.call(this);
+	dojo.widget.Tooltip.call(this);
 	// These will override the equivalent fields 
 	// that would otherwise be picked up in extend() 
 	// below:
@@ -50,15 +50,15 @@
 		this.connectNode = dojo.byId(this.connectId);
 		// This is intentional---we _don't_ want Tooltip's
 		// fillInTemplate() called:		
-		dojo.widget.html.Tooltip.superclass.fillInTemplate.call(this, args, frag);
+		dojo.widget.Tooltip.superclass.fillInTemplate.call(this, args, frag);
 	}	
 	
 }
-dojo.inherits(xap.widgets.dojo.RichtextTooltip, dojo.widget.html.Tooltip);
+dojo.inherits(xap.widgets.dojo.RichtextTooltip, dojo.widget.Tooltip);
 
 // As noted above, the fillInTemplate() and widgetType have
 // already been set for this constructor, so they won't
 // be reset by the ones for Tooltip when we mix it in:				
 dojo.lang.extend(xap.widgets.dojo.RichtextTooltip, 
-					new dojo.widget.html.Tooltip()
+					new dojo.widget.Tooltip()
 				) ;

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=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/VerticalPanel.js Wed Mar 14 15:28:27
2007
@@ -27,7 +27,7 @@
 dojo.require("dojo.html");
 dojo.require("dojo.style");
 dojo.require("dojo.event");
-dojo.require("dojo.html.layout");
+dojo.require("dojo.widget.html.layout");
 
 //IMPORTANT move this to some shared area
 dojo.widget.manager.registerWidgetPackage("xap.widgets.dojo");

Modified: incubator/xap/trunk/codebase/src/xap/widgets/dojo/Window.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/widgets/dojo/Window.js?view=diff&rev=518361&r1=518360&r2=518361
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/widgets/dojo/Window.js (original)
+++ incubator/xap/trunk/codebase/src/xap/widgets/dojo/Window.js Wed Mar 14 15:28:27 2007
@@ -37,10 +37,10 @@
  * including differnet minimize behavior and more events.
  */
 xap.widgets.dojo.Window = function(){
-	dojo.widget.html.FloatingPane.call(this);
+	dojo.widget.FloatingPane.call(this);
 }
 
-dojo.inherits(xap.widgets.dojo.Window,dojo.widget.html.FloatingPane);
+dojo.inherits(xap.widgets.dojo.Window,dojo.widget.FloatingPane);
 
 dojo.lang.extend(xap.widgets.dojo.Window, {
 	widgetType: "Window",
@@ -273,7 +273,7 @@
 	resizeWindow: function(){
 		// logic copied from floating pane
 		// called from setWidth and setHeight
-		dojo.html.layout(this.domNode,
+		dojo.widget.html.layout(this.domNode,
 				[
 				  {domNode: this.titleBar, layoutAlign: "top"},
 				  {domNode: this.resizeBar, layoutAlign: "bottom"},
@@ -482,12 +482,12 @@
 
 
 
-dojo.require("dojo.html.shadow");
+dojo.require("dojo.lfx.shadow");
 dojo.require("dojo.lang");
 dojo.require("dojo.uri");
 
 //IMPORTANT dojo workaround for dropshadow drawing on 3 sides of object
-dojo.html.shadow.prototype.init = function(node){
+dojo.lfx.shadow.prototype.init = function(node){
 	this.node=node;
 
 	// make all the pieces of the shadow, and position/size them as much
@@ -503,7 +503,7 @@
 }
 
 
-dojo.html.shadow.prototype.size = function(width, height){
+dojo.lfx.shadow.prototype.size = function(width, height){
 	var sideHeight = height - (this.shadowOffset+this.shadowThickness+1);
 	with(this.pieces){
 		r.style.height = sideHeight+"px";
@@ -517,30 +517,3 @@
 }
 
 
-/**
- *  Patch for Dojo 0.3 bug:  objects within
- *  divs other than the body are offset from the
- *  cursor by their immediate parent's top corner
- *  vector from body.topLeft. It looks like this 
- *  parentPosition offset has been in and out of 
- *  the code repeatedly.
-**/
-dojo.dnd.HtmlDragObject.prototype.onDragMove = function(e){
-	this.updateDragOffset();
-	var x = this.dragOffset.x + e.pageX;
-	var y = this.dragOffset.y + e.pageY;
-//********* Begin change from Dojo 0.3 original. ******************
-	x -= this.parentPosition.x ;
-	y -= this.parentPosition.y ;
-//*********** End change from Dojo 0.3 original. ******************
-
-	if (this.constrainToContainer) {
-		if (x < this.constraints.minX) { x = this.constraints.minX; }
-		if (y < this.constraints.minY) { y = this.constraints.minY; }
-		if (x > this.constraints.maxX) { x = this.constraints.maxX; }
-		if (y > this.constraints.maxY) { y = this.constraints.maxY; }
-	}
-
-	if(!this.disableY) { this.dragClone.style.top = y + "px"; }
-	if(!this.disableX) { this.dragClone.style.left = x + "px"; }
-}



Mime
View raw message