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

form elements rewrite, part 2

Browse source
This commit is contained in:
rolux 2011-12-21 21:03:52 +05:30
commit 074902d079
33 changed files with 163 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -435,7 +435,7 @@ Ox.VideoEditor = function(options, self) {
width: 256
}).open();
} else if (id == 'resolution') {
self.options.resolution = parseInt(data.checked[0].id);
self.options.resolution = parseInt(value);
self.$player[0].options({resolution: self.options.resolution});
}
}

8
source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js
View file

@ -261,9 +261,7 @@ Ox.VideoEditorPlayer = function(options, self) {
self.options.position = data.position;
setMarkers();
setSubtitle();
self.$positionInput.options({
value: Ox.formatDuration(self.options.position, 3)
});
self.$positionInput.value(Ox.formatDuration(self.options.position, 3));
that.triggerEvent('playing', {
position: self.options.position
});
@ -322,9 +320,7 @@ Ox.VideoEditorPlayer = function(options, self) {
}
setMarkers();
setSubtitle();
self.$positionInput.options({
value: Ox.formatDuration(self.options.position, 3)
});
self.$positionInput.value(Ox.formatDuration(self.options.position, 3));
}
function setSubtitle() {

19
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -658,9 +658,7 @@ Ox.VideoPlayer = function(options, self) {
}
self.$position.hide();
self.$positionInput
.options({
value: formatPosition()
})
.value(formatPosition())
.show()
.focusInput(false);
}
@ -1019,6 +1017,7 @@ Ox.VideoPlayer = function(options, self) {
.appendTo(self.$volume);
self.$volumeInput = Ox.Range({
changeOnDrag: true,
max: 1,
min: 0,
step: 0.001,
@ -1916,9 +1915,7 @@ Ox.VideoPlayer = function(options, self) {
showVolume();
self.options.volume = Ox.limit(self.options.volume + num, 0, 1);
setVolume(self.options.volume);
self.$volumeInput && self.$volumeInput.options({
value: self.options.volume
});
self.$volumeInput && self.$volumeInput.value(self.options.volume);
}
function setVolume(volume) {
@ -2030,8 +2027,8 @@ Ox.VideoPlayer = function(options, self) {
function submitPositionInput() {
self.$positionInput.hide();
self.$position.html('').show();
//Ox.Log('Video', '###', parsePositionInput(self.$positionInput.options('value')))
setPosition(parsePositionInput(self.$positionInput.options('value')));
//Ox.Log('Video', '###', parsePositionInput(self.$positionInput.value()))
setPosition(parsePositionInput(self.$positionInput.value()));
if (self.playOnSubmit) {
togglePaused();
self.$video.play();
@ -2143,9 +2140,9 @@ Ox.VideoPlayer = function(options, self) {
self.$volumeButton && self.$volumeButton.attr({
src: getVolumeImageURL()
});
self.$volumeInput && self.$volumeInput.options({
value: self.options.muted ? 0 : self.options.volume
});
self.$volumeInput && self.$volumeInput.value(
self.options.muted ? 0 : self.options.volume
);
self.$volumeValue && self.$volumeValue.html(
self.options.muted ? 0 : Math.round(self.options.volume * 100)
);