Changeset 437

Timestamp:

Jul 7, 2020, 8:45:48 AM (3 years ago)

Author:

coas-nagasima

Message:

JavaScriptの読み込まれる順番によって画面が表示できないのを修正

Location:

EcnlProtoTool/trunk

Files:

• ntshell/webserver/httpd_fs.bin (modified) ( previous)
• webapp/webmrbc/copy.bat (modified) (1 diff)
• webapp/webmrbc/index.min.html (modified) (1 diff)

EcnlProtoTool/trunk/webapp/webmrbc/copy.bat

@@ -47 +47 @@
 copy /Y information.json ..\..\httpd-fs\information.json
 copy /Y js\FileSaver.min.js ..\..\httpd-fs\js\FileSaver.min.js
-copy /Y js\blockly_compressed.js ..\..\httpd-fs\js\blockly_compressed.js
-copy /Y js\bridge.min.js ..\..\httpd-fs\js\bridge.min.js
 copy /Y js\jquery-3.1.0.min.js ..\..\httpd-fs\js\jquery-3.1.0.min.js
 copy /Y js\jszip.min.js ..\..\httpd-fs\js\jszip.min.js
-copy /Y js\webmrbc.min.js ..\..\httpd-fs\js\webmrbc.min.js
+copy /Y /B js\blockly_compressed.js + js\bridge.min.js + js\webmrbc.min.js ..\..\httpd-fs\js\webmrbc.min.js
 copy /Y mrbc.min.js ..\..\httpd-fs\mrbc.min.js
 copy /Y xterm\addons\fit\fit.min.js ..\..\httpd-fs\xterm\addons\fit\fit.js

EcnlProtoTool/trunk/webapp/webmrbc/index.min.html

@@ -17 +17 @@
         <script src="ace/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
         <script src="ace/mode-ruby.js" type="text/javascript" charset="utf-8"></script>
-        <script src="js/blockly_compressed.js" type="text/javascript"></script>
         <script src="js/jszip.min.js"></script>
         <script src="js/FileSaver.min.js" type="text/javascript"></script>
         <script async src="mrbc.min.js" type="text/javascript"></script>
-        <script src="js/bridge.min.js" type="text/javascript"></script>
         <script src="js/webmrbc.min.js" type="text/javascript"></script>
 </head>