diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
index 78b27dff..9162905e 100644
--- a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
+++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
@@ -107,7 +107,6 @@ Ox.SmallVideoTimelineImage = function(options, self) {
height: height
})[0],
context = canvas.getContext('2d'),
- Ox.print('WIDTH/HEIGHT', width, height)
imageData = context.createImageData(width, height),
data = imageData.data;
if (image == 'results') {
diff --git a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
index 42c095ea..6c067f87 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js
@@ -177,11 +177,17 @@ Ox.VideoPanelPlayer = function(options, self) {
}
function resizeAnnotations(event, data) {
+ // called on annotations resize
self.options.annotationsSize = data;
- resizeVideoAndControls();
+ self.$video.options({
+ width: getPlayerWidth()
+ });
+ self.$timeline.options({
+ width: getTimelineWidth()
+ });
}
- function resizeendAnnotations(data) {
+ function resizeendAnnotations(event, data) {
self.options.annotationsSize = data;
that.triggerEvent('resizeannotations', {
annotationsSize: self.options.annotationsSize
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index e6ca5dcb..decc41c2 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -852,10 +852,6 @@ Ox.VideoPlayer = function(options, self) {
})
.appendTo(self.$find);
- self.$findInput.children('input').css({
- width: (self.positionWidth - 6) + 'px',
- })
-
self.$clearButton = Ox.Button({
disabled: !self.options.find,
style: 'symbol',
@@ -1042,7 +1038,7 @@ Ox.VideoPlayer = function(options, self) {
};
} else if (element == 'find') {
css = {
- width: Math.min(208, self.width) + 'px'
+ width: Math.min(216, self.width) + 'px'
};
} else if (element == 'loadingIcon') {
css = {
@@ -1164,7 +1160,7 @@ Ox.VideoPlayer = function(options, self) {
}
function getProgressImageURL() {
- Ox.print('---', self.timelineImageWidth)
+ //Ox.print('---', self.timelineImageWidth)
if (!self.timelineImageWidth) return;
var width = self.timelineImageWidth,
height = self.barHeight,
@@ -1234,6 +1230,9 @@ Ox.VideoPlayer = function(options, self) {
.bindEvent({
position: function(data) {
setPosition(data.position, 'timeline');
+ that.triggerEvent('position', {
+ position: self.options.position
+ });
}
});
//Ox.print('??', $timeline.find('.OxInterface'))
@@ -1647,10 +1646,13 @@ Ox.VideoPlayer = function(options, self) {
});
setSize(self.$spaceBottom, getCSS('spaceBottom'), animate);
setSize(self.$find, getCSS('find'), animate, function() {
- Ox.print('FIND......', Math.min(128, self.width - 80))
+ var width = Math.min(128, self.width - 88);
self.$findInput.options({
- width: Math.min(128, self.width - 80)
+ width: width
});
+ self.$findInput.children('input').css({
+ width: (width - 6) + 'px',
+ });
});
setSize(self.$volume, getCSS('volume'), animate, function() {
self.$volumeInput.options({
@@ -1674,14 +1676,14 @@ Ox.VideoPlayer = function(options, self) {
}
function setSubtitleText() {
- Ox.print('setSubTx', self.subtitle, self.options.find)
+ //Ox.print('setSubTx', self.subtitle, self.options.find)
self.$subtitle.html(
self.subtitle ?
Ox.highlight(self.subtitle, self.options.find, 'OxHighlight')
.replace(/\n/g, '
') : '
'
// FIXME: weird bug, only in fullscreen, only in chrome
);
- Ox.print('?!?', self.$subtitle.css('bottom'), self.$subtitle.height())
+ //Ox.print('?!?', self.$subtitle.css('bottom'), self.$subtitle.height())
}
function changeVolumeBy(num) {
@@ -1773,10 +1775,10 @@ Ox.VideoPlayer = function(options, self) {
}
function submitFindInput(value, hasPressedEnter) {
- Ox.print('submitFindInput', value, hasPressedEnter)
+ //Ox.print('submitFindInput', value, hasPressedEnter)
self.options.find = value;
self.results = find(self.options.find);
- Ox.print('results', self.results.length);
+ //Ox.print('results', self.results.length);
if (self.$find) {
self.$results.html(self.results.length);
self.$previousButton.options({
@@ -1820,7 +1822,7 @@ Ox.VideoPlayer = function(options, self) {
function submitPositionInput() {
self.$positionInput.hide();
self.$position.html('').show();
- Ox.print('###', parsePositionInput(self.$positionInput.options('value')))
+ //Ox.print('###', parsePositionInput(self.$positionInput.options('value')))
setPosition(parsePositionInput(self.$positionInput.options('value')));
if (self.playOnSubmit) {
togglePaused();
@@ -2013,7 +2015,6 @@ Ox.VideoPlayer = function(options, self) {
if (key == 'fullscreen') {
toggleFullscreen();
} else if (key == 'height' || key == 'width') {
- Ox.print('!!!!!!!!!!!!!', key, value)
setSizes();
} else if (key == 'in' || key == 'out') {
self.options.paused && setMarkers();