16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Add correct jquery

This commit is contained in:
Matt 2016-04-12 13:57:59 -04:00
parent 51c47b9f98
commit 4b6d11cdc8
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/index.html
View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Hello World!</title> <title>mcopy</title>
<link href="./css/bootstrap.min.css" rel="stylesheet"> <link href="./css/bootstrap.min.css" rel="stylesheet">
<link href="./css/w2ui-1.4.3.min.css" rel="stylesheet"> <link href="./css/w2ui-1.4.3.min.css" rel="stylesheet">
<link href="./css/effeckt.css" rel="stylesheet"> <link href="./css/effeckt.css" rel="stylesheet">
@ -16,8 +16,8 @@
</div> </div>
</div> </div>
</nav> </nav>
<script src="./js/jquery-1.11.3.min.js"></script>
<script src="./js/w2ui-1.4.3.min.js"></script> <script src="./js/w2ui-1.4.3.min.js"></script>
<script src="./js/jquery-2.2.3.min.js"></script>
<script src="./js/chroma.min.js"></script> <script src="./js/chroma.min.js"></script>
<script src="./js/index.js"></script> <script src="./js/index.js"></script>
</body> </body>

5
app/js/jquery-1.11.3.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
app/js/jquery-2.2.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
app/main.js
View File

@ -15,9 +15,11 @@ var mainWindow;
var init = function () { var init = function () {
createWindow(); createWindow();
mcopy.arduino.init(function (success) { mcopy.arduino.init(function (success) {
if (success) {
mcopy.arduino.connect(function () { mcopy.arduino.connect(function () {
// //
}); });
}
}); });
}; };
@ -28,7 +30,7 @@ var createMenu = function () {
var createWindow = function () { var createWindow = function () {
mainWindow = new BrowserWindow({width: 800, height: 600}); mainWindow = new BrowserWindow({width: 800, height: 600});
mainWindow.loadURL('file://' + __dirname + '/index.html'); mainWindow.loadURL('file://' + __dirname + '/index.html');
mainWindow.webContents.openDevTools(); //mainWindow.webContents.openDevTools();
mainWindow.on('closed', function() { mainWindow.on('closed', function() {
mainWindow = null; mainWindow = null;
}); });