MDL-35590 block_navigation: Set attribute on node creation

Otherwise we would need to unescape href and title.
moodle · Jan 29, 2016 · ed654d4 · ed654d4
1 parent a057ba5
commit ed654d4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/blocks/navigation/amd/build/ajax_response_renderer.min.js b/blocks/navigation/amd/build/ajax_response_renderer.min.js
diff --git a/blocks/navigation/amd/src/ajax_response_renderer.js b/blocks/navigation/amd/src/ajax_response_renderer.js
@@ -86,9 +86,7 @@ define(['jquery'], function($) {
             }
 
             if (node.link) {
-                var link = $('<a></a>');
-                link.attr('title', node.title);
-                link.attr('href', node.link);
+                var link = $('<a title="' + node.title + '" href="' + node.link + '"></a>');
 
                 if (icon) {
                     link.append(icon);

diff --git a/blocks/settings/amd/build/settingsblock.min.js b/blocks/settings/amd/build/settingsblock.min.js
diff --git a/blocks/settings/amd/src/settingsblock.js b/blocks/settings/amd/src/settingsblock.js
@@ -26,7 +26,7 @@ define(['jquery', 'core/tree'], function($, Tree) {
         init: function(siteAdminNodeId) {
             var adminTree = new Tree(".block_settings .block_tree");
             if (siteAdminNodeId) {
-                var siteAdminNode = adminTree.treeRoot.find('#' + siteAdminNodeId)
+                var siteAdminNode = adminTree.treeRoot.find('#' + siteAdminNodeId);
                 var siteAdminLink = siteAdminNode.children('a').first();
                 siteAdminLink.replaceWith('<span tabindex="0">' + siteAdminLink.html() + '</span>');
             }

diff --git a/lib/amd/build/tree.min.js b/lib/amd/build/tree.min.js