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 mt...@apache.org on 2006/11/10 22:55:33 UTC

svn commit: r473561 - in /incubator/xap/trunk/src/xap: bridges/dojo/WindowBridge.js widgets/dojo/Window.js

Author: mturyn
Date: Fri Nov 10 14:55:33 2006
New Revision: 473561

URL: http://svn.apache.org/viewvc?view=rev&rev=473561
Log:
Altered to reference new <documentDataSource/>, <simpleDocumentDataSource/>.

Modified:
    incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js
    incubator/xap/trunk/src/xap/widgets/dojo/Window.js

Modified: incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js?view=diff&rev=473561&r1=473560&r2=473561
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js Fri Nov 10 14:55:33 2006
@@ -62,6 +62,9 @@
 	dojo.event.connectBefore(peer,"minimizeWindow",this,"onMinimizing");
 	dojo.event.connectBefore(peer,"closeWindow",this,"onClosing");
 	dojo.event.connectBefore(peer,"restoreWindow",this,"onRestoring");
+
+	dojo.event.connectBefore(peer.titleBar,"ondblclick",this,"toggleMaximized");
+
 	
 	// Set max xor min, if desired, as early as possible:
 	if( this.getElement().getAttribute(xap.xml.XmlTokens.MINIMIZED) == "true"){
@@ -219,6 +222,7 @@
 				!= xap.xml.XmlTokens.FALSE
 			){
 			this.getPeer().maximizeWindow({});
+			this.writeBackAttribute(xap.xml.XmlTokens.MAXIMIZED,xap.xml.XmlTokens.TRUE);			
 		}
 	} else {
 		this.getPeer().restoreWindow({}) ;
@@ -233,10 +237,21 @@
 			){
 			this.getPeer().minimizeWindow({});
 		}
+		this.writeBackAttribute(xap.xml.XmlTokens.MINIMIZED,xap.xml.XmlTokens.TRUE);
 	} else {
 		this.getPeer().restoreWindow({}) ;
 	}
 }
 
- 
+
+xap.bridges.dojo.WindowBridge.prototype.toggleMaximized = function(){
+
+if (this.getElement().getAttribute(xap.xml.XmlTokens.MAXIMIZED)
+						!= xap.xml.XmlTokens.TRUE
+	){
+		this.setMaximizedAttribute( xap.xml.XmlTokens.TRUE ) ;
+	} else {
+		this.getPeer().restoreWindow({}) ;
+	}
+}
  

Modified: incubator/xap/trunk/src/xap/widgets/dojo/Window.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/widgets/dojo/Window.js?view=diff&rev=473561&r1=473560&r2=473561
==============================================================================
--- incubator/xap/trunk/src/xap/widgets/dojo/Window.js (original)
+++ incubator/xap/trunk/src/xap/widgets/dojo/Window.js Fri Nov 10 14:55:33 2006
@@ -42,10 +42,10 @@
 
 dojo.lang.extend(xap.widgets.dojo.Window, {
 	widgetType: "Window",
-	
+	previous:{},
 	minimizeWindow:function(evt) {
 		
-		if (xap.util.Event.getPreventDefault(evt)){
+		if (evt && xap.util.Event.getPreventDefault(evt)){
 			return;
 		}
 		
@@ -67,10 +67,15 @@
 	},
 	
 	restoreWindow:function(evt){
-		if (xap.util.Event.getPreventDefault(evt)){
+		if (evt && xap.util.Event.getPreventDefault(evt)){
 			return;
 		}
 
+		if(!evt){
+			evt = {} ;
+		}	
+	
+
 		this.resizeBar.style.visibility="visible" ;
 		
 		xap.widgets.dojo.Window.superclass.restoreWindow.call(this,evt);
@@ -78,9 +83,14 @@
 	},
 	
 	maximizeWindow:function(evt){
-		if (xap.util.Event.getPreventDefault(evt)){
+		if (evt && xap.util.Event.getPreventDefault(evt)){
 			return;
 		}
+		
+		if(!evt){
+			evt = {} ;
+		}	
+			
 		
 		this.resizeBar.style.visibility="visible" ;