Merge branch 'develop'

leandrolanzieri · Aug 5, 2017 · 1017bae · 1017bae
2 parents 14fb7d1 + fe57e2a
commit 1017bae
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/app/components/app-sidebar/app-sidebar.component.html b/src/app/components/app-sidebar/app-sidebar.component.html
@@ -26,13 +26,13 @@
         </div>
       </div>
     </a>
-    <a placement="right" tooltip="Ver código en Español" container="body">
+<!--     <a placement="right" tooltip="Ver código en Español" container="body">
       <div class="row item">
         <div class="col">
           <strong>Es</strong>
         </div>
       </div>
-    </a>
+    </a> -->
 
     <hr>
 

diff --git a/src/app/components/topbar/topbar.component.html b/src/app/components/topbar/topbar.component.html
@@ -4,7 +4,7 @@
   <button type="button" class="btn btn-outline-primary cursor-pointer" (click)="openProject()"><i class="cursor-pointer fa fa-lg fa-folder-open-o" aria-hidden="true"></i></button>
   <button type="button" class="btn btn-outline-primary cursor-pointer" (click)="saveProject()"><i class="cursor-pointer fa fa-lg fa-floppy-o" aria-hidden="true"></i></button>
   <!--<button type="button" class="btn btn-outline-primary cursor-pointer" [routerLink]="['configuration']"><i class="cursor-pointer fa fa-lg fa-cog" aria-hidden="true"></i></button>-->
-  <button type="button" class="btn btn-outline-primary cursor-pointer" [routerLink]="['help']"><i class="cursor-pointer fa fa-lg fa-question-circle" aria-hidden="true"></i></button>
+  <!-- <button type="button" class="btn btn-outline-primary cursor-pointer" [routerLink]="['help']"><i class="cursor-pointer fa fa-lg fa-question-circle" aria-hidden="true"></i></button> -->
 </div>
 
 <div class="modal fade" *ngIf="dialog" bsModal #confirmationModal="bs-modal" [config]="{backdrop: 'static'}"

diff --git a/src/assets/js/blockly/blocks/ciaa_sapi_blocks_compressed.js b/src/assets/js/blockly/blocks/ciaa_sapi_blocks_compressed.js
diff --git a/src/assets/js/blockly/generators/ciaa_sapi/base.js b/src/assets/js/blockly/generators/ciaa_sapi/base.js
@@ -107,7 +107,7 @@ Blockly.CiaaSapi['ciaa_sapi_sleep_until_interrupt'] = function(block) {
 };
 
 Blockly.CiaaSapi['ciaa_sapi_get_tick_count'] = function(block) {
-  var code = 'tickRead();';
+  var code = 'tickRead()';
   return [code, Blockly.CiaaSapi.ORDER_NONE];
 };