update edit graph

week05/windowapp/chartMenu/graph.html

@@ -154,7 +154,7 @@
                                     <img src="../asset/image/icon/files.png" alt="..." class="preview">
                                 </button>
                                 <button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;"
-                                onclick="ChartEdit('./customChart/01/01.html')">
+                                    onclick="ChartEdit('./customChart/01/test.html')">
                                     <img src="../asset/image/icon/create.png" alt="..." class="preview">
                                 </button>
                                 <br>
@@ -465,9 +465,13 @@
 
 
     <!-- Bootstrap core JavaScript -->
-    <script src="../asset/js/jquery/jquery.min.js"></script>
+    <!-- <script src="../asset/js/jquery/jquery.min.js"></script> -->
     <script src="../asset/bootstrap/js/bootstrap.bundle.min.js"></script>
 
+    <script>
+        window.$ = window.jQuery = require("../asset/js/jquery/jquery.min.js")
+    </script>
+
     <script>
         function ChartEdit(path) {
             var win = window.open(path, '_blank');

week05/windowapp/chartMenu/graph01.html

@@ -154,7 +154,7 @@
                                     <img src="../asset/image/icon/files.png" alt="..." class="preview">
                                 </button>
                                 <button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;"
-                                    onclick="ChartEdit('./customChart/01/01.html')">
+                                    onclick="ChartEdit('./customChart/01/test.html')">
                                     <img src="../asset/image/icon/create.png" alt="..." class="preview">
                                 </button>
                                 <br>

week05/windowapp/graph.html

@@ -14,6 +14,12 @@
 
     <link href="./asset/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <link rel="stylesheet" href="./asset/css/round-about.css">
+
+
+
+
+
+
     <style>
         img.preview {
             display: block;
@@ -160,7 +166,7 @@
                                     <img src="./asset/image/icon/files.png" alt="..." class="preview">
                                 </button>
                                 <button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;"
-                                onclick="ChartEdit('./chartMenu/customChart/01/01.html')">
+                                    onclick="ChartEdit('./chartMenu/customChart/01/test.html')">
                                     <img src="./asset/image/icon/create.png" alt="..." class="preview">
                                 </button>
                                 <br>
@@ -475,7 +481,27 @@
         <!-- Bootstrap core JavaScript -->
         <script src="./asset/js/jquery/jquery.min.js"></script>
         <script src="./asset/bootstrap/js/bootstrap.bundle.min.js"></script>
-        <!-- <script src="./asset/js/canvasjs/canvasjs.min.js"></script> -->
+
+
+
+        <script>
+            //  <script src="./asset/js/jquery/jquery.min.js">            try {
+                    // window.$ = window.jQuery = require("./asset/js/jquery/jquery.min.js");
+                    // window.$ = window.jQuery = require("./asset/bootstrap/js/bootstrap.bundle.min.js");
+
+
+                //     // window.$ = window.jQuery = require("./asset/js/jquery/jquery.min.js");
+                //     window.$ = window.jQuery = require("./asset/bootstrap/js/bootstrap.bundle.min.js");
+                //     $ = jQuery = module.exports;
+                // } catch (e) {}
+                // mainWindow.webContents.on('did-start-loading', function () {
+                //     mainWindow.webContents.executeJavaScript(
+                //         "var $ = jQuery = require('./asset/js/jquery/jquery.min.js'), mainWindow = require('remote').getCurrentWindow();"
+                //     );
+                // });
+        </script>
+
+
         <script>
             function ChartEdit(path) {
                 var win = window.open(path, '_blank');

week05/windowapp/package-lock.json

@@ -947,6 +947,11 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "jquery": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
+    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",

week05/windowapp/package.json

@@ -20,5 +20,8 @@
   "devDependencies": {
     "electron": "^1.8.2",
     "electron-packager": "^11.0.1"
+  },
+  "dependencies": {
+    "jquery": "^3.3.1"
   }
 }