Skip to content

Commit 3610a70

Browse files
committedJul 5, 2017
Auto merge of #42972 - GuillaumeGomez:fix-toggles-rustdoc, r=QuietMisdreavus
Toggle wrappers are now generated correctly Fixes #42674.
2 parents 692b572 + 7327cf7 commit 3610a70

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed
 

‎src/librustdoc/html/static/main.js

+28-21
Original file line numberDiff line numberDiff line change
@@ -1233,21 +1233,24 @@
12331233
onEach(e.getElementsByClassName('associatedconstant'), func);
12341234
});
12351235

1236-
var span = document.createElement('span');
1237-
span.className = 'toggle-label';
1238-
span.style.display = 'none';
1239-
span.innerHTML = ' Expand description';
1240-
1241-
var mainToggle = toggle.cloneNode(true);
1242-
mainToggle.appendChild(span);
1243-
1244-
var wrapper = document.createElement('div');
1245-
wrapper.className = 'toggle-wrapper';
1246-
wrapper.appendChild(mainToggle);
1236+
function createToggle() {
1237+
var span = document.createElement('span');
1238+
span.className = 'toggle-label';
1239+
span.style.display = 'none';
1240+
span.innerHTML = ' Expand description';
1241+
1242+
var mainToggle = toggle.cloneNode(true);
1243+
mainToggle.appendChild(span);
1244+
1245+
var wrapper = document.createElement('div');
1246+
wrapper.className = 'toggle-wrapper';
1247+
wrapper.appendChild(mainToggle);
1248+
return wrapper;
1249+
}
12471250

12481251
onEach(document.getElementById('main').getElementsByClassName('docblock'), function(e) {
12491252
if (e.parentNode.id === "main") {
1250-
e.parentNode.insertBefore(wrapper, e);
1253+
e.parentNode.insertBefore(createToggle(), e);
12511254
}
12521255
});
12531256

@@ -1273,18 +1276,22 @@
12731276
}
12741277
})
12751278

1276-
var span = document.createElement('span');
1277-
span.className = 'toggle-label';
1278-
span.style.display = 'none';
1279-
span.innerHTML = ' Expand attributes';
1280-
toggle.appendChild(span);
1279+
function createToggleWrapper() {
1280+
var span = document.createElement('span');
1281+
span.className = 'toggle-label';
1282+
span.style.display = 'none';
1283+
span.innerHTML = ' Expand attributes';
1284+
toggle.appendChild(span);
1285+
1286+
var wrapper = document.createElement('div');
1287+
wrapper.className = 'toggle-wrapper toggle-attributes';
1288+
wrapper.appendChild(toggle);
1289+
return wrapper;
1290+
}
12811291

1282-
var wrapper = document.createElement('div');
1283-
wrapper.className = 'toggle-wrapper toggle-attributes';
1284-
wrapper.appendChild(toggle);
12851292
onEach(document.getElementById('main').getElementsByTagName('pre'), function(e) {
12861293
onEach(e.getElementsByClassName('attributes'), function(i_e) {
1287-
i_e.parentNode.insertBefore(wrapper, i_e);
1294+
i_e.parentNode.insertBefore(createToggleWrapper(), i_e);
12881295
collapseDocs(i_e.previousSibling.childNodes[0]);
12891296
});
12901297
});

0 commit comments

Comments
 (0)
Please sign in to comment.