Compare commits
No commits in common. "543045ae6c7dffe7b0ad567a385a5d235b9aa9e5" and "7601eeb28a1704d750d2398e018d08ab561009f7" have entirely different histories.
543045ae6c
...
7601eeb28a
3 changed files with 9 additions and 11 deletions
|
|
@ -1041,7 +1041,7 @@ Ox.MapEditor = function(options, self) {
|
|||
var isResult = place && place.id[0] == '_',
|
||||
isUndefined = !!self.options.selected
|
||||
&& !self.$list.value(self.options.selected, 'type');
|
||||
self.selectedPlace = place && place.id ? place.id : '';
|
||||
self.selectedPlace = place.id || '';
|
||||
if (isResult && isUndefined) {
|
||||
Ox.print('place.id', place.id, 'self.options.selected', self.options.selected, 'type', self.$list.value(self.options.selected));
|
||||
// define undefined place
|
||||
|
|
|
|||
|
|
@ -1794,23 +1794,21 @@ Ox.VideoPlayer = function(options, self) {
|
|||
function goToNext(type, direction) {
|
||||
// type can be 'chapter' or 'result'
|
||||
var position, positions;
|
||||
if (type == 'chapter' && self.options.chapters) {
|
||||
if (type == 'chapter') {
|
||||
positions = self.options.chapters.map(function(chapter) {
|
||||
return chapter.position;
|
||||
});
|
||||
} else if (type == 'result' && self.results) {
|
||||
} else if (type == 'result') {
|
||||
positions = Ox.unique(self.results.map(function(result) {
|
||||
return result['in'];
|
||||
}));
|
||||
}
|
||||
if (positions) {
|
||||
position = Ox.nextValue(positions, self.options.position, direction);
|
||||
setPosition(position);
|
||||
that.triggerEvent('position', {
|
||||
position: self.options.position
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function goToPoint() {
|
||||
that.triggerEvent('gotopoint');
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@ Ox.VideoPlayerPanel = function(options, self) {
|
|||
}
|
||||
|
||||
function getAnnotations() {
|
||||
return !self.options.layers ? [] : Ox.flatten(self.options.layers.map(function(layer) {
|
||||
return Ox.flatten(self.options.layers.map(function(layer) {
|
||||
return layer.items.map(function(item) {
|
||||
return {id: item.id, 'in': item['in'], out: item.out, text: item.value};
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue