Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 07:49:13 +0000 (15:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 07:49:13 +0000 (15:49 +0800)
1  2 
blocks/navigation/yui/navigation/navigation.js

@@@ -456,11 -471,9 +473,10 @@@ BRANCH.prototype = 
                          this.addChild(object.children[i]);
                      }
                  }
 -                if ((this.get('type') == NODETYPE.CATEGORY || this.get('type') == NODETYPE.ROOTNODE) && coursecount >= M.block_navigation.courselimit) {
 +                if ((this.get('type') == NODETYPE.CATEGORY || this.get('type') == NODETYPE.ROOTNODE || this.get('type') == NODETYPE.MYCATEGORY)
 +                    && coursecount >= M.block_navigation.courselimit) {
                      this.addViewAllCoursesChild(this);
                  }
-                 this.get('tree').toggleExpansion({target:this.node});
                  return true;
              }
          } catch (ex) {