incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtu...@apache.org
Subject svn commit: r430466 - in /incubator/xap/trunk/src/xap/bridges/dojo: DojoButtonBridge.js DojoContentPaneBridge.js DojoFloatingPaneBridge.js DojoGenericWidgetBridge.js DojoLayoutContainerBridge.js DojoLayoutPaneBridge.js DojoSplitPaneBridge.js
Date Thu, 10 Aug 2006 18:05:36 GMT
Author: mturyn
Date: Thu Aug 10 11:05:36 2006
New Revision: 430466

URL: http://svn.apache.org/viewvc?rev=430466&view=rev
Log:
All bridges now have "require()" statements for their widget---e.g. DojoFloatingPaneBridge
explicitly calls for dojo.widget.FloatingPane.

Modified:
    incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/DojoContentPaneBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/DojoFloatingPaneBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/DojoGenericWidgetBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutContainerBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutPaneBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/DojoSplitPaneBridge.js

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js?rev=430466&r1=430465&r2=430466&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js Thu Aug 10 11:05:36 2006
@@ -39,6 +39,8 @@
  
 Xap.provide("xap.bridges.dojo.DojoButtonBridge"); 
 Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
+
+Xap.require("dojo.widget.Button"); 
  
  /**
  * @fileoverview
@@ -57,6 +59,7 @@
 );
 
 /*
+     ==
 
 xap.bridges.dojo.DojoButtonBridge.prototype = new xap.bridges.dojo.DojoWidgetBridge;
 
@@ -168,7 +171,7 @@
  */
  xap.bridges.dojo.DojoButtonBridge.prototype.getAllowedInitialProperties = function(){
  	// Cache this?
- 	var arra  = xap.bridges.dojo.DojoWidgetBridge.prototype.getAllowedInitialProperties.call(this)
;
+ 	var arra  = this.superclass.getAllowedInitialProperties() ;
  	arra.push("text") ;
  	
  	return arra ;
@@ -179,7 +182,7 @@
  * @return an object mapping allowed XAL properties to their Dojo equivalents
  */
  xap.bridges.dojo.DojoButtonBridge.prototype.getXalToToolkitMapper = function(){
- 	var map  = this.superclass.getXalToToolkitMapper.call(this) ; 
+ 	var map  = this.superclass.getXalToToolkitMapper() ; 
  	map.text = "caption" ;
  	return map ;
  }

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoContentPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoContentPaneBridge.js?rev=430466&r1=430465&r2=430466&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoContentPaneBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoContentPaneBridge.js Thu Aug 10 11:05:36
2006
@@ -23,6 +23,13 @@
  * of setting permissions....
  */
 
+// This:
+Xap.provide("xap.bridges.dojo.DojoContentPaneBridge"); 
+// Superclass:
+Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
+// Peer:
+Xap.require("dojo.widget.ContentPane") ;
+
 /**
  * Creates a xap.bridges.dojo.DojoContentPaneBridge.
  * 
@@ -34,29 +41,12 @@
  * @author mturyn
  */
  
-Xap.provide("xap.bridges.dojo.DojoContentPaneBridge"); 
-Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
- 
-  /**
- * @fileoverview
- * 
- * A bridge class with dojo contentPane peer.
- */
- 
+
 xap.bridges.dojo.DojoContentPaneBridge = function() {
 	xap.bridges.dojo.DojoWidgetBridge.call(this);
 }
 
-xap.bridges.dojo.DojoContentPaneBridge.prototype = new xap.bridges.dojo.DojoWidgetBridge;
-
-
-xap.bridges.dojo.DojoContentPaneBridge.prototype.constructor=xap.bridges.dojo.DojoContentPaneBridge
;
-
-xap.bridges.dojo.DojoContentPaneBridge.s_log = xap.util.LogFactory.getLog( "xap.bridges.dojo.DojoContentPaneBridge"
);
-
-xap.bridges.dojo.DojoContentPaneBridge.prototype.toString = function() {
-	return "xap.bridges.dojo.DojoContentPaneBridge";
-}
+Xap.setupClassAsSubclassOf( "xap.bridges.dojo.DojoContentPaneBridge", "xap.bridges.dojo.DojoWidgetBridge")
;
 
 /**
  * Provides the name used to create the peer component

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoFloatingPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoFloatingPaneBridge.js?rev=430466&r1=430465&r2=430466&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoFloatingPaneBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoFloatingPaneBridge.js Thu Aug 10 11:05:36
2006
@@ -21,6 +21,15 @@
  * A bridge class that controls a dojo FloatingPane peer.
  */
 
+// This:
+Xap.provide("xap.bridges.dojo.DojoFloatingPaneBridge"); 
+// Superclass:
+Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
+// Peer:
+Xap.provide("dojo.widget.FloatingPane"); 
+
+
+
 // Auto-added---o.k.?
 Xap.require("xap.util.LogFactory");
 
@@ -35,32 +44,15 @@
  * @author jmargarisz
  * @author mturyn
  */
- 
-Xap.provide("xap.bridges.dojo.DojoFloatingPaneBridge"); 
-Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
- 
- /**
- * @fileoverview
- * 
- * A bridge class with dojo toolkit button peer.
- */
+
  
 xap.bridges.dojo.DojoFloatingPaneBridge= function() {
 	xap.bridges.dojo.DojoWidgetBridge.call(this);
 }
 
-xap.bridges.dojo.DojoFloatingPaneBridge.prototype = new xap.bridges.dojo.DojoWidgetBridge;
+Xap.setupClassAsSubclassOf( "xap.bridges.dojo.DojoFloatingPaneBridge", "xap.bridges.dojo.DojoWidgetBridge")
;
 
 
-xap.bridges.dojo.DojoFloatingPaneBridge.prototype.constructor=xap.bridges.dojo.DojoFloatingPaneBridge
;
-
-xap.bridges.dojo.DojoFloatingPaneBridge.prototype.superclass=xap.bridges.dojo.DojoWidgetBridge.prototype
;
-
-xap.bridges.dojo.DojoFloatingPaneBridge.s_log = xap.util.LogFactory.getLog( "DojoFloatingPaneBridge"
);
-
-xap.bridges.dojo.DojoFloatingPaneBridge.prototype.toString = function() {
-	return "xap.bridges.dojo.DojoFloatingPaneBridge";
-}
 
 
 
@@ -72,7 +64,7 @@
  * Is this allowed as an initial property?
 **/ 
 xap.bridges.dojo.DojoFloatingPaneBridge.prototype.getAllowedInitialProperties = function(){
-	var arry = this.superclass.getAllowedInitialProperties.call(this)
+	var arry = this.superclass.getAllowedInitialProperties(this) ;
  	arry.push("title");
  	arry.push("resizable");
  	arry.push("layoutAlign") ;
@@ -138,7 +130,10 @@
     peer.onResized() ;
 }
 
-
-
+xap.bridges.dojo.DojoFloatingPaneBridge.prototype.getRootDomNode = function(){
+// This seems to work better---using the .domNode member produces an
+// offset between the mouse point and the pane when dragging it:
+	return this._peer.containerNode;
+} 
 
 

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoGenericWidgetBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoGenericWidgetBridge.js?rev=430466&r1=430465&r2=430466&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoGenericWidgetBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoGenericWidgetBridge.js Thu Aug 10 11:05:36
2006
@@ -14,13 +14,18 @@
  *  limitations under the License.
  *
  */
- 
+
+// This: 
 Xap.provide("xap.bridges.dojo.DojoGenericWidgetBridge"); 
+// Superclass:
+Xap.require("xap.bridges.dojo.DojoWidgetBridge");
+// No way of knowing what the peer class will be; make that someone
+// else's responsibility---something for the html?
+
 // Auto-added---o.k.?
 Xap.require("xap.util.LogFactory");
 
-// Auto-added---o.k.?
-Xap.require("xap.bridges.dojo.DojoWidgetBridge");
+
 
 
  
@@ -47,11 +52,8 @@
 	xap.bridges.dojo.DojoWidgetBridge.call( this );
 }
 
-xap.bridges.dojo.DojoGenericWidgetBridge.prototype = new xap.bridges.dojo.DojoWidgetBridge
;
-
-xap.bridges.dojo.DojoGenericWidgetBridge.prototype.constructor = xap.bridges.dojo.DojoGenericWidgetBridge
;
+Xap.setupClassAsSubclassOf( "xap.bridges.dojo.DojoGenericWidgetBridge", "xap.bridges.dojo.DojoWidgetBridge")
;
 
-xap.bridges.dojo.DojoGenericWidgetBridge.s_log = xap.util.LogFactory.getLog( "DojoGenericWidgetBridge"
);
 
 
 /**

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutContainerBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutContainerBridge.js?rev=430466&r1=430465&r2=430466&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutContainerBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutContainerBridge.js Thu Aug 10 11:05:36
2006
@@ -21,6 +21,14 @@
  * A bridge class that controls a dojo LayoutContainer peer.
  */
 
+// This:
+Xap.provide("xap.bridges.dojo.DojoLayoutContainerBridge"); 
+// Superclass:
+Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
+// Peer:
+Xap.require("dojo.widget.LayoutContainer"); 
+
+
 /**
  * Creates a xap.bridges.dojo.DojoLayoutContainerBridge.
  * 
@@ -32,30 +40,13 @@
  * @author mturyn
  */
  
-Xap.provide("xap.bridges.dojo.DojoLayoutContainerBridge"); 
-// Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
-// Xap.provides("xap.bridges.dojo.DojoLayoutContainerBridge"); 
- 
- /**
- * @fileoverview
- * 
- * A bridge class with dojo toolkit button peer.
- */
+
  
 xap.bridges.dojo.DojoLayoutContainerBridge= function() {
 	xap.bridges.dojo.DojoWidgetBridge.call(this);
 }
 
-xap.bridges.dojo.DojoLayoutContainerBridge.prototype = new xap.bridges.dojo.DojoWidgetBridge;
-
-
-xap.bridges.dojo.DojoLayoutContainerBridge.prototype.constructor=xap.bridges.dojo.DojoLayoutContainerBridge
;
-
-xap.bridges.dojo.DojoLayoutContainerBridge.s_log = xap.util.LogFactory.getLog( "xap.bridges.dojo.DojoLayoutContainerBridge"
);
-
-xap.bridges.dojo.DojoLayoutContainerBridge.prototype.toString = function() {
-	return "xap.bridges.dojo.DojoLayoutContainerBridge";
-}
+Xap.setupClassAsSubclassOf( "xap.bridges.dojo.DojoLayoutContainerBridge", "xap.bridges.dojo.DojoWidgetBridge")
;
 
 
 

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutPaneBridge.js?rev=430466&r1=430465&r2=430466&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutPaneBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoLayoutPaneBridge.js Thu Aug 10 11:05:36 2006
@@ -32,9 +32,12 @@
  * @author mturyn
  */
  
+// This:
 Xap.provide("xap.bridges.dojo.DojoLayoutPaneBridge"); 
-// Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
-// Xap.provides("xap.bridges.dojo.DojoLayoutPaneBridge"); 
+// Superclass:
+Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
+// Peer:
+Xap.require("dojo.widget.LayoutContainer"); 
  
  /**
  * @fileoverview
@@ -46,21 +49,11 @@
 	xap.bridges.dojo.DojoWidgetBridge.call(this);
 }
 
-xap.bridges.dojo.DojoLayoutPaneBridge.prototype = new xap.bridges.dojo.DojoWidgetBridge;
-
-
-xap.bridges.dojo.DojoLayoutPaneBridge.prototype.constructor=xap.bridges.dojo.DojoLayoutPaneBridge
;
-
-xap.bridges.dojo.DojoLayoutPaneBridge.s_log = xap.util.LogFactory.getLog( "xap.bridges.dojo.DojoLayoutPaneBridge"
);
-
-xap.bridges.dojo.DojoLayoutPaneBridge.prototype.toString = function() {
-	return "xap.bridges.dojo.DojoLayoutPaneBridge";
-}
-
+Xap.setupClassAsSubclassOf( "xap.bridges.dojo.DojoLayoutPaneBridge", "xap.bridges.dojo.DojoWidgetBridge")
;
 
 
 xap.bridges.dojo.DojoLayoutPaneBridge.prototype.getPeerString = function(){
-    return "LayoutPane" ;
+    return "LayoutContainer" ;
 }
 
 

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoSplitPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoSplitPaneBridge.js?rev=430466&r1=430465&r2=430466&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoSplitPaneBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoSplitPaneBridge.js Thu Aug 10 11:05:36 2006
@@ -21,6 +21,14 @@
  * A bridge class that controls a dojo SplitPane peer.
  */
 
+// This:
+Xap.provide("xap.bridges.dojo.DojoSplitPaneBridge"); 
+// Superclass:
+Xap.require("xap.bridges.dojo.DojoWidgetBridge");
+// Peer:
+Xap.require("dojo.widget.SplitPane"); 
+
+
 /**
  * Creates a xap.bridges.dojo.DojoSplitPaneBridge.
  * 
@@ -31,10 +39,10 @@
  * @author jmargaris
  * @author mturyn
  */
- 
-Xap.provide("xap.bridges.dojo.DojoSplitPaneBridge"); 
- //Xap.require("xap.bridges.dojo.DojoPaneBridge");
-// Xap.require("dojo.widget.SplitPane"); 
+
+
+Xap.setupClassAsSubclassOf( "xap.bridges.dojo.DojoSplitPaneBridge", "xap.bridges.dojo.DojoWidgetBridge")
;
+
  
 /**
  * @private



Mime
View raw message