Merge branch 'MDL-36548_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

This commit is contained in:
Dan Poltawski 2012-11-20 14:45:04 +08:00
commit 21082f7aed

View file

@ -321,7 +321,6 @@ YUI.add('moodle-core_filepicker', function(Y) {
} }
/** initialize table view */ /** initialize table view */
var initialize_table_view = function() { var initialize_table_view = function() {
var parentid = scope.one('.'+classname).get('id');
var cols = [ var cols = [
{key: "displayname", label: M.str.moodle.name, allowHTML: true, formatter: formatTitle, {key: "displayname", label: M.str.moodle.name, allowHTML: true, formatter: formatTitle,
sortable: true, sortFn: sortFoldersFirst}, sortable: true, sortFn: sortFoldersFirst},
@ -332,8 +331,13 @@ YUI.add('moodle-core_filepicker', function(Y) {
{key: "mimetype", label: M.str.repository.type, allowHTML: true, {key: "mimetype", label: M.str.repository.type, allowHTML: true,
sortable: true, sortFn: sortFoldersFirst} sortable: true, sortFn: sortFoldersFirst}
]; ];
scope.tableview = new Y.DataTable({columns: cols}); for (var k in fileslist) {
scope.tableview.render('#'+parentid); // to speed up sorting and formatting
fileslist[k].displayname = file_get_displayname(fileslist[k]);
fileslist[k].isfolder = file_is_folder(fileslist[k]);
fileslist[k].classname = options.classnamecallback(fileslist[k]);
}
scope.tableview = new Y.DataTable({columns: cols, data: fileslist});
scope.tableview.delegate('click', function (e, tableview) { scope.tableview.delegate('click', function (e, tableview) {
var record = tableview.getRecord(e.currentTarget.get('id')); var record = tableview.getRecord(e.currentTarget.get('id'));
if (record) { if (record) {
@ -353,13 +357,8 @@ YUI.add('moodle-core_filepicker', function(Y) {
} }
/** append items in table view mode */ /** append items in table view mode */
var append_files_table = function() { var append_files_table = function() {
for (var k in fileslist) { var parentnode = scope.one('.'+classname);
// to speed up sorting and formatting scope.tableview.render(parentnode);
fileslist[k].displayname = file_get_displayname(fileslist[k]);
fileslist[k].isfolder = file_is_folder(fileslist[k]);
fileslist[k].classname = options.classnamecallback(fileslist[k]);
}
scope.tableview.addRows(fileslist);
scope.tableview.sortable = options.sortable ? true : false; scope.tableview.sortable = options.sortable ? true : false;
}; };
/** append items in tree view mode */ /** append items in tree view mode */