mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2014-02-10 11:32:13 +13:00
commit e9eb744f6d
5 changed files with 92 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/rest.php
View File

@ -146,7 +146,7 @@ switch($requestmethod) {
}
$isvisible = moveto_module($cm, $section, $beforemod);
echo json_encode(array('visible' => $isvisible));
echo json_encode(array('visible' => (bool) $isvisible));
break;
case 'gettitle':
require_capability('moodle/course:manageactivities', $modcontext);

43
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-debug.js vendored
View File

@ -863,26 +863,43 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
},
/**
* Set the visibility of the current resource (identified by the element) to match the hidden parameter (this is not
* a toggle).
* Set the visibility of the specified resource to match the visible parameter.
*
* Only changes the visibility in the browser (no ajax update).
* Note: This is not a toggle function and only changes the visibility
* in the browser (no ajax update is performed).
*
* @method set_visibility_resource_ui
* @param {Object} args An object with 'element' being the A node containing the resource and 'visible' being the
* state that the visibility should be set to.
* @param {object} args An object containing the required information to trigger a change.
* @param {Node} args.element The resource to toggle
* @param {Boolean} args.visible The target visibility
*/
set_visibility_resource_ui: function(args) {
var element = args.element,
shouldbevisible = args.visible,
buttonnode = element.one(SELECTOR.SHOW),
visible = (buttonnode === null),
action = 'show';
if (visible) {
buttonnode = element.one(SELECTOR.HIDE);
action = 'hide';
buttonnode = element.one(SELECTOR.HIDE),
// By default we assume that the item is visible and we're going to hide it.
currentVisibility = true,
targetVisibility = false;
if (!buttonnode) {
// If the buttonnode was not found, try to find the HIDE button
// and change the target visibility setting to false.
buttonnode = element.one(SELECTOR.SHOW);
currentVisibility = false;
targetVisibility = true;
}
if (visible !== shouldbevisible) {
if (typeof args.visible !== 'undefined') {
// If we were provided with a visibility argument, use that instead.
targetVisibility = args.visible;
}
// Only trigger a change if necessary.
if (currentVisibility !== targetVisibility) {
var action = 'hide';
if (targetVisibility) {
action = 'show';
}
this.handle_resource_dim(buttonnode, element, action);
}
}

2
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js vendored
View File

File diff suppressed because one or more lines are too long

43
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes.js vendored
View File

@ -863,26 +863,43 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
},
/**
* Set the visibility of the current resource (identified by the element) to match the hidden parameter (this is not
* a toggle).
* Set the visibility of the specified resource to match the visible parameter.
*
* Only changes the visibility in the browser (no ajax update).
* Note: This is not a toggle function and only changes the visibility
* in the browser (no ajax update is performed).
*
* @method set_visibility_resource_ui
* @param {Object} args An object with 'element' being the A node containing the resource and 'visible' being the
* state that the visibility should be set to.
* @param {object} args An object containing the required information to trigger a change.
* @param {Node} args.element The resource to toggle
* @param {Boolean} args.visible The target visibility
*/
set_visibility_resource_ui: function(args) {
var element = args.element,
shouldbevisible = args.visible,
buttonnode = element.one(SELECTOR.SHOW),
visible = (buttonnode === null),
action = 'show';
if (visible) {
buttonnode = element.one(SELECTOR.HIDE);
action = 'hide';
buttonnode = element.one(SELECTOR.HIDE),
// By default we assume that the item is visible and we're going to hide it.
currentVisibility = true,
targetVisibility = false;
if (!buttonnode) {
// If the buttonnode was not found, try to find the HIDE button
// and change the target visibility setting to false.
buttonnode = element.one(SELECTOR.SHOW);
currentVisibility = false;
targetVisibility = true;
}
if (visible !== shouldbevisible) {
if (typeof args.visible !== 'undefined') {
// If we were provided with a visibility argument, use that instead.
targetVisibility = args.visible;
}
// Only trigger a change if necessary.
if (currentVisibility !== targetVisibility) {
var action = 'hide';
if (targetVisibility) {
action = 'show';
}
this.handle_resource_dim(buttonnode, element, action);
}
}

43
course/yui/src/toolboxes/js/resource.js vendored
View File

@ -659,26 +659,43 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
},
/**
* Set the visibility of the current resource (identified by the element) to match the hidden parameter (this is not
* a toggle).
* Set the visibility of the specified resource to match the visible parameter.
*
* Only changes the visibility in the browser (no ajax update).
* Note: This is not a toggle function and only changes the visibility
* in the browser (no ajax update is performed).
*
* @method set_visibility_resource_ui
* @param {Object} args An object with 'element' being the A node containing the resource and 'visible' being the
* state that the visibility should be set to.
* @param {object} args An object containing the required information to trigger a change.
* @param {Node} args.element The resource to toggle
* @param {Boolean} args.visible The target visibility
*/
set_visibility_resource_ui: function(args) {
var element = args.element,
shouldbevisible = args.visible,
buttonnode = element.one(SELECTOR.SHOW),
visible = (buttonnode === null),
action = 'show';
if (visible) {
buttonnode = element.one(SELECTOR.HIDE);
action = 'hide';
buttonnode = element.one(SELECTOR.HIDE),
// By default we assume that the item is visible and we're going to hide it.
currentVisibility = true,
targetVisibility = false;
if (!buttonnode) {
// If the buttonnode was not found, try to find the HIDE button
// and change the target visibility setting to false.
buttonnode = element.one(SELECTOR.SHOW);
currentVisibility = false;
targetVisibility = true;
}
if (visible !== shouldbevisible) {
if (typeof args.visible !== 'undefined') {
// If we were provided with a visibility argument, use that instead.
targetVisibility = args.visible;
}
// Only trigger a change if necessary.
if (currentVisibility !== targetVisibility) {
var action = 'hide';
if (targetVisibility) {
action = 'show';
}
this.handle_resource_dim(buttonnode, element, action);
}
}