From 9a5bf69b9ca2a9a497f54fafb58c4afa2c4f22f6 Mon Sep 17 00:00:00 2001 From: Koji Takami Date: Sun, 16 Sep 2018 19:50:28 +0900 Subject: [PATCH] Load jquery via CDN --- MZ-700/mz700-emu-base.js | 1 - MZ-700/mz700-emu.js | 3 --- emu.html | 16 +++++++++++++++- lib/jquery.Z80-addr-spec.js | 1 - lib/jquery.Z80-mem.js | 1 - lib/jquery.Z80-reg.js | 1 - lib/jquery.asmeditor.js | 1 - lib/jquery.asmlist.js | 1 - lib/jquery.asmview.js | 1 - lib/jquery.ddpanel.js | 1 - lib/jquery.mz700-kb.js | 1 - lib/jquery.mz700-scrn.js | 1 - lib/jquery.soundctrl.js | 1 - lib/jquery.tabview.js | 1 - lib/jquery.toggle-button.js | 1 - lib/jquery.vscrlist.js | 1 - lib/jquery_plugin_class.js | 2 +- package-lock.json | 10 ---------- package.json | 3 +-- 19 files changed, 17 insertions(+), 31 deletions(-) diff --git a/MZ-700/mz700-emu-base.js b/MZ-700/mz700-emu-base.js index f1482569..c0084543 100644 --- 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 index aae0a6e8..d37875ff 100644 --- 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 index 790c05d2..008f8413 100644 --- a/emu.html +++ b/emu.html @@ -13,7 +13,7 @@ MZ-700 FULL JAVASCRIPT EMULATOR - + @@ -206,6 +206,20 @@ POP AF RET + + + + + + + + diff --git a/lib/jquery.Z80-addr-spec.js b/lib/jquery.Z80-addr-spec.js index bb7a3f8c..832bd6f0 100644 --- 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 index 76cf66a7..c02f6956 100644 --- 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 index fc627c1c..283e9441 100644 --- 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 index 11bef62c..87a7a539 100644 --- 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 index 01a9aad5..b236961a 100644 --- 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 index 186396b6..c16cef44 100644 --- 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 index d6094b6f..95f8d3e7 100644 --- 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 index 69805c40..addcc12c 100644 --- 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 index 5059c29e..69037807 100644 --- 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 index fc9f3c73..a6c46487 100644 --- 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 index f3b54892..4bc2336e 100644 --- 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 index 668ec4cb..c8092750 100644 --- 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 index 3aeded87..03b0c754 100644 --- 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 index 9659fb70..2e1bc9a1 100644 --- 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 index 9c8bd169..d28bc8ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2959,16 +2959,6 @@ "isarray": "1.0.0" } }, - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" - }, - "jquery-ui": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz", - "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=" - }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", diff --git a/package.json b/package.json index e485a53a..c9a44772 100644 --- 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": {