Skip to content

Commit e348960

Browse files
authored
Merge pull request #798 from zfi/demo
Remove empty SetToolTip calls
2 parents 4bf8b84 + 49ba2bc commit e348960

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<%@page contentType="text/html" pageEncoding="UTF-8"%>
88
<%@ include file="/WEB-INF/includes/include.jsp"%>
99

10-
<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">
10+
<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">
1111
<thead>
1212
<tr>
1313
<th data-field="type" data-sortable="true" data-formatter="formatType" data-width="30px" data-align="center">&nbsp;</th>
@@ -74,4 +74,4 @@
7474
}
7575
return value;
7676
}
77-
</script>
77+
</script>

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

-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ Blockly.Blocks.system_counter = {
258258
this.appendDummyInput()
259259
.appendField("system counter");
260260
this.setOutput(true, "Number");
261-
this.setTooltip('');
262261
}
263262
};
264263

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ Blockly.Blocks.math_limit = {
7777
.appendField("and");
7878

7979
this.setInputsInline(true);
80-
this.setTooltip("limit");
8180
this.setOutput(true, 'Number');
8281
this.setPreviousStatement(false, null);
8382
this.setNextStatement(false, null);
@@ -110,16 +109,13 @@ Blockly.propc.math_limit.OPERATORS = {
110109

111110
// Increment/decrement
112111
Blockly.Blocks.math_crement = {
113-
// Rounding functions.
114112
helpUrl: Blockly.MSG_NUMBERS_HELPURL,
115113
init: function() {
116114
this.setTooltip(Blockly.MSG_MATH_CREMENT_TOOLTIP);
117115
this.setColour(colorPalette.getColor('math'));
118116
this.appendValueInput('VAR')
119117
.setCheck('Number')
120118
.appendField(new Blockly.FieldDropdown(this.OPERATORS), 'OP');
121-
122-
this.setTooltip("");
123119
this.setPreviousStatement(true);
124120
this.setNextStatement(true);
125121
}
@@ -182,7 +178,12 @@ Blockly.Blocks.math_bitwise = {
182178
this.setColour(colorPalette.getColor('math'));
183179
this.appendValueInput('VAL1');
184180
this.appendDummyInput()
185-
.appendField(new Blockly.FieldDropdown([["& (bitwise AND)", "&"], ["| (bitwise OR)", "|"], ["^ (bitwise XOR)", "^"], [">> (bitwise right shift)", ">>"], ["<< (bitwise left shift)", "<<"]]), "OPERATION");
181+
.appendField(new Blockly.FieldDropdown([
182+
["& (bitwise AND)", "&"],
183+
["| (bitwise OR)", "|"],
184+
["^ (bitwise XOR)", "^"],
185+
[">> (bitwise right shift)", ">>"],
186+
["<< (bitwise left shift)", "<<"]]), "OPERATION");
186187
this.appendValueInput('VAL2');
187188

188189
this.setOutput(true, 'Number');

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

-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ Blockly.Blocks.check_pin = {
6666
.appendField("check PIN")
6767
.appendField(new Blockly.FieldDropdown(profile.default.digital), "PIN");
6868
this.setOutput(true, 'Number');
69-
this.setTooltip('');
7069
}
7170
};
7271

@@ -81,7 +80,6 @@ Blockly.Blocks.check_pin_input = {
8180
.setCheck('Number');
8281
this.setOutput(true, 'Number');
8382
this.setInputsInline(true);
84-
this.setTooltip('');
8583
}
8684
};
8785

0 commit comments

Comments
 (0)