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

iFixit · Dec 15, 2014 · 9f0b21e · 9f0b21e
2 parents 9f6658e + f6749ba
commit 9f0b21e
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-debug.js b/course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-debug.js
@@ -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) {

diff --git a/course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js b/course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
diff --git a/course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes.js b/course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes.js
@@ -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) {