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

use [].concat, not Ox.merge

Browse source
This commit is contained in:
rolux 2012-05-24 09:45:33 +02:00
commit 1c40fb007b
27 changed files with 87 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/Ox.UI/js/Code/Ox.DocPage.js
View file

@ -204,8 +204,7 @@ Ox.DocPage = function(options, self) {
item[section].forEach(function(v) {
var name = section == 'usage' ?
item.name + v.name + ' </b></code>returns<code> <b>' : null;
$elements = Ox.merge(
$elements,
$elements = $elements.concat(
Ox.map(getItem(v, level + 1, name), function($element) {
return $element.addClass(className);
})

2
source/Ox.UI/js/Code/Ox.DocPanel.js
View file

@ -85,7 +85,7 @@ Ox.DocPanel = function(options, self) {
length = self.options.files.length;
self.options.files.forEach(function(file) {
Ox.doc(self.options.path + file, function(fileItems) {
docItems = Ox.merge(docItems, fileItems);
docItems = docItems.concat(fileItems);
++counter == length && callback(docItems);
});
});