Skip to content

Commit adb2001

Browse files
oxxostudiooxxostudio
committed
edit toolbox
1 parent 7d254f8 commit adb2001

6 files changed

Lines changed: 86 additions & 65 deletions

File tree

‎code.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ Code.init = function () {
302302

303303
var rtl = Code.isRtl();
304304
var container = document.getElementById('content_area');
305+
var blocklyMenu;
305306
var onresize = function (e) {
306307
var bBox = Code.getBBox_(container);
307308
for (var i = 0; i < Code.TABS_.length; i++) {
@@ -315,12 +316,20 @@ Code.init = function () {
315316
el.style.width = bBox.width + 'px';
316317
el.style.width = (2 * bBox.width - el.offsetWidth) + 'px';
317318
}
318-
// Make the 'Blocks' tab line up with the toolbox.
319319
if (Code.workspace.toolbox_.width) {
320-
document.getElementById('tab_blocks').style.minWidth =
321-
(Code.workspace.toolbox_.width - 38) + 'px';
322-
// Account for the 19 pixel margin and on each side.
320+
blocklyMenu = document.querySelector('.blocklyTreeRow.blocklyTreeSelected');
321+
if(blocklyMenu){
322+
document.getElementById('tab_blocks').style.minWidth = (blocklyMenu.offsetWidth - 38) + 'px';
323+
}else{
324+
document.getElementById('tab_blocks').style.minWidth = (Code.workspace.toolbox_.width - 38) + 'px';
325+
}
323326
}
327+
// Make the 'Blocks' tab line up with the toolbox.
328+
//if (Code.workspace.toolbox_.width) {
329+
//document.getElementById('tab_blocks').style.minWidth =
330+
//(Code.workspace.toolbox_.width - 38) + 'px';
331+
// Account for the 19 pixel margin and on each side.
332+
//}
324333
};
325334
window.addEventListener('resize', onresize, false);
326335

‎css/blockly.css‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,12 @@
218218
.blocklyTreeRow {
219219
line-height: 22px;
220220
height: 22px;
221-
padding-right: 1em;
221+
padding-right: 25px;
222222
white-space: nowrap;
223+
padding-left:5px!important;
224+
}
225+
.blocklyTreeRoot>div>div>div>div>.blocklyTreeRow{
226+
padding-left:15px!important;
223227
}
224228
.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {
225229
padding-right: 0;
@@ -235,27 +239,27 @@
235239
}
236240
.blocklyTreeIcon {
237241
background-image: url(../media/sprites.png);
238-
height: 16px;
242+
height: 10px;
239243
vertical-align: middle;
240-
width: 16px;
244+
width: 10px;
241245
}
242246
.blocklyTreeIconClosedLtr {
243-
background-position: -32px -1px;
247+
background-position: -85px -3px;
244248
}
245249
.blocklyTreeIconClosedRtl {
246250
background-position: 0px -1px;
247251
}
248252
.blocklyTreeIconOpen {
249-
background-position: -16px -1px;
253+
background-position: -77px -2px;
250254
}
251255
.blocklyTreeSelected>.blocklyTreeIconClosedLtr {
252-
background-position: -32px -17px;
256+
background-position: -85px -3px;
253257
}
254258
.blocklyTreeSelected>.blocklyTreeIconClosedRtl {
255259
background-position: 0px -17px;
256260
}
257261
.blocklyTreeSelected>.blocklyTreeIconOpen {
258-
background-position: -16px -17px;
262+
background-position: -77px -14px;
259263
}
260264
.blocklyTreeIconNone,
261265
.blocklyTreeSelected>.blocklyTreeIconNone {

‎media/sprites.png‎

112 Bytes
Loading

‎msg/en.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ var MSG = {
4141
demoTitle: "Blockly Demo Area",
4242
catTutorials: "Blockly",
4343
linkToBin: "Let's Coding",
44-
catDatabase: "Data base - Firebase",
44+
catDatabase: "Data base",
45+
catFirebase: "Firebase",
4546
update: "update 2015.8.11",
46-
catCarTest: "Demo - Car (2)",
47-
catCar: "Demo - Car (1)",
48-
catFish: "Demo - Fly Fish",
49-
catMenu1: "Component",
50-
catMenu2: "Sensor",
51-
catMenu3: "Toies"
47+
catCarTest: "Car (2)",
48+
catCar: "Car (1)",
49+
catFish: "Fly Fish",
50+
catMenu1: "Components",
51+
catMenu2: "Sensors",
52+
catMenu3: "Toies",
53+
catPlus: "Control"
5254
};

‎msg/zh-hant.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ var MSG = {
2121
catLed: "LED 燈",
2222
catRelay: "繼電器",
2323
catRGBLed: "三色 LED",
24-
catUltraSonic: "超音波傳感器",
25-
catDht: "溫濕度傳感器",
24+
catUltraSonic: "超音波",
25+
catDht: "溫濕度",
2626
catButton: "按鈕開關",
2727
catShock: "震動開關",
28-
catPir: "人體紅外線偵測",
28+
catPir: "人體紅外線",
2929
catSound: "聲音偵測",
3030
catBuzzer: "蜂鳴器",
3131
catServo: "伺服馬達",
@@ -41,14 +41,16 @@ var MSG = {
4141
demoTitle: "Blockly 範例測試區",
4242
catTutorials: "教學積木",
4343
linkToBin: "程式編輯",
44-
catDatabase: "資料庫 - Firebase",
44+
catDatabase: "資料庫",
45+
catFirebase: "Firebase",
4546
update: "update 2015.9.1",
46-
catCarTest: "應用 - 自走車 (2)",
47-
catCar: "應用 - 自走車 (1)",
48-
catFish: "應用 - 飛天魚",
47+
catCarTest: "自走車 (2)",
48+
catCar: "自走車 (1)",
49+
catFish: "飛天魚",
4950
catBasic:"基本積木",
5051
catWebduino:"Webduino 積木",
51-
catMenu1: "電子零件",
52+
catMenu1: "元件模組",
5253
catMenu2: "傳感器",
53-
catMenu3: "玩具應用"
54+
catMenu3: "玩具應用",
55+
catPlus: "進階控制"
5456
};

‎views/index.handlebars‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -255,29 +255,16 @@
255255
<category id="catVariables" custom="VARIABLE"></category>
256256
<category id="catFunctions" custom="PROCEDURE"></category>
257257
<sep></sep>
258-
<sep></sep>
259-
<category id="catExec">
260-
<block type="timer"></block>
261-
<block type="delay"></block>
262-
</category>
263258
<category id="catConsole">
264259
<block type="console"></block>
265260
<block type="getdate"></block>
266261
<block type="gettime"></block>
267-
<block type="temp_data_set">
268-
<value name="name_">
269-
<block type="text">
270-
<field name="TEXT">temp</field>
271-
</block>
272-
</value>
273-
</block>
274-
<block type="temp_data_get">
275-
<value name="name_">
276-
<block type="text">
277-
<field name="TEXT">temp</field>
278-
</block>
279-
</value>
280-
</block>
262+
</category>
263+
<category id="catExec">
264+
<block type="timer"></block>
265+
<block type="delay"></block>
266+
</category>
267+
<category id="catPlus">
281268
<block type="sound_recognition"></block>
282269
<block type="sound_recognition_check">
283270
<value name="text_">
@@ -293,32 +280,20 @@
293280
</block>
294281
</value>
295282
</block>
296-
</category>
297-
<category id="catDatabase">
298-
<block type="data_firebase">
283+
<block type="temp_data_set">
299284
<value name="name_">
300-
<block type="variables_get">
301-
<field name="VAR">myFirebase</field>
302-
</block>
303-
</value>
304-
</block>
305-
<block type="data_firebase_write"></block>
306-
<block type="data_firebase_data"></block>
307-
<block type="data_firebase_read">
308-
<value name="read_">
309-
<block type="variables_get">
310-
<field name="VAR">val</field>
285+
<block type="text">
286+
<field name="TEXT">temp</field>
311287
</block>
312288
</value>
313289
</block>
314-
<block type="data_firebase_readonce">
315-
<value name="read_">
316-
<block type="variables_get">
317-
<field name="VAR">val</field>
290+
<block type="temp_data_get">
291+
<value name="name_">
292+
<block type="text">
293+
<field name="TEXT">temp</field>
318294
</block>
319295
</value>
320296
</block>
321-
<block type="data_firebase_clear"></block>
322297
</category>
323298
<sep></sep>
324299
<category id="catBoard">
@@ -609,4 +584,33 @@
609584
</category>
610585
<sep></sep>
611586
</category>
587+
<category id="catDatabase">
588+
<category id="catFirebase">
589+
<block type="data_firebase">
590+
<value name="name_">
591+
<block type="variables_get">
592+
<field name="VAR">myFirebase</field>
593+
</block>
594+
</value>
595+
</block>
596+
<block type="data_firebase_write"></block>
597+
<block type="data_firebase_data"></block>
598+
<block type="data_firebase_read">
599+
<value name="read_">
600+
<block type="variables_get">
601+
<field name="VAR">val</field>
602+
</block>
603+
</value>
604+
</block>
605+
<block type="data_firebase_readonce">
606+
<value name="read_">
607+
<block type="variables_get">
608+
<field name="VAR">val</field>
609+
</block>
610+
</value>
611+
</block>
612+
<block type="data_firebase_clear"></block>
613+
</category>
614+
<sep></sep>
615+
</category>
612616
</xml>

0 commit comments

Comments
 (0)