pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed id attribute again since we don't need it anymore

Browse source
This commit is contained in:
Gina Häußge 2015-04-23 10:27:15 +02:00
parent 19918b7221
commit d0e7cd46ce
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/static/js/app/viewmodels/control.js
View file

@ -22,7 +22,6 @@ $(function() {
self.extrusionAmount = ko.observable(undefined);
self.controls = ko.observableArray([]);
self.controlIndex = 0;
self.tools = ko.observableArray([]);
@ -132,8 +131,6 @@ $(function() {
};
self._processControl = function (control) {
control.id = ko.observable("settingsCustomControl_id" + self.controlIndex++);
if (control.hasOwnProperty("processed") && control.processed) {
return control;
}

4
src/octoprint/templates/tabs/control.jinja2
View file

@ -106,12 +106,12 @@
<!-- Templates for custom controls -->
<script type="text/html" id="customControls_containerTemplate_nameless">
<div class="custom_section" data-bind="attr: { 'id': id }">
<div class="custom_section">
<!-- ko template: { name: 'customControls_containerTemplate', data: $data } --><!-- /ko -->
</div>
</script>
<script type="text/html" id="customControls_containerTemplate_collapsable">
<div class="custom_section" data-bind="attr: { 'id': id }">
<div class="custom_section">
<h1><a onclick="$(this).children().first().toggleClass('icon-caret-down icon-caret-right').parent().parent().next().slideToggle('fast')"><i data-bind="css: {'icon-caret-down': !collapsed, 'icon-caret-right': collapsed}"></i> <span data-bind="text: name"></span></a></h1>
<!-- ko template: { name: 'customControls_containerTemplate', data: $data } --><!-- /ko -->
</div>