svn commit: samba r9761 - in branches/SAMBA_4_0/swat: desktop scripting/client

[deryck at samba.org]

Author: deryck
Date: 2005-08-29 21:28:48 +0000 (Mon, 29 Aug 2005)
New Revision: 9761

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9761

Log:
Move initial widget setup to desktop library.  Now, just by including
desktop.js, you get the basic desktop layout.

deryck

Modified:
   branches/SAMBA_4_0/swat/desktop/index.esp
   branches/SAMBA_4_0/swat/scripting/client/desktop.js


Changeset:
Modified: branches/SAMBA_4_0/swat/desktop/index.esp
===================================================================
--- branches/SAMBA_4_0/swat/desktop/index.esp	2005-08-29 21:21:36 UTC (rev 9760)
+++ branches/SAMBA_4_0/swat/desktop/index.esp	2005-08-29 21:28:48 UTC (rev 9761)
@@ -7,6 +7,7 @@
 <script type="text/javascript" src="/scripting/client/call.js"></script>
 <script type="text/javascript" src="/scripting/client/js_scripts.js"></script>
 <script type="text/javascript" src="/scripting/client/desktop.js"></script>
+<script type="text/javascript" src="/scripting/client/status.js"></script>
 
 <script type="text/javascript">
 
@@ -73,46 +74,23 @@
 	cmenu.setVisible(true);
 }
 
-/*** init the page for qooxdoo ***/
+// Always open with stats
+var win = new QxWindow();
 document.js.add('/scripting/client/status.js');
-window.application.main = function()
+win._onclosebuttonclick = function(e)
 {
-	var doc = this.getClientWindow().getClientDocument();
-	// Don't declare local with var
-	w = new QxWidget();
-	with(w) {
-		setTop(0);
-		setLeft(0);
-		setWidth(docX());
-		setHeight(docY());
-	}
-	doc.addEventListener("contextmenu", showContextMenu);
-	doc.add(w);
-
-
-	// Always open with stats
-	var win = new QxWindow();
-	win._onclosebuttonclick = function(e)
-	{
-		this.close();
-		e.stopPropagation();
-		document.js.remove('/scripting/client/status.js');
-	};
-	with(win) {
-		setTop(50);
-		setRight(50);
-		setHeight(175);
-	}
-	w.add(win);
-	getServerStatus(win);
+	this.close();
+	e.stopPropagation();
+	document.js.remove('/scripting/client/status.js');
+};
+with(win) {
+	setTop(50);
+	setRight(50);
+	setHeight(175);
 }
+w.add(win);
+getServerStatus(win);
 
-window.onresize = function() 
-{
-	w.setWidth(docX());
-	w.setHeight(docY());
-}
-
 function showReg()
 {
 	document.js.add('/scripting/client/regedit.js');

Modified: branches/SAMBA_4_0/swat/scripting/client/desktop.js
===================================================================
--- branches/SAMBA_4_0/swat/scripting/client/desktop.js	2005-08-29 21:21:36 UTC (rev 9760)
+++ branches/SAMBA_4_0/swat/scripting/client/desktop.js	2005-08-29 21:28:48 UTC (rev 9761)
@@ -6,6 +6,15 @@
 */
 
 
+// The global widget we attach everything to
+var w = new QxWidget();
+with(w) {
+	setTop(0);
+	setLeft(0);
+	setWidth(docX());
+	setHeight(docY());
+}
+
 /* Qooxdoo's browser sniffer doesn't distinguish IE version.
 We'll cover IE 6 for now, but these checks need to be
 revisited for fuller browser coverage. */
@@ -139,3 +148,17 @@
 Window.small = SmallWindow;
 Window.standard = StandardWindow;
 Window.large = LargeWindow;
+
+window.application.main = function()
+{
+	var doc = this.getClientWindow().getClientDocument();
+	doc.addEventListener("contextmenu", showContextMenu);
+	doc.add(w);
+}
+
+window.onresize = function() 
+{
+	w.setWidth(docX());
+	w.setHeight(docY());
+}
+