Commit e74d6e11 authored by carlosperate's avatar carlosperate

Changes in the Materialize framework required changes in the HTML implementation

parent 5e19c8cb
...@@ -37,13 +37,13 @@ window.addEventListener('load', function() { ...@@ -37,13 +37,13 @@ window.addEventListener('load', function() {
*/ */
ArduinoMaterial.bindActionFunctions_ = function() { ArduinoMaterial.bindActionFunctions_ = function() {
// Navigation buttons // Navigation buttons
ArduinoMaterial.bindClick_('button_load', ArduinoMaterial.loadXmlFile); ArduinoMaterial.bindClick_('button_load', ArduinoMaterial.loadUserXmlFile);
ArduinoMaterial.bindClick_('button_save', ArduinoMaterial.saveXmlFile); ArduinoMaterial.bindClick_('button_save', ArduinoMaterial.saveXmlFile);
ArduinoMaterial.bindClick_('button_delete', ArduinoMaterial.discard); ArduinoMaterial.bindClick_('button_delete', ArduinoMaterial.discard);
// Side menu buttons, they also close the side menu // Side menu buttons, they also close the side menu
ArduinoMaterial.bindClick_('menu_load', function() { ArduinoMaterial.bindClick_('menu_load', function() {
ArduinoMaterial.loadXmlFile(); ArduinoMaterial.loadUserXmlFile();
$('.button-collapse').sideNav('hide'); }); $('.button-collapse').sideNav('hide'); });
ArduinoMaterial.bindClick_('menu_save', function() { ArduinoMaterial.bindClick_('menu_save', function() {
ArduinoMaterial.saveXmlFile(); ArduinoMaterial.saveXmlFile();
...@@ -136,7 +136,7 @@ ArduinoMaterial.loadServerXmlFile = function(xmlFile) { ...@@ -136,7 +136,7 @@ ArduinoMaterial.loadServerXmlFile = function(xmlFile) {
* Loads an XML file from the users file system and adds the blocks into the * Loads an XML file from the users file system and adds the blocks into the
* Blockly workspace. * Blockly workspace.
*/ */
ArduinoMaterial.loadXmlFile = function() { ArduinoMaterial.loadUserXmlFile = function() {
// Create event listener function // Create event listener function
var parseInputXMLfile = function(e) { var parseInputXMLfile = function(e) {
var files = e.target.files; var files = e.target.files;
......
...@@ -22,8 +22,6 @@ ArduinoMaterial.materializeJsInit = function() { ...@@ -22,8 +22,6 @@ ArduinoMaterial.materializeJsInit = function() {
menuWidth: 240, menuWidth: 240,
activationWidth: 70, activationWidth: 70,
edge: 'left'}); edge: 'left'});
// Accordion collapsible
$('.collapsible').collapsible();
// Drop down menus // Drop down menus
$(".dropdown-button").dropdown({hover: false}); $(".dropdown-button").dropdown({hover: false});
// Overlay content panels using modals (android dialogs) // Overlay content panels using modals (android dialogs)
......
...@@ -63,8 +63,7 @@ ...@@ -63,8 +63,7 @@
<!-- Horizonal Navigation bar --> <!-- Horizonal Navigation bar -->
<nav class="nav-fixed arduino_teal"> <nav class="nav-fixed arduino_teal">
<div class="container"> <div class="nav-wrapper container">
<div class="nav-wrapper">
<a class="button-collapse show-on-large" href="#" data-activates="slide-out"><i class="mdi-navigation-menu"></i></a> <a class="button-collapse show-on-large" href="#" data-activates="slide-out"><i class="mdi-navigation-menu"></i></a>
<a id="logo-container" href="#" class="brand-logo">Ardublockly</a> <a id="logo-container" href="#" class="brand-logo">Ardublockly</a>
<!-- Horizontal Navbar links only shown on large resolutions --> <!-- Horizontal Navbar links only shown on large resolutions -->
...@@ -74,7 +73,6 @@ ...@@ -74,7 +73,6 @@
<li><a href="#" id="button_delete">Delete All<i class="mdi-action-delete left"></i></a></li> <li><a href="#" id="button_delete">Delete All<i class="mdi-action-delete left"></i></a></li>
</ul> </ul>
</div> </div>
</div>
</nav> </nav>
<!-- Sidebar navigation --> <!-- Sidebar navigation -->
...@@ -155,9 +153,9 @@ ...@@ -155,9 +153,9 @@
</div> </div>
</div> </div>
<div class="col s12 m12 l4"> <div class="col s12 m12 l4">
<ul class="collapsible z-depth-1"> <ul class="collapsible z-depth-1" data-collapsible="accordion">
<li> <li>
<div class="collapsible-header"><span class="collapsible_logo">{ }</span>Source Code</div> <div class="collapsible-header active"><span class="collapsible_logo">{ }</span>Source Code</div>
<div class="collapsible-body"> <div class="collapsible-body">
<pre id="content_arduino" class="content"></pre> <pre id="content_arduino" class="content"></pre>
</div> </div>
......
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