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 18:21:31 UTC
svn commit: r473409 - in /incubator/xap/trunk:
WebContent/examples/widgets/menu.xal
src/xap/bridges/dojo/MenuBarItemBridge.js
src/xap/bridges/dojo/MenuItemBridge.js
Author: mturyn
Date: Fri Nov 10 10:21:30 2006
New Revision: 473409
URL: http://svn.apache.org/viewvc?view=rev&rev=473409
Log:
(For Y.Wang:)
Fixes to the menu-oriented classes.
Modified:
incubator/xap/trunk/WebContent/examples/widgets/menu.xal
incubator/xap/trunk/src/xap/bridges/dojo/MenuBarItemBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/MenuItemBridge.js
Modified: incubator/xap/trunk/WebContent/examples/widgets/menu.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/menu.xal?view=diff&rev=473409&r1=473408&r2=473409
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/menu.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/menu.xal Fri Nov 10 10:21:30 2006
@@ -12,7 +12,7 @@
<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
<xm:append select="/xal">
<!--- layout issues prevent putting the menu into a horizpanel-->
- <xal:verticalPanel>
+ <xal:verticalBoxPane>
<xal:menuBar id="testComponent" height="50px" onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)">
<xal:menuBarItem text="Edit" id="testMenuBarItem">
<xal:menu onActiveGained="mco:attributeSetter.reportEvent(event)" onActiveLost="mco:attributeSetter.reportEvent(event)" onBeforeActiveLost="mco:attributeSetter.reportEvent(event)" onCommand="mco:attributeSetter.reportEvent(event)" onContextMenu="mco:attributeSetter.reportEvent(event)" onDoubleClick="mco:attributeSetter.reportEvent(event)" onDragDrop="mco:attributeSetter.reportEvent(event)" onDragEnd="mco:attributeSetter.reportEvent(event)" onDragStart="mco:attributeSetter.reportEvent(event)" onKeyChar="mco:attributeSetter.reportEvent(event)" onKeyDown="mco:attributeSetter.reportEvent(event)" onKeyUp="mco:attributeSetter.reportEvent(event)" onMouseDown="mco:attributeSetter.reportEvent(event)" onMouseDrag="mco:attributeSetter.reportEvent(event)" onMouseMove="mco:attributeSetter.reportEvent(event)" onMouseOut="mco:attributeSetter.reportEvent(event)" onMouseOver="mco:attributeSetter.reportEvent(event)" onMouseUp="mco:attributeSetter.reportEvent(event)">
@@ -25,7 +25,7 @@
<xal:menuBarItem text="File">
<xal:menu>
- <xal:menuItem text="Open" disabled="true" onCommand="mco:attributeSetter.reportEvent(event)"/>
+ <xal:menuItem text="Open" enabled="false" onCommand="mco:attributeSetter.reportEvent(event)"/>
<xal:menuItem text="Close" onCommand="mco:attributeSetter.reportEvent(event)"/>
<xal:menuItem text="Preferences.">
<xal:menu>
@@ -36,7 +36,7 @@
</xal:menu>
</xal:menuBarItem>
- <xal:menuBarItem text="Format" disabled="true">
+ <xal:menuBarItem text="Format" enabled="false">
<xal:menu>
<xal:menuItem text="Cut"/>
<xal:menuItem text="Copy"/>
@@ -104,13 +104,13 @@
onCommand="mco:attributeSetter.setAttribute(testComponent,
'fontStyle' ,'italic')"/>
<button width="200px" height="25px"
- text="disabled -> 'true'"
+ text="enabled -> 'false'"
onCommand="mco:attributeSetter.setAttribute(testComponent,
- 'disabled' ,'true')"/>
+ 'enabled' ,'false')"/>
<button width="200px" height="25px"
- text="disabled -> 'false'"
+ text="enabled -> 'true'"
onCommand="mco:attributeSetter.setAttribute(testComponent,
- 'disabled' ,'false')"/>
+ 'enabled' ,'true')"/>
<button width="200px" height="25px"
text="pack -> 'true'"
onCommand="mco:attributeSetter.setAttribute(testComponent,
@@ -173,13 +173,17 @@
onCommand="mco:attributeSetter.setAttribute(testMenuBarItem,
'visible' ,'true')"/>
<button width="200px" height="25px"
- text="disabled -> 'true'"
+ text="enabled -> 'false'"
onCommand="mco:attributeSetter.setAttribute(testMenuBarItem,
- 'disabled' ,'true')"/>
+ 'enabled' ,'false')"/>
<button width="200px" height="25px"
- text="disabled -> 'false'"
+ text="enabled -> 'true'"
onCommand="mco:attributeSetter.setAttribute(testMenuBarItem,
- 'disabled' ,'false')"/>
+ 'enabled' ,'true')"/>
+ <button width="200px" height="25px"
+ text="text -> 'My Text'"
+ onCommand="mco:attributeSetter.setAttribute(testMenuBarItem,
+ 'text' ,'My Text')"/>
</horizontalFlowPane>
<horizontalFlowPane width="825px" xmlns="http://www.openxal.org/xal">
@@ -239,17 +243,21 @@
onCommand="mco:attributeSetter.setAttribute(testMenuItem,
'visible' ,'true')"/>
<button width="200px" height="25px"
- text="disabled -> 'true'"
+ text="enabled -> 'false'"
+ onCommand="mco:attributeSetter.setAttribute(testMenuItem,
+ 'enabled' ,'false')"/>
+ <button width="200px" height="25px"
+ text="enabled -> 'true'"
onCommand="mco:attributeSetter.setAttribute(testMenuItem,
- 'disabled' ,'true')"/>
+ 'enabled' ,'true')"/>
<button width="200px" height="25px"
- text="disabled -> 'false'"
+ text="text -> 'My MenuItem'"
onCommand="mco:attributeSetter.setAttribute(testMenuItem,
- 'disabled' ,'false')"/>
+ 'text' ,'My MenuItem')"/>
</horizontalFlowPane>
<!--standard test things -->
<include href="standardButtons.xal" xmlns="http://www.openxal.org/xinclude"/>
- </xal:verticalPanel>
+ </xal:verticalBoxPane>
</xm:append>
</xm:modifications>
</xal>
Modified: incubator/xap/trunk/src/xap/bridges/dojo/MenuBarItemBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/MenuBarItemBridge.js?view=diff&rev=473409&r1=473408&r2=473409
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/MenuBarItemBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/MenuBarItemBridge.js Fri Nov 10 10:21:30 2006
@@ -84,7 +84,7 @@
xap.bridges.dojo.MenuBarItemBridge.prototype.getNewAllowedAttributes = function(){
- return ["text", "disabled", "visible"];
+ return ["text", "enabled", "visible"];
}
@@ -97,6 +97,9 @@
if (peer.labelNode.childNodes[0].childNodes[0]){
peer.labelNode.childNodes[0].childNodes[0].nodeValue = text;
}
+ if (peer.labelNode.childNodes[0].childNodes[1]){
+ peer.labelNode.childNodes[0].childNodes[1].nodeValue = text;
+ }
if (peer.labelShadowNode){
peer.labelShadowNode.childNodes[0].nodeValue = text;
@@ -144,9 +147,9 @@
}
}
-xap.bridges.dojo.MenuBarItemBridge.prototype.setDisabledAttribute = function(value) {
+xap.bridges.dojo.MenuBarItemBridge.prototype.setEnabledAttribute = function(value) {
var peer = this.getPeer();
- peer.enabled = value == "true" ? false : true;
+ peer.enabled = value == "true" ? true : false;
this._enable();
}
Modified: incubator/xap/trunk/src/xap/bridges/dojo/MenuItemBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/MenuItemBridge.js?view=diff&rev=473409&r1=473408&r2=473409
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/MenuItemBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/MenuItemBridge.js Fri Nov 10 10:21:30 2006
@@ -66,7 +66,7 @@
xap.bridges.dojo.MenuItemBridge.prototype.getNewAllowedAttributes = function(){
- return ["text", "visible"];
+ return ["text", "enabled", "visible"];
}
@@ -78,11 +78,13 @@
return;
}
-
if (peer.labelNode.childNodes[0].childNodes[0]){
peer.labelNode.childNodes[0].childNodes[0].nodeValue = text;
+ }
+ if (peer.labelNode.childNodes[0].childNodes[1]){
+ peer.labelNode.childNodes[0].childNodes[1].nodeValue = text;
}
-
+
if (peer.labelShadowNode){
peer.labelShadowNode.childNodes[0].nodeValue = text;
}
@@ -112,12 +114,12 @@
}
}
-xap.bridges.dojo.MenuItemBridge.prototype.setDisabledAttribute = function( disabled) {
+xap.bridges.dojo.MenuItemBridge.prototype.setEnabledAttribute = function(enabled) {
var peer = this.getPeer();
- if (disabled == "true") {
- peer.setDisabled(true);
- } else {
+ if (enabled == "true") {
peer.setDisabled(false);
+ } else {
+ peer.setDisabled(true);
}
}