Skip to content

Commit

Permalink
picture bug regression fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
SebCanet committed Nov 1, 2020
1 parent 1b18de4 commit e4d6208
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ sync.ffs_db
*.ffs_db
.owncloudsync.log
.owncloudsync.log
*.log
*.ffs_db
13 changes: 13 additions & 0 deletions .owncloudsync.log
Original file line number Diff line number Diff line change
Expand Up @@ -34130,3 +34130,16 @@
#=#=#=# Syncrun started 2020-11-01T11:46:04Z
#=#=#=#=# Propagation starts 2020-11-01T11:46:04Z (last step: 456 msec, total: 456 msec)
#=#=#=# Syncrun finished 2020-11-01T11:46:04Z (last step: 6 msec, total: 463 msec)
#=#=#=# Syncrun started 2020-11-01T13:46:12Z
#=#=#=#=# Propagation starts 2020-11-01T13:46:14Z (last step: 1642 msec, total: 1642 msec)
#=#=#=# Syncrun finished 2020-11-01T13:46:14Z (last step: 118 msec, total: 1760 msec)
#=#=#=# Syncrun started 2020-11-01T15:27:46Z
#=#=#=#=# Propagation starts 2020-11-01T15:27:48Z (last step: 1721 msec, total: 1721 msec)
15:27:48||B@electron/www/core/BlocklyArduino/blockly@rduino_visual.js|INST_SYNC|Up|1604243937|dccec09efbde7106063dcbb4188eadf6|10244|43219156ocd28ee13549|4||204|10092|1603962392|203c7f9b-7158-4ef0-b114-8532be9ea71e|
#=#=#=# Syncrun finished 2020-11-01T15:27:48Z (last step: 707 msec, total: 2428 msec)
#=#=#=# Syncrun started 2020-11-01T15:27:51Z
#=#=#=#=# Propagation starts 2020-11-01T15:27:54Z (last step: 2709 msec, total: 2709 msec)
#=#=#=# Syncrun finished 2020-11-01T15:27:54Z (last step: 75 msec, total: 2785 msec)
#=#=#=# Syncrun started 2020-11-01T15:27:56Z
#=#=#=#=# Propagation starts 2020-11-01T15:27:57Z (last step: 448 msec, total: 448 msec)
#=#=#=# Syncrun finished 2020-11-01T15:27:57Z (last step: 38 msec, total: 486 msec)
14 changes: 9 additions & 5 deletions B@electron/www/core/BlocklyArduino/blockly@rduino_visual.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,24 @@ BlocklyDuino.ExampleWiring = function () {
var ExampleTest = BlocklyDuino.getStringParamFromUrl('url', '');
var KitTest = BlocklyDuino.getStringParamFromUrl('card', '');
var KitTestResult = KitTest.slice(0, 3);
// ni exemple ni kit
if ((ExampleTest === '') && (KitTestResult !== 'kit')) {
$("#btn_wiring").addClass("hidden");
$("#menu_21").addClass("hidden");

} else {
$("#btn_wiring").removeClass("hidden");
$("#menu_21").removeClass("hidden");
// exemple mais pas kit
if ((ExampleTest !== '') && (KitTestResult !== 'kit')) {
ExampleTest = ExampleTest.replace('.xml', '');
ExampleTest = ExampleTest.replace('.B@', '');
$('#wiringModal_picture').prepend("<img src='" + ExampleTest + ".jpg' id='wiringModalImg'/>");
$('#arduino_card_miniPicture').attr('src', ExampleTest + '.jpg width=36px');
$('#arduino_card_picture').attr('src', ExampleTest + '_wiring.jpg width=100% height=auto');
// ExampleTest = ExampleTest.replace('.xml', '');
// ExampleTest = ExampleTest.replace('.B@', '');
ExampleTest = ExampleTest.slice(0, -4);
$('#wiringModal_picture').prepend("<img src='" + ExampleTest + ".jpg' id='wiringModalImg' width=100% height=auto>");
$('#arduino_card_miniPicture').attr('src', ExampleTest + '.jpg width="36px"');
$('#arduino_card_picture').attr('src', ExampleTest + '_wiring.jpg');
} else if ((ExampleTest === '') && (KitTestResult === 'kit')) {
//c'est donc un kit
$('#wiringModal_picture').prepend("<img src='media/boards/" + KitTest + "_wiring.jpg' id='wiringModalImg' width=100% height=auto/>");
$("#btn_wiring").removeClass("hidden");
$("#menu_21").removeClass("hidden");
Expand Down
Binary file modified sync.ffs_db
Binary file not shown.

0 comments on commit e4d6208

Please sign in to comment.