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

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

@ -59,7 +59,7 @@ Ox.AnnotationPanel = function(options, self) {
.addClass('OxAnnotation OxEditable OxTarget')
.html(Ox.parseHTML(data.value));
},
items: $.map(self.options.items, function(v, i) {
items: self.options.items.map(function(v, i) {
return {
id: v.id || i + '',
value: v.value

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

@ -34,7 +34,7 @@ Ox.BlockTimeline = function(options, self) {
}
});
$.extend(self, {
Ox.extend(self, {
$images: [],
$lines: [],
$markerPoint: [],
@ -157,7 +157,7 @@ Ox.BlockTimeline = function(options, self) {
context = canvas.getContext('2d'),
imageData = context.createImageData(width, height),
data = imageData.data,
points = $.map(self.options.points, function(v, i) {
points = self.options.points.map(function(v, i) {
return Math.round(v) + i;
}),
top = 0,

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

@ -35,7 +35,7 @@ Ox.LargeTimeline = function(options, self) {
drag: drag
});
$.extend(self, {
Ox.extend(self, {
$cuts: [],
$markerPoint: [],
$subtitles: [],

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

@ -34,7 +34,7 @@ Ox.SmallTimeline = function(options, self) {
}
});
$.extend(self, {
Ox.extend(self, {
$images: [],
$markerPoint: [],
$subtitles: [],

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'];
});
}