Merge branch 'master' of github.com:parallaxinc/BlocklyProp

Author: pjewald

src/main/webapp/WEB-INF/includes/pageparts/projecttable.jsp

@@ -7,7 +7,7 @@
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@ include file="/WEB-INF/includes/include.jsp"%>
 
-<table id="project-table" class="table" data-toggle="table" data-url="<url:getUrl url="${param.url}"/>"  data-toolbar="#toolbar" data-search="true" data-side-pagination="server" data-pagination="true">
+<table id="project-table" class="table" data-toggle="table" data-url="<url:getUrl url="${param.url}"/>"  data-toolbar="#toolbar" data-search="false" data-side-pagination="server" data-pagination="true">
     <thead>
         <tr>
             <th data-field="type" data-sortable="true" data-formatter="formatType" data-width="30px" data-align="center">&nbsp;</th>
@@ -74,4 +74,4 @@
         }
         return value;
     }
-</script>
+</script>

src/main/webapp/cdn/blockly/generators/propc/base.js

@@ -258,7 +258,6 @@ Blockly.Blocks.system_counter = {
         this.appendDummyInput()
             .appendField("system counter");
         this.setOutput(true, "Number");
-        this.setTooltip('');
   }
 };
 

src/main/webapp/cdn/blockly/generators/propc/math.js

@@ -77,7 +77,6 @@ Blockly.Blocks.math_limit = {
                 .appendField("and");
 
         this.setInputsInline(true);
-        this.setTooltip("limit");
         this.setOutput(true, 'Number');
         this.setPreviousStatement(false, null);
         this.setNextStatement(false, null);
@@ -110,16 +109,13 @@ Blockly.propc.math_limit.OPERATORS = {
 
 // Increment/decrement
 Blockly.Blocks.math_crement = {
-    // Rounding functions.
     helpUrl: Blockly.MSG_NUMBERS_HELPURL,
     init: function() {
 	this.setTooltip(Blockly.MSG_MATH_CREMENT_TOOLTIP);
         this.setColour(colorPalette.getColor('math'));
         this.appendValueInput('VAR')
             .setCheck('Number')
             .appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
-
-        this.setTooltip("");
         this.setPreviousStatement(true);
         this.setNextStatement(true);
     }
@@ -182,7 +178,12 @@ Blockly.Blocks.math_bitwise = {
         this.setColour(colorPalette.getColor('math'));
         this.appendValueInput('VAL1');
         this.appendDummyInput()
-            .appendField(new Blockly.FieldDropdown([["& (bitwise AND)", "&"], ["| (bitwise OR)", "|"], ["^ (bitwise XOR)", "^"], [">> (bitwise right shift)", ">>"], ["<< (bitwise left shift)", "<<"]]), "OPERATION");
+            .appendField(new Blockly.FieldDropdown([
+                ["& (bitwise AND)", "&"], 
+                ["| (bitwise OR)", "|"], 
+                ["^ (bitwise XOR)", "^"], 
+                [">> (bitwise right shift)", ">>"], 
+                ["<< (bitwise left shift)", "<<"]]), "OPERATION");
         this.appendValueInput('VAL2');
 
         this.setOutput(true, 'Number');

src/main/webapp/cdn/blockly/language/common/pins.js

@@ -66,7 +66,6 @@ Blockly.Blocks.check_pin = {
                 .appendField("check PIN")
                 .appendField(new Blockly.FieldDropdown(profile.default.digital), "PIN");
         this.setOutput(true, 'Number');
-        this.setTooltip('');
     }
 };
 
@@ -81,7 +80,6 @@ Blockly.Blocks.check_pin_input = {
                 .setCheck('Number');
         this.setOutput(true, 'Number');
         this.setInputsInline(true);
-        this.setTooltip('');
     }
 };