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

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

Browse Source
This commit is contained in:
Aparup Banerjee
2013-04-09 14:21:22 +08:00
parent bb18ec5e5b 938c7dd3bc
commit eeb47dbd30
5 changed files with 139 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-coverage.js
Vendored
+116 -107
View File
File diff suppressed because one or more lines are too long
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-debug.js
Vendored
+7 -2
View File
@@ -363,10 +363,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) {
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
blocks/navigation/yui/build/moodle-block_navigation-navigation/moodle-block_navigation-navigation.js
Vendored
+7 -2
View File
@@ -363,10 +363,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) {
blocks/navigation/yui/src/navigation/js/navigation.js
Vendored
+7 -2
View 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) {