merging changes

This commit is contained in:
rolux 2011-05-11 15:55:15 +02:00
commit e9669315de

View file

@ -3,14 +3,14 @@ Ox.load('UI', {
theme: 'classic' theme: 'classic'
}, function() { }, function() {
Ox.Theme('classic'); Ox.Theme('classic');
$.getJSON(Ox.UI.PATH + 'json/Ox.UI.json', function(files) {
Ox.DocPanel({ Ox.DocPanel({
files: [ files: Ox.merge([
'Ox.js', 'Ox.js',
'Ox.Geo/Ox.Geo.js', 'Ox.Geo/Ox.Geo.js',
'Ox.UI/js/Map/Ox.Map.js', ], files.filter(function(file) {
'Ox.UI/js/Core/Ox.Element.js', return Ox.endsWith(file, '.js');
'Ox.UI/js/Core/Ox.JQueryElement.js' })),
],
getModule: function(item) { getModule: function(item) {
var file = item.file.replace(Ox.PATH, ''); var file = item.file.replace(Ox.PATH, '');
return file == 'Ox.js' ? 'Ox' : file.split('/')[0]; return file == 'Ox.js' ? 'Ox' : file.split('/')[0];
@ -22,4 +22,5 @@ Ox.load('UI', {
path: Ox.PATH path: Ox.PATH
}) })
.appendTo(Ox.UI.$body); .appendTo(Ox.UI.$body);
});
}); });