opensensemap/blockly-app
1
0
Fork 0
mirror of https://github.com/sensebox/blockly-app synced 2025-04-19 16:07:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'development_yannick'

Browse source
This commit is contained in:
Norwin 2019-01-15 09:35:47 +01:00
commit d9a4c2d8f4
3 changed files with 94 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/assets/blockly.html
View file

@ -17,7 +17,7 @@
} }
.hidden { .hidden {
display: none; display: none!important;
} }
.blocks_panel_large, .blocks_panel_small, #content_blocks, .content_xml_large, .content_xml_small { .blocks_panel_large, .blocks_panel_small, #content_blocks, .content_xml_large, .content_xml_small {
@ -89,8 +89,9 @@
</ul> </ul>
<!-- Content --> <!-- Content -->
<div id="blocklyview">
<!-- Toolbox visibility button --> <!-- Toolbox visibility button -->
<a id="button_toggle_toolbox" class="waves-effect waves-light btn-flat button_toggle_toolbox_off hidden" style="display: none"><i id="button_toggle_toolbox_icon" class="mdi-action-visibility-off"></i></a> <a id="button_toggle_toolbox" class="waves-effect waves-light btn-flat button_toggle_toolbox_off"><i id="button_toggle_toolbox_icon" class="mdi-action-visibility-off"></i></a>
<!-- Arduino IDE action buttons --> <!-- Arduino IDE action buttons -->
<div id="ide_buttons_wrapper" class="hidden"> <div id="ide_buttons_wrapper" class="hidden">
<div id="buttons_offline"> <div id="buttons_offline">
@ -104,7 +105,7 @@
<a id="button_compile_sketch" class="tooltipped copy-btn waves-effect waves-light waves-circle btn-floating z-depth-1-half arduino_orange" data-position="left" data-delay="750" data-tooltip="Sketch kompilieren"><i id="button_compile_sketch_icon" class="mdi-action-assignment-turned-in"></i></a> <a id="button_compile_sketch" class="tooltipped copy-btn waves-effect waves-light waves-circle btn-floating z-depth-1-half arduino_orange" data-position="left" data-delay="750" data-tooltip="Sketch kompilieren"><i id="button_compile_sketch_icon" class="mdi-action-assignment-turned-in"></i></a>
</div> </div>
<div id="button_ide_large_spinner" class="preloader-wrapper active ide_loader" style="display:none"> <div id="button_ide_large_spinner" class="preloader-wrapper active ide_loader hidden">
<div class="spinner-layer spinner-orange"> <div class="spinner-layer spinner-orange">
<div class="circle-clipper left"> <div class="circle-clipper left">
<div class="circle"></div> <div class="circle"></div>
@ -149,8 +150,8 @@
<div id="content_blocks" class="content z-depth-1"></div> <div id="content_blocks" class="content z-depth-1"></div>
</div> </div>
</div> </div>
</div>
<div class="hidden"> <div id="codeview" class="hidden">
<ul class="collapsible z-depth-1" data-collapsible="accordion"> <ul class="collapsible z-depth-1" data-collapsible="accordion">
<li> <li>
<div class="collapsible-header active"> <div class="collapsible-header active">
@ -191,7 +192,7 @@
<!-- Settings: Displayed as a Materialize Modal --> <!-- Settings: Displayed as a Materialize Modal -->
<div id="settings_dialog" class="modal modal-fixed-footer hidden"> <div id="settings_dialog" class="modal modal-fixed-footer hidden">
<div class="modal-content hidden"> <div class="modal-content">
<h4><span class="translatable_settings">Settings</span></h4> <h4><span class="translatable_settings">Settings</span></h4>
<div class="modal_section online"> <div class="modal_section online">
<label><span class="translatable_compilerLocation">Compiler Location</span>:</label> <label><span class="translatable_compilerLocation">Compiler Location</span>:</label>
@ -328,11 +329,15 @@
data: code, data: code,
}, event.origin) }, event.origin)
break; break;
case 'toggleView':
document.getElementById('blocklyview').classList.toggle('hidden');
document.querySelector('.blocklyToolboxDiv').classList.toggle('hidden');
document.getElementById('codeview').classList.toggle('hidden');
break;
default: default:
console.warn(`postMessage type ${event.data} not implemented`) console.warn(`postMessage type ${event.data} not implemented`)
} }
}); });
}); });
</script> </script>
</body> </body>

9
src/pages/Blockly/blockly.html
View file

@ -14,8 +14,13 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-fab top right edge> <ion-fab top right edge style="right: 4vh">
<button ion-fab large (click)="launchOtaWizard()" color ="light"><ion-icon name="wifi"></ion-icon></button> <button ion-fab large (click)="launchOtaWizard()" color="light"><ion-icon name="wifi"></ion-icon></button>
</ion-fab> </ion-fab>
<ion-fab top right edge style="right: calc(4vh + 60px)">
<button ion-fab mini (click)="toggleView();" color ="light"><ion-icon name="code"></ion-icon></button>
</ion-fab>
<iframe #blocklyFrame scrolling="no" src='assets/blockly.html'></iframe> <iframe #blocklyFrame scrolling="no" src='assets/blockly.html'></iframe>
</ion-content> </ion-content>

4
src/pages/Blockly/blockly.ts
View file

@ -39,6 +39,10 @@ export class BlocklyPage {
launchOtaWizard () { launchOtaWizard () {
this.blocklyFrame.nativeElement.contentWindow.postMessage('getSketch', '*') this.blocklyFrame.nativeElement.contentWindow.postMessage('getSketch', '*')
} }
toggleView () {
this.blocklyFrame.nativeElement.contentWindow.postMessage('toggleView', '*')
}
} }
interface IframePostMessageEvent extends MessageEvent { interface IframePostMessageEvent extends MessageEvent {