Merge pull request #111 from takamin/use-jquery-cdn

Load jquery via CDN
takamin · Sep 16, 2018 · f6bac74 · f6bac74
2 parents 22c9881 + 9a5bf69
commit f6bac74
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 31 deletions.
diff --git a/MZ-700/mz700-emu-base.js b/MZ-700/mz700-emu-base.js
@@ -1,7 +1,6 @@
 /* global Uint8Array */
 require("../lib/context.js");
 require("../lib/ex_number.js");
-const              $ = require("jquery");
 const    TransWorker = require('transworker');
 const   Z80_assemble = require("../Z80/assembler.js");
 const  MZ_TapeHeader = require('./mz-tape-header.js');

diff --git a/MZ-700/mz700-emu.js b/MZ-700/mz700-emu.js
@@ -1,6 +1,3 @@
-window.jQuery = require("jquery");
-const $ = window.jQuery;
-require("jquery-ui");
 require("fullscrn");
 const      packageJson = require("../package.json");
 const    dock_n_liquid = require("dock-n-liquid");

diff --git a/emu.html b/emu.html
@@ -13,7 +13,7 @@
         <meta name="twitter:description" content="This is the emulator of MZ-700 and Z80 running on the HTML5 browsers. MZ-700 is the Japanese historical 8 bits micro computer released  in Nov. 1982 from SHARP corp.">
         <meta name="twitter:image" content="https://takamin.github.io/mz700-js/image/title.png">
         <title>MZ-700 FULL JAVASCRIPT EMULATOR</title>
-        <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.0-rc.2/themes/smoothness/jquery-ui.css"/>
+        <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css"/>
         <link rel="stylesheet" type="text/css" href="./lib/jquery.ddpanel.css"/>
         <link rel="stylesheet" type="text/css" href="./lib/jquery.soundctrl.css"/>
         <link rel="stylesheet" type="text/css" href="./lib/jquery.Z80-reg.css"/>
@@ -206,6 +206,20 @@
         POP     AF
         RET
         </textarea>
+
+        <!-- jQuery CDN -->
+        <script
+          src="https://code.jquery.com/jquery-3.3.1.min.js"
+          integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
+          crossorigin="anonymous"></script>
+
+        <!-- jQuery-UI CDN -->
+        <script
+          src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"
+          integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU="
+          crossorigin="anonymous"></script>
+
+        <!-- MZ700-JS -->
         <script type="text/javascript" src="./js/bundle-mz700-emu.js"></script>
     </body>
 </html>
diff --git a/lib/jquery.Z80-addr-spec.js b/lib/jquery.Z80-addr-spec.js
@@ -1,5 +1,4 @@
 "use strict";
-const $ = require("jquery");
 const parseAddress = require("../lib/parse-addr.js");
 const jquery_plugin_class = require("../lib/jquery_plugin_class");
 jquery_plugin_class("Z80AddressSpecifier");

diff --git a/lib/jquery.Z80-mem.js b/lib/jquery.Z80-mem.js
@@ -1,6 +1,5 @@
 "use stringify";
 const mz700charcode = require("./mz700-charcode.js");
-var $ = require("jquery");
 var jquery_plugin_class = require("../lib/jquery_plugin_class");
 var easing = require("../lib/easing.js");
 

diff --git a/lib/jquery.Z80-reg.js b/lib/jquery.Z80-reg.js
@@ -1,5 +1,4 @@
 (function() {
-    var $ = require("jquery");
     var jquery_plugin_class = require("../lib/jquery_plugin_class");
     jquery_plugin_class("Z80RegView");
     var Z80RegView = function(element) {

diff --git a/lib/jquery.asmeditor.js b/lib/jquery.asmeditor.js
@@ -1,6 +1,5 @@
 "use strict";
 
-const $ = require("jquery");
 const jquery_plugin_class = require("../lib/jquery_plugin_class");
 const CodeMirror = require("codemirror");
 

diff --git a/lib/jquery.asmlist.js b/lib/jquery.asmlist.js
@@ -1,6 +1,5 @@
 "use strict";
 
-const $ = require("jquery");
 const jquery_plugin_class = require("../lib/jquery_plugin_class");
 
 require("./jquery.tabview.js");

diff --git a/lib/jquery.asmview.js b/lib/jquery.asmview.js
@@ -1,5 +1,4 @@
 "use strict";
-var $ = require("jquery");
 var jquery_plugin_class = require("../lib/jquery_plugin_class");
 
 require("./jquery.tabview.js");

diff --git a/lib/jquery.ddpanel.js b/lib/jquery.ddpanel.js
@@ -1,5 +1,4 @@
 (function() {
-    var $ = require("jquery");
     var jquery_plugin_class = require("../lib/jquery_plugin_class");
     var plugin_name = "DropDownPanel";
     jquery_plugin_class(plugin_name);

diff --git a/lib/jquery.mz700-kb.js b/lib/jquery.mz700-kb.js
@@ -1,5 +1,4 @@
 (function() {
-    var $ = require("jquery");
     var MZ700KeyMatrix = require("../MZ-700/mz700-key-matrix.js");
     var jquery_plugin_class = require("../lib/jquery_plugin_class");
     jquery_plugin_class("mz700keyboard");

diff --git a/lib/jquery.mz700-scrn.js b/lib/jquery.mz700-scrn.js
@@ -34,7 +34,6 @@ THE SOFTWARE.
 (function() {
     "use strict";
 
-    var $ = require("jquery");
     var jquery_plugin_class = require("../lib/jquery_plugin_class");
     var mz700cg = require("../lib/mz700-cg.js");
 

diff --git a/lib/jquery.soundctrl.js b/lib/jquery.soundctrl.js
@@ -1,5 +1,4 @@
 (function() {
-    var $ = require("jquery");
     var jquery_plugin_class = require("../lib/jquery_plugin_class");
     jquery_plugin_class("soundctrl");
     var soundctrl = function(element) {

diff --git a/lib/jquery.tabview.js b/lib/jquery.tabview.js
@@ -1,5 +1,4 @@
 "use strict";
-var $ = require("jquery");
 var jquery_plugin_class = require("../lib/jquery_plugin_class");
 jquery_plugin_class("tabview");
 

diff --git a/lib/jquery.toggle-button.js b/lib/jquery.toggle-button.js
@@ -1,5 +1,4 @@
 "use strict";
-const $ = require("jquery");
 const jquery_plugin_class = require("../lib/jquery_plugin_class");
 jquery_plugin_class("ToggleButton");
 

diff --git a/lib/jquery.vscrlist.js b/lib/jquery.vscrlist.js
@@ -1,5 +1,4 @@
 "use strict";
-const $ = require("jquery");
 const doLater = require("../lib/do-later.js");
 const jquery_plugin_class = require("../lib/jquery_plugin_class");
 jquery_plugin_class("vscrlist");

diff --git a/lib/jquery_plugin_class.js b/lib/jquery_plugin_class.js
@@ -1,6 +1,6 @@
 (function() {
     "use strict";
-    var jQuery = require("jquery");
+    const jQuery = $;
     try {
         var jquery_plugin_class = function(class_name) {
             jQuery.fn[class_name] = function(method_name) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,8 +32,6 @@
     "grunt-eslint": "^20.1.0",
     "hash-arg": "0.3.3",
     "http-server": "^0.11.1",
-    "jquery": "^3.3.1",
-    "jquery-ui": "^1.12.1",
     "linebyline": "^1.3.0",
     "list-it": "^0.4.1",
     "load-grunt-tasks": "^4.0.0",
@@ -76,6 +74,7 @@
       "mocha": true
     },
     "globals": {
+      "$": true,
       "ArrayBuffer": true
     },
     "rules": {