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

remove Ox.each, , $.extend, $.map and $.merge

Browse source
This commit is contained in:
rolux 2011-09-17 20:36:09 +02:00
commit 4cc754a28d
35 changed files with 104 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -262,7 +262,7 @@ Ox.VideoEditor = function(options, self) {
self.options.layers.forEach(function(layer, i) {
self.$annotationPanel[i] = Ox.AnnotationPanel(
$.extend({
Ox.extend({
width: self.options.annotationSize
}, layer)
)
@ -707,11 +707,11 @@ Ox.VideoEditor = function(options, self) {
if (type == 'cut') {
positions = self.options.cuts;
} else if (type == 'result') {
positions = $.map(self.results, function(v, i) {
positions = self.results.map(function(v) {
return v['in'];
});
} else if (type == 'subtitle') {
positions = $.map(self.options.subtitles, function(v, i) {
positions = self.options.subtitles.map(function(v) {
return v['in'];
});
}