sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

allow menu item to trigger native file dialog (see demo, fixes #691)

Browse source
This commit is contained in:
rlx 2012-03-24 10:13:33 +00:00
commit df03bf1841
6 changed files with 246 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/Ox.UI/js/Menu/Ox.Menu.js
View file

@ -116,7 +116,7 @@ Ox.Menu = function(options, self) {
}
}
function clickItem(position) {
function clickItem(position, files) {
var item = that.items[position],
group = item.options('group'),
menu = self.options.mainmenu || self.options.parent || that,
@ -156,10 +156,10 @@ Ox.Menu = function(options, self) {
});
}
} else {
menu.triggerEvent('click', {
menu.triggerEvent('click', Ox.extend({
id: item.options('id'),
title: Ox.stripTags(item.options('title')[0])
});
}, files ? {files: files} : {}));
}
if (item.options('title').length == 2) {
item.toggleTitle();
@ -236,10 +236,14 @@ Ox.Menu = function(options, self) {
var item,
position,
$target = $(event.target),
$parent = $target.parent();
$parent = $target.parent(),
$grandparent = $parent.parent();
if ($parent.is('.OxCell')) {
$target = $parent;
$parent = $target.parent();
} else if ($grandparent.is('.OxCell')) {
$target = $grandparent;
$parent = $target.parent();
}
if ($target.is('.OxCell')) {
position = $parent.data('position');
@ -617,6 +621,10 @@ Ox.Menu = function(options, self) {
}
};
that.clickItem = function(position, files) {
clickItem(position, files);
};
/*@
getItem <f>
@*/

25
source/Ox.UI/js/Menu/Ox.MenuItem.js
View file

@ -28,7 +28,6 @@ Ox.MenuItem = function(options, self) {
bind: [], // fixme: what's this?
checked: null,
disabled: false,
file: false,
group: '',
icon: '',
id: '',
@ -38,6 +37,7 @@ Ox.MenuItem = function(options, self) {
menu: null, // fixme: is passing the menu to 100s of menu items really memory-neutral?
position: 0,
title: [],
type: ''
})
.options(Ox.extend(Ox.clone(options), {
keyboard: parseKeyboard(options.keyboard || self.defaults.keyboard),
@ -55,7 +55,6 @@ Ox.MenuItem = function(options, self) {
self.options.checked = false;
}
// construct
that.append(
that.$status = $('<td>')
.addClass('OxCell OxStatus')
@ -79,13 +78,25 @@ Ox.MenuItem = function(options, self) {
: {}
)
.html(
Ox.isString(self.options.title[0])
? self.options.title[0]
: $('<div>').html(self.options.title[0]).html()
self.options.file
?
Ox.FileButton(Ox.extend(Ox.clone(self.options.file), {
title: self.options.title[0],
width: self.options.file.width
})).bindEvent({
click: function(data) {
self.options.menu.clickItem(self.options.position, data.files);
}
})
: (
Ox.isString(self.options.title[0])
? self.options.title[0]
: $('<div>').html(self.options.title[0]).html()
)
)
)
.append(
$('<td>')
that.$modifiers = $('<td>')
.addClass('OxCell OxModifiers')
.html(
self.options.keyboard.modifiers.map(function(modifier) {
@ -94,7 +105,7 @@ Ox.MenuItem = function(options, self) {
)
)
.append(
$('<td>')
that.$key = $('<td>')
.addClass(
'OxCell Ox' + (self.options.items.length ? 'Submenu' : 'Key')
)