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

merge updates in VideoEditor, AnnotationsPanel, Editable, Input, etc

Browse source
This commit is contained in:
rolux 2012-01-04 13:15:48 +05:30
commit 4ca01b2bfa
8 changed files with 279 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

19
source/Ox/js/Array.js
View file

@ -1,19 +1,19 @@
'use strict';
/*@
Ox.compact <f> Returns an array w/o <code>null</code> or <code>undefined</code>
Ox.compact <f> Returns an array w/o <code>undefined</code> values
> Ox.compact([null,,1,,2,,3])
[1, 2, 3]
@*/
Ox.compact = function(arr) {
return Ox.map(arr, function(val) {
return Ox.isUndefined(val) ? null : val;
return arr.filter(function(val) {
return !Ox.isNull(val) && !Ox.isUndefined(val);
});
};
/*@
Ox.flatten <f> Flattens an array
Ox.flatten <f> Flattens an array
> Ox.flatten([1, [2, [3], 2], 1])
[1, 2, 3, 2, 1]
@*/
@ -40,11 +40,11 @@ Ox.merge <f> Merges an array with one or more other arrays
[1, 2, 3, 2, 1]
@*/
Ox.merge = function(arr) {
arr = Ox.isArray(arr) ? arr : [arr];
arr = Ox.toArray(arr);
Ox.forEach(Array.prototype.slice.call(arguments, 1), function(arg) {
Ox.isArray(arg) ? Ox.forEach(arg, function(val) {
Ox.forEach(Ox.toArray(arg), function(val) {
arr.push(val);
}) : arr.push(arg);
});
});
return arr;
};
@ -98,10 +98,9 @@ Ox.unique <f> Returns an array without duplicate values
> Ox.unique([NaN, NaN])
[]
@*/
Ox.unique = function(arr) {
return Ox.map(arr, function(val, i) {
return arr.indexOf(val) == i ? val : null;
return Ox.filter(arr, function(val, i) {
return arr.indexOf(val) == i;
});
};