L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46491-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2014-12-16 00:36:18 +01:00
parent b2a786539e fde7c5f003
commit 5e425cc89b
4 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-debug.js
Vendored
+11 -4
View File
@@ -627,10 +627,17 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
// If activity is conditionally hidden, then don't toggle.
if (!dimarea.hasClass(CSS.CONDITIONALHIDDEN)) {
// Change the UI.
dimarea.toggleClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).toggleClass(CSS.DIMMEDTEXT);
if (action === 'hide') {
// Change the UI.
dimarea.addClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).addClass(CSS.DIMMEDTEXT);
} else {
// Change the UI.
dimarea.removeClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).removeClass(CSS.DIMMEDTEXT);
}
}
// Toggle availablity info for conditional activities.
if (availabilityinfo) {
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes.js
Vendored
+11 -4
View File
@@ -627,10 +627,17 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
// If activity is conditionally hidden, then don't toggle.
if (!dimarea.hasClass(CSS.CONDITIONALHIDDEN)) {
// Change the UI.
dimarea.toggleClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).toggleClass(CSS.DIMMEDTEXT);
if (action === 'hide') {
// Change the UI.
dimarea.addClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).addClass(CSS.DIMMEDTEXT);
} else {
// Change the UI.
dimarea.removeClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).removeClass(CSS.DIMMEDTEXT);
}
}
// Toggle availablity info for conditional activities.
if (availabilityinfo) {
course/yui/src/toolboxes/js/resource.js
Vendored
+11 -4
View File
@@ -423,10 +423,17 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
// If activity is conditionally hidden, then don't toggle.
if (!dimarea.hasClass(CSS.CONDITIONALHIDDEN)) {
// Change the UI.
dimarea.toggleClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).toggleClass(CSS.DIMMEDTEXT);
if (action === 'hide') {
// Change the UI.
dimarea.addClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).addClass(CSS.DIMMEDTEXT);
} else {
// Change the UI.
dimarea.removeClass(toggleclass);
// We need to toggle dimming on the description too.
activity.all(SELECTOR.CONTENTAFTERLINK).removeClass(CSS.DIMMEDTEXT);
}
}
// Toggle availablity info for conditional activities.
if (availabilityinfo) {