0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

fix optionsGroupOffset for multiple groups and seperators

Browse source
This commit is contained in:
j 2012-01-03 13:05:22 +05:30
parent f8895e259c
commit a7b14f9e0a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -287,8 +287,10 @@ Ox.Menu = function(options, self) {
'min' in item ? item.min : 1, 'min' in item ? item.min : 1,
'max' in item ? item.max : 1 'max' in item ? item.max : 1
); );
self.optionGroupOffset[item.group] = i + offset; self.optionGroupOffset[item.group] = offset;
offset += items[i].length - 1; offset += items[i].length;
} else if ('id' in item) {
offset += 1;
} }
}); });
items = Ox.flatten(items); items = Ox.flatten(items);

6
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -447,7 +447,11 @@ Ox.VideoEditor = function(options, self) {
title: 'Keyboard Shortcuts', title: 'Keyboard Shortcuts',
width: 256 width: 256
}).open(); }).open();
} else if (id == 'resolution') { }
},
change: function(data) {
Ox.print('CHANGE', data);
if (data.id == 'resolution') {
self.options.resolution = parseInt(data.checked[0].id); self.options.resolution = parseInt(data.checked[0].id);
self.$player[0].options({resolution: self.options.resolution}); self.$player[0].options({resolution: self.options.resolution});
} }