incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtu...@apache.org
Subject svn commit: r434232 - in /incubator/xap/trunk: WebContent/examples/basic/ WebContent/examples/dojo/ WebContent/examples/htmlEmbedding/ src/xap/bridges/dojo/
Date Wed, 23 Aug 2006 22:47:40 GMT
Author: mturyn
Date: Wed Aug 23 15:47:38 2006
New Revision: 434232

URL: http://svn.apache.org/viewvc?rev=434232&view=rev
Log:
Removed residual zimbra, dojo load (since that's now handled in xapcore.js).

Modified:
    incubator/xap/trunk/WebContent/examples/basic/dom0.html
    incubator/xap/trunk/WebContent/examples/basic/dom0.xal
    incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html
    incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html
    incubator/xap/trunk/WebContent/examples/dojo/datePicker.html
    incubator/xap/trunk/WebContent/examples/dojo/dojo1.html
    incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html
    incubator/xap/trunk/WebContent/examples/dojo/portlet.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html
    incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html
    incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js

Modified: incubator/xap/trunk/WebContent/examples/basic/dom0.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/basic/dom0.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/basic/dom0.html (original)
+++ incubator/xap/trunk/WebContent/examples/basic/dom0.html Wed Aug 23 15:47:38 2006
@@ -17,8 +17,8 @@
 	</script>    
 	
     <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
     <script language="JavaScript" type="text/javascript"> 
@@ -40,13 +40,7 @@
     	
   	
   	  <!-- SECTION 2 -->
-	<script type="text/javascript">
-		// Load Dojo's code concerned with a Button or Button2 widget,
-		// including the object dojo.widget needed to create one
-		dojo.require("dojo.widget.*");   
-		dojo.require("dojo.event.*");            
-		dojo.require("dojo.widget.Button");  	                                          
- 	</script>
+
 
 	<script language="JavaScript" src="dom0.js"> </script>
 	<script language="JavaScript" src="dom0Handler.js"> </script>	
@@ -77,9 +71,6 @@
  </head>
  
  <body onLoad="document.attachOurEvent();Xap.createAllPredefinedSessions();if(xap.showStatus){xap.showStatus();};document.attachOurEvent();">
-	<script type="text/javascript">
-		DBG = new AjxDebug( AjxDebug.NONE, null, false ); 
-	</script>
 	<h1>Wrapped DIV managed by a xaplet embedded in another table cell:</h1>
 	
 	<table id="bigtable" border="4px" borderColor="#8866AA" width="80%" height="80%"

Modified: incubator/xap/trunk/WebContent/examples/basic/dom0.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/basic/dom0.xal?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/basic/dom0.xal (original)
+++ incubator/xap/trunk/WebContent/examples/basic/dom0.xal Wed Aug 23 15:47:38 2006
@@ -11,13 +11,13 @@
 
   <xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
     <xm:append select="/xal">
-		<dom xmlns="http://www.dojotoolkit.org/" 		
+		<dom xmlns="http://www.dojotoolkit.org/"	
 				wrappedNodeId="targetNode"
 				bgColor="#eeddFF"
 				color="#ffeeff"
 				innerHTML="&lt;b&gt;Mouse over this cell...&lt;/b&gt;"
 				valign="middle"
-				align="center"
+				align="center"			
 		/>	
    	</xm:append> 	  	
 

Modified: incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/colorPicker.html Wed Aug 23 15:47:38 2006
@@ -16,9 +16,9 @@
 		};
 	</script>    
 	
-    <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
     <script language="JavaScript" type="text/javascript"> 
@@ -58,9 +58,7 @@
  </head>
   
  <body onload="divv=document.getElementById('dp') ;dojo.widget.createWidget('ColorPalette',{widgetId:'dp'},divv);Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus('ColorPicker');};
">
-	<script type="text/javascript">
-		DBG = new AjxDebug( AjxDebug.NONE, null, false ); 
-	</script>
+
 	<h1>A Dojo "ColorPalette" wrapped by an AbstractBlackBoxWidgetBridge subclass, managed
by a xaplet in that cell.</h1>
 	
 	<table id="bigtable" border="4px" borderColor="#8866AA" width="80%" height="80%"
@@ -87,11 +85,9 @@
 	</table>
 
 
-	<!-- MyApp as the app name is a top-level alias for session
+	<!-- ColorPicker is the app name is a top-level alias for session
 	as this event handler illustrates -->	
-	<button onclick="alert(MyApp.getDocumentContainer().getUiDocument().toXml());Xap.getAllDependencies('xap')">hello</button>
-	
-
+	<button onclick="alert('This UI document: \n' + ColorPicker.getDocumentContainer().getUiDocument().toXml())">hello</button>
 	<div id="foot">FOOTER TEXT</dev>
 
 

Modified: incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dateAndColorPickers.html Wed Aug 23 15:47:38
2006
@@ -16,9 +16,9 @@
 		};
 	</script>    
 	
-    <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
     <script language="JavaScript" type="text/javascript"> 
@@ -66,9 +66,7 @@
  </head>
   
  <body onload="Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus(['DatePicker','ColorPicker']);};
">
-	<script type="text/javascript">
-		DBG = new AjxDebug( AjxDebug.NONE, null, false ); 
-	</script>
+
 	<h1>Two Xap-spec'd applications in one page.</h1>
 	
 	<table id="bigtable" border="5px" borderColor="#88FF88" width="80%" height="80%"
@@ -107,7 +105,7 @@
 
 	<!-- DatePicker is the app name is a top-level alias for session
 	as this event handler illustrates -->	
-	<button onclick="alert(DatePicker.getDocumentContainer().getUiDocument().toXml());Xap.getAllDependencies('xap')">hello</button>
+	<button onclick="alert('This UI document: \n' + DatePicker.getDocumentContainer().getUiDocument().toXml())">hello</button>
 	
 
 	<div id="foot">FOOTER TEXT</dev>

Modified: incubator/xap/trunk/WebContent/examples/dojo/datePicker.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/datePicker.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/datePicker.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/datePicker.html Wed Aug 23 15:47:38 2006
@@ -3,12 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>A Dojo "DatePicker" wrapped by an AbstractBlackBoxWidgetBridge subclass.</title>
 
-	<style type="text/css">
-      <!--
-          @import url(../../css/xapDefault.css);
-      -->
-    </style>
-    
+
 	<!-- Keep dojo from trying to scan this whole page for dojoType'd tags: -->
 	<script type="text/javascript">
 		djConfig = {
@@ -16,9 +11,9 @@
 		};
 	</script>    
 	
-    <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
     <script language="JavaScript" type="text/javascript"> 
@@ -63,9 +58,6 @@
  </head>
   
  <body onload="divv=document.getElementById('dp') ;dojo.widget.createWidget('datepicker',{widgetId:'dp'},divv);Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus('DatePicker');};
">
-	<script type="text/javascript">
-		DBG = new AjxDebug( AjxDebug.NONE, null, false ); 
-	</script>
 	<h1>A Dojo "DatePicker" wrapped by an AbstractBlackBoxWidgetBridge subclass, managed
by a xaplet in a different cell.</h1>
 	
 	<table id="bigtable" border="4px" borderColor="#8866AA" width="80%" height="80%"
@@ -73,7 +65,7 @@
 		cellpadding="20em" cellspacing="2px"
 		>
 		<tr><th width="60%">0.</th><th>1.</th></tr>
-		<tr><td>This is put here by plain old Dojo.<div  id="dp"/><td/><td></td></tr>
+		<tr><td>This is put here by plain Dojo.<div  id="dp"/><td/><td></td></tr>
 		<tr><td id="xapStat"></td>		
 			<td><div xapContext="../../"  
 				xapId="DatePicker" xapSrc="datePicker.xal" xapToolkit="dojo">This cell is the xap
ClientSession "DatePicker"'s home-base.</div>
@@ -86,7 +78,7 @@
 
 	<!-- DatePicker as the app name is a top-level alias for session
 	as this event handler illustrates -->	
-	<button onclick="alert(DatePicker.getDocumentContainer().getUiDocument().toXml());Xap.getAllDependencies('xap')">hello</button>
+	<button onclick="alert('This UI document: \n' + DatePicker.getDocumentContainer().getUiDocument().toXml())">hello</button>
 	
 
 	<div id="foot">FOOTER TEXT</dev>

Modified: incubator/xap/trunk/WebContent/examples/dojo/dojo1.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dojo1.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dojo1.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dojo1.html Wed Aug 23 15:47:38 2006
@@ -16,9 +16,9 @@
 		};
 	</script>    
 	
-    <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
     <script language="JavaScript" type="text/javascript"> 
@@ -56,9 +56,7 @@
  
 
 <body onLoad="Xap.createAllPredefinedSessions();if(document.showXapStatus){document.showXapStatus('MyApp');}">
-	<script type="text/javascript">
-		DBG = new AjxDebug( AjxDebug.NONE, null, false ); 
-	</script>
+
 	<h1>Xaplet embedded in a table cell:</h1>
 	
 	<table id="bigtable" border="4px" borderColor="#8866AA" width="80%" height="80%"

Modified: incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html Wed Aug 23 15:47:38 2006
@@ -16,9 +16,9 @@
 		};
 	</script>    
 	
-    <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
 
  
    <script language="JavaScript" type="text/javascript"> 
@@ -58,9 +58,6 @@
 
 
 <body onLoad="Xap.createAllPredefinedSessions()">
-	<script type="text/javascript">
-		DBG = new AjxDebug( AjxDebug.NONE, null, false ); 
-	</script>
 	
 	SOME TEXT
 	<h1>SOME BIG TEXT</h1>

Modified: incubator/xap/trunk/WebContent/examples/dojo/portlet.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/portlet.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/portlet.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/portlet.html Wed Aug 23 15:47:38 2006
@@ -16,9 +16,9 @@
 		};
 	</script>    
 	
-    <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
     <script language="JavaScript" type="text/javascript"> 

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html
(original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_controlledComponentLevelDisplay.html
Wed Aug 23 15:47:38 2006
@@ -14,8 +14,8 @@
 	
 	
     <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
    

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html
(original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_homeSpecified.html
Wed Aug 23 15:47:38 2006
@@ -12,8 +12,8 @@
 	</script>    
 	
     <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
    

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html
(original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_1b_noSpecialAttributes_noHomeSpecified.html
Wed Aug 23 15:47:38 2006
@@ -18,8 +18,8 @@
 	</script>    
 	
     <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
    

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html
(original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_controlledComponentLevelDisplay.html
Wed Aug 23 15:47:38 2006
@@ -42,8 +42,8 @@
 	</script>    
 	
     <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
    

Modified: incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html?rev=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html
(original)
+++ incubator/xap/trunk/WebContent/examples/htmlEmbedding/Example_3_specialAttributes_defaultDisplay.html
Wed Aug 23 15:47:38 2006
@@ -16,8 +16,8 @@
 	</script>    
 	
     <script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
+    
+    <script language="JavaScript" type="text/javascript" src="../../xapcore.js"></script>
     
 
    

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=434232&r1=434231&r2=434232&view=diff
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoButtonBridge.js Wed Aug 23 15:47:38 2006
@@ -26,7 +26,9 @@
  // Auto-added---o.k.?
 Xap.require("xap.util.LogFactory");
 Xap.require("xap.bridges.dojo.DojoWidgetBridge"); 
+Xap.require("dojo.widget.html.Button") ;
 Xap.require("dojo.widget.Button"); 
+
 
 
 



Mime
View raw message