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

merge

Browse source
This commit is contained in:
rolux 2011-12-31 02:10:51 +05:30
commit cd6304d8b7
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
View file

@ -213,12 +213,12 @@ Ox.SmallVideoTimeline = function(options, self) {
self.$image.options({ self.$image.options({
'in': value 'in': value
}); });
setPointMarker('in'); self.options.type == 'editor' && setPointMarker('in');
} else if (key == 'out') { } else if (key == 'out') {
self.$image.options({ self.$image.options({
out: value out: value
}); });
setPointMarker('out'); self.options.type == 'editor' && setPointMarker('out');
} else if (key == 'paused') { } else if (key == 'paused') {
self.$positionMarker[ self.$positionMarker[
self.options.paused ? 'addClass' : 'removeClass' self.options.paused ? 'addClass' : 'removeClass'

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

@ -2337,6 +2337,7 @@ Ox.VideoPlayer = function(options, self) {
setSizes(); setSizes();
} else if (key == 'in' || key == 'out') { } else if (key == 'in' || key == 'out') {
self.options.paused && setMarkers(); self.options.paused && setMarkers();
self.$timeline.options(key, value);
} else if (key == 'muted') { } else if (key == 'muted') {
toggleMuted(); toggleMuted();
} else if (key == 'paused') { } else if (key == 'paused') {

4
tools/build/build.py
View file

@ -92,7 +92,9 @@ def build_oxjs(geo):
data[1].append(js_dir + filename) data[1].append(js_dir + filename)
filenames = filenames[0] + filenames[1] filenames = filenames[0] + filenames[1]
for filename in os.listdir(source_path + js_dir): for filename in os.listdir(source_path + js_dir):
if not filename in filenames: if not filename in filenames \
and not filename.startswith('.') \
and not filename.endswith('~'):
filenames.append(filename) filenames.append(filename)
for filename in filenames: for filename in filenames:
js += read_file(source_path + js_dir + filename) + '\n' js += read_file(source_path + js_dir + filename) + '\n'