Skip to content

Commit 8ccdd73

Browse files
shengyuanshengyuan
committed
Update simulator
1 parent d19197e commit 8ccdd73

6 files changed

Lines changed: 41 additions & 54 deletions

File tree

‎components/simulator/.bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"defiant": "defiant-js#^1.4.0",
2727
"webduino-js": "dist"
2828
},
29-
"_release": "af9d82be4d",
29+
"_release": "ff496653d1",
3030
"_resolution": {
3131
"type": "branch",
3232
"branch": "blockly",
33-
"commit": "af9d82be4d843a63a546fb51a9efb4ec7a209006"
33+
"commit": "ff496653d16c4d0275b736cf81a37ed56835e3a3"
3434
},
3535
"_source": "https://git.kingkit.codes/webduino/simulator.git",
3636
"_target": "blockly",

components/simulator/dist/css/bundle-20170404205940.css renamed to components/simulator/dist/css/bundle-20170407101439.css

File renamed without changes.

‎components/simulator/dist/gulpfile.js‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ gulp.task('clean-dist', function () {
2020
});
2121

2222
gulp.task('copyFiles', ['clean-dist'], function () {
23-
return gulp.src(['./**/*', '!dist{,/**}',
23+
return gulp.src([
24+
'./**/*',
25+
'!dist{,/**}',
2426
'!node_modules{,/**}',
2527
'!engine{,*}.html'
2628
])
@@ -79,29 +81,20 @@ gulp.task('page-index-js', ['copyFiles'], function () {
7981
'dist/components/i18next-browser-languagedetector/i18nextBrowserLanguageDetector.min.js',
8082
'dist/components/i18next-xhr-backend/i18nextXHRBackend.min.js',
8183
'dist/components/jquery-i18next/jquery-i18next.min.js',
84+
'dist/components/defiant/dist/defiant.min.js',
8285

8386
// Engine
84-
'dist/js/engine/setImmediate.js',
85-
'dist/js/engine/paho.js',
86-
'dist/js/engine/webduino.js',
87-
'dist/js/engine/core/EventEmitter.js',
88-
'dist/js/engine/core/util.js',
89-
'dist/js/engine/util/promisify.js',
90-
'dist/js/engine/core/Transport.js',
91-
'dist/js/engine/core/Pin.js',
92-
'dist/js/engine/core/Module.js',
87+
'dist/components/webduino-js/dist/webduino-base.js',
9388
'dist/js/engine/core/Board.js',
94-
'dist/js/engine/core/WebArduino.js',
95-
'dist/js/engine/core/Arduino.js',
89+
'dist/js/engine/transport/MqttTransport.js',
90+
'dist/components/webduino-js/src/core/WebArduino.js',
9691
'dist/js/engine/components/Engine.js',
9792
'dist/js/engine/components/Led.js',
9893
'dist/js/engine/components/RGBLed.js',
9994
'dist/js/engine/components/Buzzer.js',
10095
'dist/js/engine/components/Servo.js',
10196
'dist/js/engine/components/Matrix.js',
10297
'dist/js/engine/components/UltraSonic.js',
103-
'dist/js/engine/transport/MqttTransport.js',
104-
'dist/js/engine/transport/WebSocketTransport.js',
10598

10699
// ui
107100
'dist/js/roundedCorner.js',

‎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-20170404205940.css"> </head> <body class="initialize"> <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="myModal" class="modal fade"> <div class="modal-dialog modal-sm" v-on:keydown.stop v-on:keyup.stop v-on:keydown.enter.prevent> <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only" data-i18n="propertyModal.close"></span></button> <h4 class="modal-title" data-i18n="propertyModal.title"></h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> <label for="property-deviceId" class="control-label" data-i18n="propertyModal.deviceId"></label> <input type="text" class="form-control" id="property-deviceId" v-model="deviceId" v-on:keydown.enter="save" autofocus> </div> </form> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal" data-i18n="propertyModal.close"></button> <button type="button" class="btn btn-primary" v-on:click="save" data-i18n="propertyModal.save">Save changes</button> </div> </div> </div> </div> <div id="app"></div> <script src="js/bundle-20170404205940.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-20170407101439.css"> </head> <body class="initialize"> <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="myModal" class="modal fade"> <div class="modal-dialog modal-sm" v-on:keydown.stop v-on:keyup.stop v-on:keydown.enter.prevent> <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only" data-i18n="propertyModal.close"></span></button> <h4 class="modal-title" data-i18n="propertyModal.title"></h4> </div> <div class="modal-body"> <form role="form"> <div class="form-group"> <label for="property-deviceId" class="control-label" data-i18n="propertyModal.deviceId"></label> <input type="text" class="form-control" id="property-deviceId" v-model="deviceId" v-on:keydown.enter="save" autofocus> </div> </form> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal" data-i18n="propertyModal.close"></button> <button type="button" class="btn btn-primary" v-on:click="save" data-i18n="propertyModal.save">Save changes</button> </div> </div> </div> </div> <div id="app"></div> <script src="js/bundle-20170407101439.js"></script> </body>

components/simulator/dist/js/bundle-20170404205940.js renamed to components/simulator/dist/js/bundle-20170407101439.js

Lines changed: 24 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/simulator/gulpfile.js‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ gulp.task('clean-dist', function () {
2020
});
2121

2222
gulp.task('copyFiles', ['clean-dist'], function () {
23-
return gulp.src(['./**/*', '!dist{,/**}',
23+
return gulp.src([
24+
'./**/*',
25+
'!dist{,/**}',
2426
'!node_modules{,/**}',
2527
'!engine{,*}.html'
2628
])
@@ -79,29 +81,20 @@ gulp.task('page-index-js', ['copyFiles'], function () {
7981
'dist/components/i18next-browser-languagedetector/i18nextBrowserLanguageDetector.min.js',
8082
'dist/components/i18next-xhr-backend/i18nextXHRBackend.min.js',
8183
'dist/components/jquery-i18next/jquery-i18next.min.js',
84+
'dist/components/defiant/dist/defiant.min.js',
8285

8386
// Engine
84-
'dist/js/engine/setImmediate.js',
85-
'dist/js/engine/paho.js',
86-
'dist/js/engine/webduino.js',
87-
'dist/js/engine/core/EventEmitter.js',
88-
'dist/js/engine/core/util.js',
89-
'dist/js/engine/util/promisify.js',
90-
'dist/js/engine/core/Transport.js',
91-
'dist/js/engine/core/Pin.js',
92-
'dist/js/engine/core/Module.js',
87+
'dist/components/webduino-js/dist/webduino-base.js',
9388
'dist/js/engine/core/Board.js',
94-
'dist/js/engine/core/WebArduino.js',
95-
'dist/js/engine/core/Arduino.js',
89+
'dist/js/engine/transport/MqttTransport.js',
90+
'dist/components/webduino-js/src/core/WebArduino.js',
9691
'dist/js/engine/components/Engine.js',
9792
'dist/js/engine/components/Led.js',
9893
'dist/js/engine/components/RGBLed.js',
9994
'dist/js/engine/components/Buzzer.js',
10095
'dist/js/engine/components/Servo.js',
10196
'dist/js/engine/components/Matrix.js',
10297
'dist/js/engine/components/UltraSonic.js',
103-
'dist/js/engine/transport/MqttTransport.js',
104-
'dist/js/engine/transport/WebSocketTransport.js',
10598

10699
// ui
107100
'dist/js/roundedCorner.js',

0 commit comments

Comments
 (0)