Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle

This commit is contained in:
Aparup Banerjee 2013-04-09 14:21:22 +08:00
commit eeb47dbd30
5 changed files with 139 additions and 115 deletions

View File

@ -363,10 +363,15 @@ BRANCH.prototype = {
} }
if (!link) { if (!link) {
var branchspan = Y.Node.create('<span></span>');
if (branchicon) { 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 { } else {
var branchlink = Y.Node.create('<a title="'+this.get('title')+'" href="'+link+'"></a>'); var branchlink = Y.Node.create('<a title="'+this.get('title')+'" href="'+link+'"></a>');
if (branchicon) { if (branchicon) {

View File

@ -363,10 +363,15 @@ BRANCH.prototype = {
} }
if (!link) { if (!link) {
var branchspan = Y.Node.create('<span></span>');
if (branchicon) { 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 { } else {
var branchlink = Y.Node.create('<a title="'+this.get('title')+'" href="'+link+'"></a>'); var branchlink = Y.Node.create('<a title="'+this.get('title')+'" href="'+link+'"></a>');
if (branchicon) { if (branchicon) {

View File

@ -361,10 +361,15 @@ BRANCH.prototype = {
} }
if (!link) { if (!link) {
var branchspan = Y.Node.create('<span></span>');
if (branchicon) { 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 { } else {
var branchlink = Y.Node.create('<a title="'+this.get('title')+'" href="'+link+'"></a>'); var branchlink = Y.Node.create('<a title="'+this.get('title')+'" href="'+link+'"></a>');
if (branchicon) { if (branchicon) {