Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 9 Apr 2013 06:21:22 +0000 (14:21 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 9 Apr 2013 06:21:22 +0000 (14:21 +0800)
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-coverage.js
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-min.js
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation.js
blocks/navigation/yui/src/navigation/js/navigation.js

index 5ec86de..9591a00 100644 (file)
Binary files a/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-coverage.js and b/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-coverage.js differ
index 9ba9df7..b1ec0d8 100644 (file)
Binary files a/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js and b/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js differ
index 2f09116..7f88b9c 100644 (file)
Binary files a/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-min.js and b/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-min.js differ
index 9ba9df7..b1ec0d8 100644 (file)
Binary files a/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation.js and b/blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation.js differ
index 71f2167..a6d0ed0 100644 (file)
@@ -361,10 +361,15 @@ BRANCH.prototype = {
         }
 
         if (!link) {
+            var branchspan = Y.Node.create('<span></span>');
             if (branchicon) {
-                branchp.appendChild(branchicon);
+                branchspan.appendChild(branchicon);
             }
-            branchp.append(this.get('name'));
+            branchspan.append(this.get('name'));
+            if (this.get('hidden')) {
+                branchspan.addClass('dimmed_text');
+            }
+            branchp.appendChild(branchspan);
         } else {
             var branchlink = Y.Node.create('<a title="'+this.get('title')+'" href="'+link+'"></a>');
             if (branchicon) {