forked from 0x2620/oxjs
revised controls (find, volume)
This commit is contained in:
parent
6bc75c8627
commit
117c6bff62
4 changed files with 553 additions and 298 deletions
|
|
@ -733,6 +733,11 @@ Ox.Input = function(options, self) {
|
|||
}
|
||||
};
|
||||
|
||||
that.blurInput = function() {
|
||||
self.$input.blur();
|
||||
return that;
|
||||
};
|
||||
|
||||
that.focusInput = function(select) {
|
||||
select = Ox.isUndefined(select) ? true : select;
|
||||
self.$input.focus();
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
|
|||
self = self || {};
|
||||
var that = Ox.Element({}, self)
|
||||
.defaults({
|
||||
duration: 0,
|
||||
duration: 1920,
|
||||
editing: false,
|
||||
getTimelineURL: null,
|
||||
'in': 0,
|
||||
|
|
@ -120,7 +120,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
|
|||
});
|
||||
});
|
||||
});
|
||||
} else if (image == 'selection') {
|
||||
} else if (image == 'selection' && self.options.out > self.options['in']) {
|
||||
var left = Math.round(
|
||||
self.options['in'] * self.options.width / self.options.duration
|
||||
),
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue