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

add images, fix css

Browse source
This commit is contained in:
rlx 2011-03-07 22:49:03 +00:00
parent f8485f0874
commit 027a4b85f6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/css/ox.ui.css
View file

@ -1500,7 +1500,7 @@ Video
.OxVideoPlayer > .OxBar .OxButton, .OxVideoPlayer > .OxBar .OxButton,
.OxVideoPlayer > .OxBar .OxInput, .OxVideoPlayer > .OxBar .OxInput,
.OxVideoPlayer > .OxBar .OxLabel { .OxVideoPlayer > .OxBar .OxLabel {
padding: 0; //padding: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
-webkit-border-radius: 0; -webkit-border-radius: 0;
} }

7
build/js/ox.ui.js
View file

@ -35,6 +35,10 @@ requires
vertical: ['top', 'bottom', 'left', 'right'] vertical: ['top', 'bottom', 'left', 'right']
}, },
getImagePath: function(filename) { getImagePath: function(filename) {
// fixme: not the best idea to do this here
if (filename == 'symbolPlay.svg') {
filename = 'symbolRight.svg';
}
return Ox.UI.PATH + filename.split('.').pop() + return Ox.UI.PATH + filename.split('.').pop() +
'/ox.ui.' + Ox.UI.theme() + '/' + filename; '/ox.ui.' + Ox.UI.theme() + '/' + filename;
}, },
@ -13713,7 +13717,6 @@ requires
} }
lines = Math.ceil(self.options.duration / size.timeline[1].width); lines = Math.ceil(self.options.duration / size.timeline[1].width);
height = getHeight(); height = getHeight();
//Ox.print('lines', lines, getHeight(), self.options.height, (scrollbarIsVisible && getHeight() <= self.options.height) ? 'scroll' : 'auto')
self.$editor.css({ self.$editor.css({
overflowY: (scrollbarIsVisible && height <= self.options.height) ? 'scroll' : 'auto' overflowY: (scrollbarIsVisible && height <= self.options.height) ? 'scroll' : 'auto'
}); });
@ -14012,7 +14015,7 @@ requires
.appendTo(that); .appendTo(that);
if (self.options.type == 'play') { if (self.options.type == 'play') {
// fixme: $buttonPlay etc. // fixme: $buttonPlay etc. ?
self.$playButton = new Ox.Button({ self.$playButton = new Ox.Button({
id: self.options.id + 'Play', id: self.options.id + 'Play',
title: [ title: [