Gitlab CSE Unil

Skip to content

GitLab

Commit adc12d1d authored by M. Chardon's avatar M. Chardon
Browse files

bug couleur cartouche

parent 7a26ea17
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
amd/build/admin_panel.min.js
View file @ adc12d1d
This diff is collapsed.
amd/src/admin_panel.js
View file @ adc12d1d
......@@ -482,8 +482,8 @@ define(['jquery', 'core/notification', 'core/templates', 'core/fragment',
currentTool.typetool = $("#typetool").val();
var typetoolEntity = getTypeTool(currentTool.typetool);
currentTool.type = typetoolEntity;
currentTool.colors = typetoolEntity.color;
currentTool.cartridgeColor = typetoolEntity.cartridge_color;
currentTool.colors = typetoolEntity.get_color();
currentTool.cartridgeColor = typetoolEntity.get_color_cartridge();
$("#color").val(currentTool.colors);
$("#cartridgecolor").val(currentTool.cartridgeColor);
initToolDisplay();
......@@ -637,11 +637,12 @@ define(['jquery', 'core/notification', 'core/templates', 'core/fragment',
} else {
currentTool = new Tool();
$("#typetool").on("change", function () {
currentTool = new Tool();
currentTool.typetool = $("#typetool").val();
var typetoolEntity = getTypeTool(currentTool.typetool);
currentTool.type = typetoolEntity;
currentTool.colors = typetoolEntity.color;
currentTool.cartridgeColor = typetoolEntity.cartridge_color;
currentTool.colors = typetoolEntity.get_color();
currentTool.cartridgeColor = typetoolEntity.get_color_cartridge();
$("#color").val(currentTool.colors);
$("#cartridgecolor").val(currentTool.cartridgeColor);
initToolDisplay();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment