incubator-xap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmarga...@apache.org
Subject svn commit: r440600 - in /incubator/xap/trunk: WebContent/examples/widgets/ src/xap/bridges/basic/ src/xap/bridges/dojo/ src/xap/requestservice/ src/xap/session/ src/xap/taghandling/ src/xap/util/ src/xap/widgets/dojo/ src/xap/xml/dom/
Date Wed, 06 Sep 2006 03:47:55 GMT
Author: jmargaris
Date: Tue Sep  5 20:47:54 2006
New Revision: 440600

URL: http://svn.apache.org/viewvc?view=rev&rev=440600
Log:
random fixes and first attempt at xinclude

Added:
    incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
    incubator/xap/trunk/src/xap/bridges/basic/XInclude.js   (with props)
    incubator/xap/trunk/src/xap/widgets/dojo/HtmlWrapper.js   (with props)
Modified:
    incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js
    incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal
    incubator/xap/trunk/WebContent/examples/widgets/button.xal
    incubator/xap/trunk/src/xap/bridges/basic/AbstractBlackBoxWidgetBridge.js
    incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js
    incubator/xap/trunk/src/xap/requestservice/RequestService.js
    incubator/xap/trunk/src/xap/session/ClientSession.js
    incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js
    incubator/xap/trunk/src/xap/taghandling/plugin.xml
    incubator/xap/trunk/src/xap/util/HttpUtils.js
    incubator/xap/trunk/src/xap/widgets/dojo/BorderPanel.js
    incubator/xap/trunk/src/xap/xml/dom/Document.js

Modified: incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/AttributeTester.js Tue Sep  5 20:47:54
2006
@@ -14,7 +14,7 @@
 //no error. BEcause we still found element in hashtable?
 AttributeTester.prototype.insertBefore = function( element ){
 alert("insert before");
-	var newElement = element.getOwnerDocument().createElement("freePanel",null,"http://www.dojotoolkit.org/");
+	var newElement = element.getOwnerDocument().createElement("freePanel",null,"http://www.openxal.org/xal");
 	newElement.setAttribute("backgroundColor","yellow");
 	newElement.setAttribute("width","30px");
 	newElement.setAttribute("height","30px");
@@ -30,4 +30,15 @@
 
 AttributeTester.prototype.printElement = function( element ){
 	alert(element.toXml());
+}
+
+AttributeTester.prototype.addBorderComponent = function( parent, borderPosition ){
+alert("add border component");
+	var newElement = parent.getOwnerDocument().createElement("freePanel",null,"http://www.openxal.org/xal");
+	newElement.setAttribute("backgroundColor","yellow");
+	newElement.setAttribute("borderPosition", borderPosition);
+	newElement.setAttribute("width","30px");
+	newElement.setAttribute("height","30px");
+	parent.appendChild(newElement);
+	alert("New dom node = " + parent.toXml());
 }

Modified: incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/borderPanel.xal Tue Sep  5 20:47:54 2006
@@ -14,12 +14,53 @@
 	
 		<xal:borderPanel width="200px" height="200px" backgroundColor="black"
 		id="testComponent" orientation="horizontal">
-			<xal:button text="north" borderPosition="north"/>
-			<xal:button text="south" borderPosition="south"/>
-			<xal:button text="east" borderPosition="east"/>
-			<xal:button text="west" borderPosition="west"/>
-			<xal:button text="center" borderPosition="center"/>
+			<xal:freePanel backgroundColor="red" width="20px" height="20px" id="north" borderPosition="north"/>
+			<xal:freePanel backgroundColor="green" width="20px" height="20px"  id="south" borderPosition="south"/>
+			<xal:freePanel backgroundColor="blue" width="20px" height="20px"  id="east" borderPosition="east"/>
+			<xal:freePanel backgroundColor="yellow" width="20px" height="20px" id="west" borderPosition="west"/>
+			<xal:freePanel backgroundColor="orange" width="20px" height="20px"  id="center" borderPosition="center"/>
 		</xal:borderPanel>
+		
+		
+		<xal:button width="200px" height="25px" 
+			text="remove north"
+			onCommand="mco:attributeSetter.remove(north)"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="remove south"
+			onCommand="mco:attributeSetter.remove(south)"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="remove east"
+			onCommand="mco:attributeSetter.remove(east)"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="remove west"
+			onCommand="mco:attributeSetter.remove(west)"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="remove center"
+			onCommand="mco:attributeSetter.remove(center)"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="add north"
+			onCommand="mco:attributeSetter.addBorderComponent(testComponent, 'north')"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="add south"
+			onCommand="mco:attributeSetter.addBorderComponent(testComponent, 'south')"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="add east"
+			onCommand="mco:attributeSetter.addBorderComponent(testComponent, 'east')"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="add west"
+			onCommand="mco:attributeSetter.addBorderComponent(testComponent, 'west')"/>
+			
+		<xal:button width="200px" height="25px" 
+			text="add center"
+			onCommand="mco:attributeSetter.addBorderComponent(testComponent, 'center')"/>
 		
 
 		<!--standard test things -->

Modified: incubator/xap/trunk/WebContent/examples/widgets/button.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/button.xal?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/button.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/button.xal Tue Sep  5 20:47:54 2006
@@ -49,56 +49,7 @@
 		 onCommand="mco:attributeSetter.setAttribute(testComponent, 'alignVertical', 'bottom')"
/>
 		 
 		 
-
-				
-
-		
-		
-
-		<button width="200px" height="25px" 
-			text="borderWidth -> '25'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderWidth' ,'25')"/>
-
-		<button width="200px" height="25px" 
-			text="borderStyle -> 'solid'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderStyle' ,'solid')"/>
-
-		<button width="200px" height="25px" 
-			text="borderColor -> 'red'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'borderColor' ,'red')"/>
-
-		<button width="200px" height="25px" 
-			text="width -> '300px'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'width' ,'300px')"/>
-
-		<button width="200px" height="25px" 
-			text="height -> '300px'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'height' ,'300px')"/>
-
-		<button width="200px" height="25px" 
-			text="fontWeight -> 'bold'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontWeight' ,'bold')"/>
-
-		<button width="200px" height="25px" 
-			text="backgroundColor -> 'green'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'backgroundColor' ,'green')"/>
-
-		<button width="200px" height="25px" 
-			text="color -> 'red'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'color' ,'red')"/>
-
-		<button width="200px" height="25px" 
-			text="fontSize-> '24'"
-			onCommand="mco:attributeSetter.setAttribute(testComponent,
-				'fontSize' ,'24')"/>
+		<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
 		 
 		 
 		 

Added: incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal?view=auto&rev=440600
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal (added)
+++ incubator/xap/trunk/WebContent/examples/widgets/standardButtons.xal Tue Sep  5 20:47:54
2006
@@ -0,0 +1,47 @@
+<verticalPanel xmlns="http://www.openxal.org/xal">	
+	
+	<button width="200px" height="25px" 
+			text="borderWidth -> '25'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'borderWidth' ,'25')"/>
+
+		<button width="200px" height="25px" 
+			text="borderStyle -> 'solid'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'borderStyle' ,'solid')"/>
+
+		<button width="200px" height="25px" 
+			text="borderColor -> 'red'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'borderColor' ,'red')"/>
+
+		<button width="200px" height="25px" 
+			text="width -> '300px'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'width' ,'300px')"/>
+
+		<button width="200px" height="25px" 
+			text="height -> '300px'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'height' ,'300px')"/>
+
+		<button width="200px" height="25px" 
+			text="fontWeight -> 'bold'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'fontWeight' ,'bold')"/>
+
+		<button width="200px" height="25px" 
+			text="backgroundColor -> 'green'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'backgroundColor' ,'green')"/>
+
+		<button width="200px" height="25px" 
+			text="color -> 'red'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'color' ,'red')"/>
+
+		<button width="200px" height="25px" 
+			text="fontSize-> '24'"
+			onCommand="mco:attributeSetter.setAttribute(testComponent,
+				'fontSize' ,'24')"/>
+</verticalPanel>
\ No newline at end of file

Modified: incubator/xap/trunk/src/xap/bridges/basic/AbstractBlackBoxWidgetBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/basic/AbstractBlackBoxWidgetBridge.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/basic/AbstractBlackBoxWidgetBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/basic/AbstractBlackBoxWidgetBridge.js Tue Sep  5 20:47:54
2006
@@ -250,7 +250,7 @@
 		 	} ;
 }
 
-xap.bridges.basic.AbstractBlackBoxWidgetBridge.prototype.onChildAdded = function( e ) {
+xap.bridges.basic.AbstractBlackBoxWidgetBridge.prototype.childAdded = function( e ) {
 	var childElement = e.getChange();
 	var childHandler = this.getUiContentHandler().getHandlerForElement( childElement );
 	this.addChild(childHandler, e.getIndex());
@@ -264,7 +264,8 @@
 }
 
 xap.bridges.basic.AbstractBlackBoxWidgetBridge.prototype.addChild = function(childHandler,
index){
-	if (this.getNodeForChildren && this.getNodeForChildren()){
+	if (this.getNodeForChildren && this.getNodeForChildren() && 
+		childHandler.getRootDomNode && childHandler.getRootDomNode()){
 		this.getNodeForChildren().appendChild(childHandler.getRootDomNode());
 	}
 	else{
@@ -278,7 +279,8 @@
 }
 
 xap.bridges.basic.AbstractBlackBoxWidgetBridge.prototype.removeChild = function(childHandler,
index){
-	if (this.getNodeForChildren && this.getNodeForChildren()){
+	if (this.getNodeForChildren && this.getNodeForChildren() &&
+	childHandler.getRootDomNode && childHandler.getRootDomNode()){
 		this.getNodeForChildren().removeChild(childHandler.getRootDomNode());
 	}
 }

Added: incubator/xap/trunk/src/xap/bridges/basic/XInclude.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/basic/XInclude.js?view=auto&rev=440600
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/basic/XInclude.js (added)
+++ incubator/xap/trunk/src/xap/bridges/basic/XInclude.js Tue Sep  5 20:47:54 2006
@@ -0,0 +1,88 @@
+/*
+ * Copyright  2006 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+ 
+Xap.provide("xap.bridges.basic.XInclude"); 
+
+Xap.require("xap.taghandling.AbstractTagImpl");
+
+/**
+ * @fileoverview
+ * 
+ * A bridge class that implements xinclude.
+ */
+
+/**
+ * Creates a placeholder XInclude object
+ * 
+ * 
+ * @class Implements a subset of xinclude functionality
+ * 
+ * @constructor
+ * 
+ * @author jmargaris
+ */
+xap.bridges.basic.XInclude = function() {
+	xap.taghandling.AbstractTagImpl.call( this );
+}
+
+xap.bridges.basic.XInclude.prototype = new xap.taghandling.AbstractTagImpl;
+
+
+xap.bridges.basic.XInclude.prototype.toString = function() {
+	return "xap.bridges.basic.XInclude";
+}
+
+
+xap.bridges.basic.XInclude.prototype.init = function() {
+	var href = this.getElement().getAttribute("href");
+	xap.taghandling.AbstractTagImpl.prototype.init.call( this );
+	if (href){
+		this.getSession().getRequestService().retrieveAsynchronously(href,this);
+	}
+	
+}
+
+xap.bridges.basic.XInclude.prototype.requestFailed = function(url, response) {
+	//TODO handle better
+	alert("XInclude request for " + url + " failed");
+}
+
+xap.bridges.basic.XInclude.prototype.requestCompleted = function(url, response) {
+	var thisElement = this.getElement();
+	var text = response.responseText;
+	var parseType = thisElement.getAttribute("parse");
+	
+	var newChild = null;
+	
+	if ("text"==parseType){
+		newChild = thisElement.getOwnerDocument().createTextNode(text);
+	}
+	else{
+		var parser = new xap.xml.sax.SaxParser( new xap.xml.sax.SaxContentHandler() );
+  		var document =  parser.parse( text );
+  		newChild = document.childNodes[0];
+  		
+  		//TODO what about fragments? Should we handle that? spec allows it with
+  		//xpointer, kind of ugly...
+	}
+	
+	//insert before us then remove us!
+	thisElement.parentNode.insertBefore(newChild, thisElement);
+	thisElement.parentNode.removeChild(thisElement);
+}
+
+

Propchange: incubator/xap/trunk/src/xap/bridges/basic/XInclude.js
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js Tue Sep  5 20:47:54 2006
@@ -19,6 +19,8 @@
 Xap.require("xap.bridges.basic.AbstractBlackBoxWidgetBridge"); 
 // Auto-added---o.k.?
 Xap.require("xap.util.Exception");
+Xap.require("dojo.widget.HtmlWidget");
+Xap.require("xap.widgets.dojo.HtmlWrapper");
 
 // Auto-added---o.k.?
 Xap.require("xap.util.ArrayHelper");
@@ -154,13 +156,30 @@
 	
 	//index -1 just append!
 	var insertIndex = index<0?null:index;
-	//TODO check if it is a dojo widget bridge/peer!!
-	this.getPeer().addChild(childHandler.getPeer(),null,'insertAtIndex',null,insertIndex);
+	var childPeer = childHandler.getPeer();
+	if (childPeer instanceof dojo.widget.HtmlWidget){
+		
+	}
+	else{
+		childPeer = new xap.widgets.dojo.HtmlWrapper();
+		childPeer.setDomNode(childHandler.getRootDomNode());
+		childHandler._dojoWrapper = childPeer;	
+	}
+	this.getPeer().addChild(childPeer,null,'insertAtIndex',null,insertIndex);
 }
 
 
 xap.bridges.dojo.DojoWidgetBridge.prototype.removeChild = function(childHandler){
-	this.getPeer().removeChild(childHandler.getPeer());
+	var childPeer = childHandler.getPeer();
+	if (childPeer instanceof dojo.widget.HtmlWidget){
+		
+	}
+	else{
+		childPeer = childHandler._dojoWrapper;
+	}
+	
+	this.getPeer().removeChild(childPeer);
+	
 }
 
 

Modified: incubator/xap/trunk/src/xap/requestservice/RequestService.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/requestservice/RequestService.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/requestservice/RequestService.js (original)
+++ incubator/xap/trunk/src/xap/requestservice/RequestService.js Tue Sep  5 20:47:54 2006
@@ -124,9 +124,9 @@
 xap.requestservice.RequestService.prototype.retrieveAsynchronously = function(url, listener)
{
   var callback = function( response ) {
     if (response.status == xap.util.HttpUtils.OK) {
-      listener.requestCompleted(url, response.responseText);
+      listener.requestCompleted(url, response);
     } else {
-      listener.requestFailed(url, response.statusText);
+      listener.requestFailed(url, response);
     }
   };
   xap.util.HttpUtils.get(url, callback);

Modified: incubator/xap/trunk/src/xap/session/ClientSession.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/session/ClientSession.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/session/ClientSession.js (original)
+++ incubator/xap/trunk/src/xap/session/ClientSession.js Tue Sep  5 20:47:54 2006
@@ -9,7 +9,6 @@
  *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *
@@ -291,7 +290,7 @@
 			return parentElement ;
 		}
 		
-		handler.onChildAdded = function( e ) {
+		handler.childAdded = function( e ) {
 			var childElement = e.getChange();
 			var childHandler = this.getUiContentHandler().getHandlerForElement( childElement );
 			this.addChild(childHandler, e.getIndex());

Modified: incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js (original)
+++ incubator/xap/trunk/src/xap/taghandling/AbstractTagImpl.js Tue Sep  5 20:47:54 2006
@@ -225,14 +225,28 @@
 xap.taghandling.AbstractTagImpl.prototype.parseInitialChildren = function( e ) {
 	
 	//if we aren't using tail recursion add ourselved to parent BEFORE
-	//we go through all our children
+	//we go through all our children.
+	//IMPORTANT PROBLEM: 
+	//If we add to a node, we get a onChildAdded() on document which
+	//starts this entire process, THEN a child added on the individual
+	//node that was added to. Which means the node we added to can
+	//actually get TWO child added events. When we are not using tail recursion
+	//the child adds itself to the parent immediately, so we should ignore
+	//the onChildAdded that comes later. However we don't have a good
+	//way to identify which one is which...maybe instead of onChildAdded
+	//and beforeChildAdded we should use two other methods?
+	//as it stands the root tag we are appending the subtree to will get the
+	//onChildAdded calls twice, which is bad.
 	if (!xap.taghandling.AbstractTagImpl.TAIL_RECURSION){
 		var parentElement = this.getElement().parentNode;
 		var parentHandler = this.getUiContentHandler().getHandlerForElement( parentElement );
 	
 		var event = new xap.xml.dom.events.StructureChangeEvent( e, this.getElement(), -1 );
 		parentHandler.beforeChildAdded( event );
-		parentHandler.onChildAdded( event );
+		
+		//don't call the onChildAdded because it is being ignored, use
+		//childAdded directly instead
+		parentHandler.childAdded( event );
 	}
 		
 	
@@ -538,6 +552,19 @@
 	// NO-OP
 }
 
+
+xap.taghandling.AbstractTagImpl.prototype.onChildAdded = function( e ) {
+	if (xap.taghandling.AbstractTagImpl.TAIL_RECURSION){
+		this.childAdded(e);
+	}
+}
+
+xap.taghandling.AbstractTagImpl.prototype.childAdded = function( e ) {
+
+}
+
+
+
 /**
  * This method is included to conform to the StructureChangeListener interface.
  * @param e The StructureChangeEvent
@@ -570,17 +597,11 @@
 //		}
 }
 	
-/**
- * This method is included to conform to the StructureChangeListener interface.
- * @param e The StructureChangeEvent
- */
+
 xap.taghandling.AbstractTagImpl.prototype.beforeChildRemoved = function( e ) {}
 
-/**
- * Subclasses should override this method to handle dynamic addition of children.
- * @param e The StructureChangeEvent
- */
-xap.taghandling.AbstractTagImpl.prototype.onChildAdded = function( e ) {}
+
+
 
 /**
  * Subclasses should override this method to handle dynamic removal of children.

Modified: incubator/xap/trunk/src/xap/taghandling/plugin.xml
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/taghandling/plugin.xml?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/taghandling/plugin.xml (original)
+++ incubator/xap/trunk/src/xap/taghandling/plugin.xml Tue Sep  5 20:47:54 2006
@@ -1,5 +1,8 @@
 <plugin>
 
+	<tag-mappings namespace="http://www.openxal.org/xinclude" document="xal">
+		<mapping class="xap.bridges.basic.XInclude" name="include"/>
+	</tag-mappings>
 
 	<!-- default mappings -->
 	<tag-mappings namespace="http://www.openxal.org/xal" document="xal">

Modified: incubator/xap/trunk/src/xap/util/HttpUtils.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/util/HttpUtils.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/util/HttpUtils.js (original)
+++ incubator/xap/trunk/src/xap/util/HttpUtils.js Tue Sep  5 20:47:54 2006
@@ -68,8 +68,6 @@
 		request.onreadystatechange = function () {
 			if (request.readyState == 4) {
 				callback(request);
-			} else {
-				xap.util.HttpUtils.s_log.warn("FAILED TO LOAD URL => " + URL);
 			}
 		};
 	}

Modified: incubator/xap/trunk/src/xap/widgets/dojo/BorderPanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/widgets/dojo/BorderPanel.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/widgets/dojo/BorderPanel.js (original)
+++ incubator/xap/trunk/src/xap/widgets/dojo/BorderPanel.js Tue Sep  5 20:47:54 2006
@@ -75,7 +75,7 @@
 	removeChild: function(child) {
 	 	var containerNode = child.domNode.parentNode;		 	
 		xap.widgets.dojo.BorderPanel.superclass.removeChild.call(this,child);
-		resetNode(containerNode);
+		this.resetNode(containerNode);
     },
     
     resetNode : function(containerNode){

Added: incubator/xap/trunk/src/xap/widgets/dojo/HtmlWrapper.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/widgets/dojo/HtmlWrapper.js?view=auto&rev=440600
==============================================================================
--- incubator/xap/trunk/src/xap/widgets/dojo/HtmlWrapper.js (added)
+++ incubator/xap/trunk/src/xap/widgets/dojo/HtmlWrapper.js Tue Sep  5 20:47:54 2006
@@ -0,0 +1,31 @@
+//IMPORTANT move this to some shared area
+dojo.widget.manager.registerWidgetPackage("xap.widgets.dojo");
+
+Xap.provide("xap.widgets.dojo.HtmlWrapper");
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.dom");
+dojo.require("dojo.html");
+dojo.require("dojo.style");
+dojo.require("dojo.event");
+
+dojo.widget.tags.addParseTreeHandler("dojo:HtmlWrapper");
+
+xap.widgets.dojo.HtmlWrapper = function(){
+	dojo.widget.HtmlWidget.call(this);
+}
+
+dojo.inherits(xap.widgets.dojo.HtmlWrapper,dojo.widget.HtmlWidget);
+
+dojo.lang.extend(xap.widgets.dojo.HtmlWrapper, {
+	templateString: null,
+	templateCssPath: null ,
+	widgetType: "HtmlWrapper",
+	isContainer: false,
+	
+	setDomNode: function( element ){
+		this.domNode = element;
+	}
+}
+);
\ No newline at end of file

Propchange: incubator/xap/trunk/src/xap/widgets/dojo/HtmlWrapper.js
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/xap/trunk/src/xap/xml/dom/Document.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/xml/dom/Document.js?view=diff&rev=440600&r1=440599&r2=440600
==============================================================================
--- incubator/xap/trunk/src/xap/xml/dom/Document.js (original)
+++ incubator/xap/trunk/src/xap/xml/dom/Document.js Tue Sep  5 20:47:54 2006
@@ -395,7 +395,7 @@
 		this._notifyListenersOfStructureChange
 			( this._structureChangeListeners, event, xap.xml.dom.Document.BEFORE_REMOVE );
         
-		this._rootElement.setOwnerDocument( null );
+		this._rootElement._setOwnerDocument( null );
 		this.removeChild(this._rootElement);
 		this._removeDocumentFragmentFromIdMap( this._rootElement );
          



Mime
View raw message