moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-35664-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Browse source
This commit is contained in:
Sam Hemelryk 2012-10-16 10:42:42 +08:00
commit 52d2556ee5
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
repository/filepicker.js
View file

@ -16,6 +16,7 @@
* this.viewmode, store current view mode
* this.pathbar, reference to the Node with path bar
* this.pathnode, a Node element representing one folder in a path bar (not attached anywhere, just used for template)
* this.currentpath, the current path in the repository (or last requested path)
*
* Filepicker options:
* =====
@ -39,7 +40,7 @@
* this.filelist, cached filelist
* this.pages
* this.page
* this.filepath, current path
* this.filepath, current path (each element of the array is a part of the breadcrumb)
* this.logindata, cached login form
*/
@ -932,6 +933,7 @@ M.core_filepicker.init = function(Y, options) {
// save current path and filelist (in case we want to jump to other viewmode)
this.filepath = e.node.origpath;
this.filelist = e.node.origlist;
this.currentpath = e.node.path;
this.print_path();
this.content_scrolled();
}
@ -967,7 +969,6 @@ M.core_filepicker.init = function(Y, options) {
if (this.active_repo.dynload) {
this.list({'path':node.path});
} else {
this.filepath = node.path;
this.filelist = node.children;
this.view_files();
}
@ -1002,7 +1003,6 @@ M.core_filepicker.init = function(Y, options) {
if (this.active_repo.dynload) {
this.list({'path':node.path});
} else {
this.filepath = node.path;
this.filelist = node.children;
this.view_files();
}
@ -1022,9 +1022,13 @@ M.core_filepicker.init = function(Y, options) {
}
this.active_repo.nextpagerequested = true;
var nextpage = this.active_repo.page+1;
var args = {page:nextpage, repo_id:this.active_repo.id, path:this.active_repo.path};
var args = {
page: nextpage,
repo_id: this.active_repo.id,
};
var action = this.active_repo.issearchresult ? 'search' : 'list';
this.request({
path: this.currentpath,
scope: this,
action: action,
client_id: this.options.client_id,
@ -1032,10 +1036,20 @@ M.core_filepicker.init = function(Y, options) {
params: args,
callback: function(id, obj, args) {
var scope = args.scope;
// check that we are still in the same repository and are expecting this page
// Check that we are still in the same repository and are expecting this page. We have no way
// to compare the requested page and the one returned, so we assume that if the last chunk
// of the breadcrumb is similar, then we probably are on the same page.
var samepage = true;
if (obj.path && scope.filepath) {
var pathbefore = scope.filepath[scope.filepath.length-1];
var pathafter = obj.path[obj.path.length-1];
if (pathbefore.path != pathafter.path) {
samepage = false;
}
}
if (scope.active_repo.hasmorepages && obj.list && obj.page &&
obj.repo_id == scope.active_repo.id &&
obj.page == scope.active_repo.page+1 && obj.path == scope.path) {
obj.page == scope.active_repo.page+1 && samepage) {
scope.parse_repository_options(obj, true);
scope.view_files(obj.list)
}
@ -1564,6 +1578,10 @@ M.core_filepicker.init = function(Y, options) {
if (!args.repo_id) {
args.repo_id = this.active_repo.id;
}
if (!args.path) {
args.path = '';
}
this.currentpath = args.path;
this.request({
action: 'list',
client_id: this.options.client_id,
@ -1707,7 +1725,7 @@ M.core_filepicker.init = function(Y, options) {
toolbar.one('.fp-tb-refresh').one('a,button').on('click', function(e) {
e.preventDefault();
if (!this.active_repo.norefresh) {
this.list();
this.list({ path: this.currentpath });
}
}, this);
toolbar.one('.fp-tb-search form').