Skip to content

Commit 182c60b

Browse files
shengyuanshengyuan
committed
Update simulator
1 parent 288d628 commit 182c60b

13 files changed

Lines changed: 78 additions & 18 deletions

File tree

‎components/simulator/.bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
"jquery-i18next": "^1.2.0",
2525
"bootstrap-select": "^1.12.1"
2626
},
27-
"_release": "bf3a5f46e3",
27+
"_release": "e9051268eb",
2828
"_resolution": {
2929
"type": "branch",
3030
"branch": "blockly",
31-
"commit": "bf3a5f46e3380d630e78e37a2507d474a6a1ed28"
31+
"commit": "e9051268eb7e53c6fab28e3cd91f2301bcba797a"
3232
},
3333
"_source": "https://git.kingkit.codes/webduino/simulator.git",
3434
"_target": "blockly",

components/simulator/dist/css/bundle-20170211194616.css renamed to components/simulator/dist/css/bundle-20170213135550.css

File renamed without changes.

‎components/simulator/dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width,initial-scale=1"> <link rel="icon" href="webduino.ico" type="image/x-icon"> <link rel="stylesheet" type="text/css" href="/components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="css/bundle-20170211194616.css"> </head> <body> <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> <a class="navbar-brand"> <i class="glyphicon glyphicon-hand-up"></i> <span data-i18n="navbar.brand"></span> </a> </div> <div id="navbar" class="navbar-collapse collapse"> <div class="navbar-left"> <button type="button" class="btn btn-default navbar-btn" v-on:click="historyBack" :disabled="isPlaying"> <i class="glyphicon glyphicon-chevron-left"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="historyForward" :disabled="isPlaying"> <i class="glyphicon glyphicon-chevron-right"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="refresh" :disabled="isPlaying"> <i class="glyphicon glyphicon-refresh"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="zoomToFit" :disabled="isPlaying"> <i class="glyphicon glyphicon-screenshot"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="deleteSomething" :disabled="isPlaying"> <i class="glyphicon glyphicon-trash"></i> </button> <button type="button" class="btn btn-default navbar-btn" id="menu-toggle" v-on:click="menuToggle" :disabled="isPlaying" data-i18n="navbar.components"></button> </div> <div class="navbar-right margin-fixed hidden"> <select id="lang" class="selectpicker hidden" data-container="body" data-width="auto"> <option value="en" data-i18n="language.en"></option> <option value="zh-tw" data-i18n="language.zh-tw"></option> <option value="zh-cn" data-i18n="language.zh-cn"></option> </select> <button type="button" class="btn btn-default navbar-btn hidden" :class="{ play: isPlaying, stop: !isPlaying }" v-on:click="engineToggle"> <i class="glyphicon glyphicon-play" v-show="!isPlaying"></i> <i class="glyphicon glyphicon-stop" v-show="isPlaying"></i> </button> </div> </div> </div> </nav> <div id="wrapper" v-bind:class="{ toggled: isComponentsVisible, dragging: dragging }"> <div id="sidebar"> <div class="container-fluid"> <div class="row components-container" v-html="components"></div> </div> </div> </div> <div class="container-fluid"> <svg id="editArea"> <g class="zoom-container"> <g class="components-area"></g> <g class="path-container"></g> <g class="edit-content"></g> </g> </svg> </div> <div id="app"></div> <script src="js/bundle-20170211194616.js"></script> </body>
1+
<!DOCTYPE html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width,initial-scale=1"> <link rel="icon" href="webduino.ico" type="image/x-icon"> <link rel="stylesheet" type="text/css" href="/components/bootstrap/dist/css/bootstrap.min.css"> <link rel="stylesheet" href="css/bundle-20170213135550.css"> </head> <body> <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> <a class="navbar-brand"> <i class="glyphicon glyphicon-hand-up"></i> <span data-i18n="navbar.brand"></span> </a> </div> <div id="navbar" class="navbar-collapse collapse"> <div class="navbar-left"> <button type="button" class="btn btn-default navbar-btn" v-on:click="historyBack" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.preStep"> <i class="glyphicon glyphicon-chevron-left"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="historyForward" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.nextStep"> <i class="glyphicon glyphicon-chevron-right"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="deleteSomething" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.remove"> <i class="glyphicon glyphicon-remove"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="zoomToFit" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.zoomToFit"> <i class="glyphicon glyphicon-screenshot"></i> </button> <button type="button" class="btn btn-default navbar-btn" v-on:click="refresh" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.removeAll"> <i class="glyphicon glyphicon-trash"></i> </button> <button type="button" class="btn btn-default navbar-btn" id="menu-toggle" v-on:click="menuToggle" :disabled="isPlaying" data-i18n="navbar.components"></button> </div> <div class="navbar-right margin-fixed hidden"> <select id="lang" class="selectpicker hidden" data-container="body" data-width="auto"> <option value="en" data-i18n="language.en"></option> <option value="zh-tw" data-i18n="language.zh-tw"></option> <option value="zh-cn" data-i18n="language.zh-cn"></option> </select> <button type="button" class="btn btn-default navbar-btn hidden" :class="{ play: isPlaying, stop: !isPlaying }" v-on:click="engineToggle"> <i class="glyphicon glyphicon-play" v-show="!isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.start"></i> <i class="glyphicon glyphicon-stop" v-show="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.stop"></i> </button> </div> </div> </div> </nav> <div id="wrapper" v-bind:class="{ toggled: isComponentsVisible, dragging: dragging }"> <div id="sidebar"> <div class="container-fluid"> <div class="row components-container" v-html="components"></div> </div> </div> </div> <div class="container-fluid"> <svg id="editArea"> <g class="zoom-container"> <g class="components-area"></g> <g class="path-container"></g> <g class="edit-content"></g> </g> </svg> </div> <div id="app"></div> <script src="js/bundle-20170213135550.js"></script> </body>

components/simulator/dist/js/bundle-20170211194616.js renamed to components/simulator/dist/js/bundle-20170213135550.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/simulator/dist/js/index.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,15 @@
214214
addComponents();
215215
jqueryI18next.init(i18next, $);
216216
$('body').localize();
217+
218+
// bootstrap tooltip
219+
$('[data-toggle="tooltip"]').tooltip({
220+
trigger: 'hover',
221+
title: function () {
222+
return this.getAttribute('data-myTitle');
223+
}
224+
});
225+
217226
app.language = i18next.language;
218227
app.i18nextReady = true;
219228
});

‎components/simulator/dist/locales/en.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
},
77
"navbar": {
88
"brand": " Simulator",
9-
"components": "Components"
9+
"components": "Components",
10+
"preStep": "Undo",
11+
"nextStep": "Redo",
12+
"remove": "Delete the selection",
13+
"removeAll": "Delete all",
14+
"zoomToFit": "Zoom To Fit",
15+
"start": "Start",
16+
"stop": "Stop"
1017
}
1118
}

‎components/simulator/dist/locales/zh-cn.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
},
77
"navbar": {
88
"brand": " 模拟器",
9-
"components": "元件"
9+
"components": "元件",
10+
"preStep": "回到上一步",
11+
"nextStep": "回到下一步",
12+
"remove": "删除选择的元件",
13+
"removeAll": "删除所有元件",
14+
"zoomToFit": "回到预设(缩放)",
15+
"start": "启动",
16+
"stop": "停止"
1017
}
1118
}

‎components/simulator/dist/locales/zh-tw.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
},
77
"navbar": {
88
"brand": " 模擬器",
9-
"components": "元件"
9+
"components": "元件",
10+
"preStep": "回到上一步",
11+
"nextStep": "回到下一步",
12+
"remove": "刪除選擇的元件",
13+
"removeAll": "刪除所有元件",
14+
"zoomToFit": "回到預設(縮放)",
15+
"start": "啟動",
16+
"stop": "停止"
1017
}
1118
}

‎components/simulator/index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@
2929
</div>
3030
<div id="navbar" class="navbar-collapse collapse">
3131
<div class="navbar-left">
32-
<button type="button" class="btn btn-default navbar-btn" v-on:click="historyBack" :disabled="isPlaying">
32+
<button type="button" class="btn btn-default navbar-btn" v-on:click="historyBack" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.preStep">
3333
<i class="glyphicon glyphicon-chevron-left"></i>
3434
</button>
35-
<button type="button" class="btn btn-default navbar-btn" v-on:click="historyForward" :disabled="isPlaying">
35+
<button type="button" class="btn btn-default navbar-btn" v-on:click="historyForward" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.nextStep">
3636
<i class="glyphicon glyphicon-chevron-right"></i>
3737
</button>
38-
<button type="button" class="btn btn-default navbar-btn" v-on:click="refresh" :disabled="isPlaying">
39-
<i class="glyphicon glyphicon-refresh"></i>
38+
<button type="button" class="btn btn-default navbar-btn" v-on:click="deleteSomething" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.remove">
39+
<i class="glyphicon glyphicon-remove"></i>
4040
</button>
41-
<button type="button" class="btn btn-default navbar-btn" v-on:click="zoomToFit" :disabled="isPlaying">
41+
<button type="button" class="btn btn-default navbar-btn" v-on:click="zoomToFit" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.zoomToFit">
4242
<i class="glyphicon glyphicon-screenshot"></i>
4343
</button>
44-
<button type="button" class="btn btn-default navbar-btn" v-on:click="deleteSomething" :disabled="isPlaying">
44+
<button type="button" class="btn btn-default navbar-btn" v-on:click="refresh" :disabled="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.removeAll">
4545
<i class="glyphicon glyphicon-trash"></i>
4646
</button>
4747
<button type="button" class="btn btn-default navbar-btn" id="menu-toggle" v-on:click="menuToggle" :disabled="isPlaying" data-i18n="navbar.components"></button>
@@ -53,8 +53,8 @@
5353
<option value="zh-cn" data-i18n="language.zh-cn"></option>
5454
</select>
5555
<button type="button" class="btn btn-default navbar-btn hidden" :class="{ play: isPlaying, stop: !isPlaying }" v-on:click="engineToggle">
56-
<i class="glyphicon glyphicon-play" v-show="!isPlaying"></i>
57-
<i class="glyphicon glyphicon-stop" v-show="isPlaying"></i>
56+
<i class="glyphicon glyphicon-play" v-show="!isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.start"></i>
57+
<i class="glyphicon glyphicon-stop" v-show="isPlaying" data-toggle="tooltip" data-placement="bottom" data-i18n="[data-myTitle]navbar.stop"></i>
5858
</button>
5959
</div>
6060
</div>

‎components/simulator/js/index.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,15 @@
214214
addComponents();
215215
jqueryI18next.init(i18next, $);
216216
$('body').localize();
217+
218+
// bootstrap tooltip
219+
$('[data-toggle="tooltip"]').tooltip({
220+
trigger: 'hover',
221+
title: function () {
222+
return this.getAttribute('data-myTitle');
223+
}
224+
});
225+
217226
app.language = i18next.language;
218227
app.i18nextReady = true;
219228
});

0 commit comments

Comments
 (0)