r904 - in branches/experimental: tests/visual/menu ui
Author: paul.bakaus
Date: Tue Nov 11 03:51:26 2008
New Revision: 904
Modified:
branches/experimental/tests/visual/menu/menu.html
branches/experimental/ui/ui.menu.js
Log:
menu: renamed 'select' to 'choose', made the action automatically close the
menu (not in the case of drilldown or static)
Modified: branches/experimental/tests/visual/menu/menu.html
==============================================================================
--- branches/experimental/tests/visual/menu/menu.html (original)
+++ branches/experimental/tests/visual/menu/menu.html Tue Nov 11 03:51:26
2008
@@ -35,8 +35,8 @@
mode: 'static',
type: 'drilldown',
//selectCategories: true,
- select: function(e, ui) {
- //console.log('Selected item ', ui.item);
+ choose: function(e, ui) {
+ console.log('Selected item ', ui.item);
},
browse: function(e, ui) {
//console.log('Browsing item ', ui.item);
@@ -46,8 +46,8 @@
$('button').menu({
items: '#items2',
mode: 'dropdown',
- select: function(e, ui) {
- //console.log('Selected item ', ui.item);
+ choose: function(e, ui) {
+ console.log('Selected item ', ui.item);
},
browse: function(e, ui) {
//console.log('Browsing item ', ui.item);
@@ -65,8 +65,8 @@
mode: 'context',
appendTo: 'element',
direction: 'left above',
- select: function(e, ui) {
- //console.log('Selected item ', ui.item);
+ choose: function(e, ui) {
+ console.log('Selected item ', ui.item);
},
browse: function(e, ui) {
//console.log('Browsing item ', ui.item);
Modified: branches/experimental/ui/ui.menu.js
==============================================================================
--- branches/experimental/ui/ui.menu.js (original)
+++ branches/experimental/ui/ui.menu.js Tue Nov 11 03:51:26 2008
@@ -166,7 +166,7 @@
return false;
}
else {
- self._trigger('select', e, { item: $(this.parentNode) });
+ self._choose($(this.parentNode), e);
return false;
};
});
@@ -233,7 +233,7 @@
newCrumb.show().find('a').bind('click.menu', function(e){
if ($(this).parent().is('.ui-menu-current-crumb')){
- self._trigger('select', e, { item: $(this.parentNode) });
+ self._choose($(this.parentNode), e);
return false;
}
else {
@@ -323,7 +323,7 @@
$('a', this.menu).bind('click', function(e){
- self._trigger('select', e, { item: $(this.parentNode) });
+ self._choose($(this.parentNode), e);
return false;
});
@@ -372,12 +372,22 @@
close: function(e) {
+ if(this.options.type == 'drilldown' && this.options.mode == 'static')
+ return;
+
this.menu.hide();
for (var i=0; i < $.ui.menu.manager.length; i++) {
if($.ui.menu.manager[i] == this) $.ui.menu.manager.splice(i,1);
};
this.visible = false;
this._trigger('close', e, { });
+
+ },
+
+ _choose: function(item, e) {
+
+ this.close(e);
+ this._trigger('choose', e, { item: item });
}