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 2007/05/02 03:03:15 UTC
svn commit: r534296 - in /incubator/xap/trunk/codebase/src/xap/bridges/dojo:
MenuItemBridge.js cssOverrides/Menu2.css
Author: mturyn
Date: Tue May 1 20:03:14 2007
New Revision: 534296
URL: http://svn.apache.org/viewvc?view=rev&rev=534296
Log:
1,) MenuItemBridge: "got submenu is present" arrow indicators working (have to tell the widget it will have a submenu on its creation) .
2.) Removed dotted line from Firefox menu item labels.
Modified:
incubator/xap/trunk/codebase/src/xap/bridges/dojo/MenuItemBridge.js
incubator/xap/trunk/codebase/src/xap/bridges/dojo/cssOverrides/Menu2.css
Modified: incubator/xap/trunk/codebase/src/xap/bridges/dojo/MenuItemBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/bridges/dojo/MenuItemBridge.js?view=diff&rev=534296&r1=534295&r2=534296
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/bridges/dojo/MenuItemBridge.js (original)
+++ incubator/xap/trunk/codebase/src/xap/bridges/dojo/MenuItemBridge.js Tue May 1 20:03:14 2007
@@ -48,6 +48,7 @@
xap.bridges.dojo.MenuItemBridge.prototype.init = function() {
+
xap.bridges.dojo.DojoWidgetBridge.prototype.init.call(this);
//add listener last so we don't fire for the initial set
@@ -58,6 +59,20 @@
return "MenuItem2" ;
}
+
+xap.bridges.dojo.MenuItemBridge.prototype.getDefaultPropertyMap = function(){
+ // Tell it if it's going to need a submenu:
+ var map = {} ;
+ if(this.getElement().childNodes.length>0){
+ // Doesn't really matter what we call it at this point:
+ map.submenuId
+ = this.getElement().childNodes[0].getAttribute("id") ;
+ }
+ return map ;
+}
+
+
+
/**
*
@@ -112,7 +127,8 @@
xap.bridges.dojo.MenuItemBridge.prototype.addChild = function(childHandler, index){
var childPeer = childHandler.getPeer();
if (childPeer instanceof dojo.widget.PopupMenu2){
- this.getPeer().submenuId = childHandler.getElement().getAttribute("id");
+ this.getPeer().submenuId
+ = childPeer.widgetId ;
}
}
Modified: incubator/xap/trunk/codebase/src/xap/bridges/dojo/cssOverrides/Menu2.css
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/bridges/dojo/cssOverrides/Menu2.css?view=diff&rev=534296&r1=534295&r2=534296
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/bridges/dojo/cssOverrides/Menu2.css (original)
+++ incubator/xap/trunk/codebase/src/xap/bridges/dojo/cssOverrides/Menu2.css Tue May 1 20:03:14 2007
@@ -42,6 +42,8 @@
.dojoMenuItem2Label {
position: relative;
vertical-align: middle;
+ /* Avoids dotted box under Firefox; see note for dojoMenuBar2 */
+ -moz-outline-width:0px;
}
.dojoMenuItem2Accel {