Skip to content

Commit 1bdd02c

Browse files
kimorkimkimorkim
committed
Merge pull request #33 from entrylabs/feature/new-blocks
Feature/new blocks
2 parents ea3e4a2 + 56ab4bd commit 1bdd02c

22 files changed

+4619
-1497
lines changed

‎app/bower.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"node"
77
],
88
"dependencies": {
9-
"entryjs": "https://github.com/entrylabs/entryjs.git#1.2.1",
9+
"entryjs": "https://github.com/entrylabs/entryjs.git#1.3.1",
1010
"entry-hw": "https://github.com/entrylabs/entry-hw.git#master",
1111
"jquery": "~1.11.3",
1212
"jquery-ui": "~1.11.x",
@@ -15,6 +15,7 @@
1515
"EaselJS": "https://github.com/boolgom/EaselJS.git",
1616
"SoundJS": "0.6.0",
1717
"webfontloader": "1.5.18",
18+
"velocity": "~1.2.3",
1819
"angular": "angularjs#~1.4.7",
1920
"angular-cookies": "~1.4.3",
2021
"angular-filters": "~1.1.2",

‎app/entry_offline.html‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,11 @@
22
<html ng-app="workspace">
33
<head>
44
<meta charset="utf-8">
5-
<!--
6-
<link rel='stylesheet' href='./bower_components/entryjs/dist/entry.css' />
7-
<link rel='stylesheet' href='./css/nanumbarungothic.css' />
8-
<link rel='stylesheet' href='./css/header.css' />
9-
<link rel='stylesheet' href='./css/workspace_header.css' />
10-
<link rel='stylesheet' href='./css/workspace.css' />
11-
<link rel='stylesheet' href='./css/modal.css' />
12-
<link rel='stylesheet' href='./bower_components/bootstrap/dist/css/bootstrap.css' />
13-
-->
145
<link rel='stylesheet' href='./css/fonts.css' />
156
<link rel='stylesheet' href='./css/developer.css' />
167
<script type="text/javascript" src="./src/main.js"></script>
178
<script type="text/javascript" src="./src/ws.js"></script>
189
<script type="text/javascript" src="./src/require.js"></script>
19-
<!-- <script type='text/javascript' src='./node_modules/socket.io-client/socket.io.js'></script> -->
2010
<script type='text/javascript' src='./bower_components/jquery/dist/jquery.min.js'></script>
2111
<script type='text/javascript' src='./bower_components/jquery-ui/jquery-ui.min.js'></script>
2212
<script type='text/javascript' src='./bower_components/angular/angular.min.js'></script>
@@ -34,21 +24,23 @@
3424
<script type='text/javascript' src='./bower_components/SoundJS/lib/soundjs-0.6.0.combined.js'></script>
3525
<script type='text/javascript' src='./bower_components/SoundJS/lib/flashaudioplugin-0.6.0.combined.js'></script>
3626
<script type='text/javascript' src='./bower_components/webfontloader/webfontloader.js'></script>
27+
<script type='text/javascript' src='./bower_components/velocity/velocity.min.js'></script>
3728
<script type='text/javascript' src='./src/app.js'></script>
3829
<script type='text/javascript' src='./bower_components/entryjs/extern/blockly/blockly_compressed.js'></script>
3930
<script type='text/javascript' src='./bower_components/entryjs/extern/util/static.js'></script>
4031
<script type='text/javascript' src='./bower_components/entryjs/extern/util/CanvasInput.js'></script>
4132
<script type='text/javascript' src='./bower_components/entryjs/extern/util/handle.js'></script>
4233
<script type='text/javascript' src='./bower_components/entryjs/extern/util/ndgmr.Collision.js'></script>
4334
<script type='text/javascript' src='./bower_components/entryjs/dist/entry.js'></script>
44-
35+
<script type='text/javascript'>
36+
Entry.isOffline = true;
37+
</script>
38+
<script type='text/javascript' src='./bower_components/entryjs/src/workspace/block_entry.js'></script>
4539
<script type='text/javascript' src='./src/context.js'></script>
4640
<script type="text/javascript" src="./src/filters.js"></script>
4741
<script type="text/javascript" src="./lang/pictures.js"></script>
4842
<script type="text/javascript" src="./lang/sounds.js"></script>
4943
<script type="text/javascript" src="./lang/sprites.js"></script>
50-
<!--
51-
<script type="text/javascript" src="./src/native_menu.js"></script> -->
5244
<script type="text/javascript" src="./src/native_controll.js"></script>
5345
<script type="text/javascript" src="./src/native_menu.js"></script>
5446

‎app/entry_offline.js‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
'use strict';
22

33
const electron = require('electron');
4-
const ipcMain = electron.ipcMain;
5-
const app = electron.app; // 어플리케이션 기반을 조작 하는 모듈.
6-
const BrowserWindow = electron.BrowserWindow; // 네이티브 브라우저 창을 만드는 모듈.
4+
const {app, BrowserWindow, Menu, globalShortcut, ipcMain} = electron;
75
const path = require('path');
86
const fs = require('fs');
9-
const Menu = electron.Menu;
107
const packageJson = require('./package.json');
118
const ChildProcess = require('child_process');
129

@@ -258,7 +255,6 @@ var handleStartupEvent = function() {
258255
}
259256
};
260257

261-
262258
var mainWindow = null;
263259
var hardwareWindow = null;
264260
var isClose = true;
@@ -269,12 +265,17 @@ app.on('window-all-closed', function() {
269265
});
270266

271267
var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
272-
// 어플리케이션을 중복 실행했습니다. 주 어플리케이션 인스턴스를 활성화 합니다.
268+
// 어플리케이션을 중복 실행했습니다. 주 어플리케이션 인스턴스를 활성화 합니다.
273269
if (mainWindow) {
274270
if (mainWindow.isMinimized())
275271
mainWindow.restore();
276272
mainWindow.focus();
273+
274+
if(Array.isArray(commandLine) && commandLine[1]) {
275+
mainWindow.webContents.send('loadProject', commandLine[1]);
276+
}
277277
}
278+
278279
return true;
279280
});
280281

@@ -317,10 +318,25 @@ app.once('ready', function() {
317318
e.preventDefault();
318319
});
319320
mainWindow.on('close', function(e) {
321+
if(hardwareWindow) {
322+
hardwareWindow.close();
323+
}
320324
mainWindow.webContents.send('main-close');
321325
});
322326
mainWindow.on('closed', function() {
323327
mainWindow = null;
328+
app.quit();
329+
process.exit(0);
330+
});
331+
332+
let inspectorShortcut = '';
333+
if(process.platform == 'darwin') {
334+
inspectorShortcut = 'Command+Alt+i';
335+
} else {
336+
inspectorShortcut = 'Control+Shift+i';
337+
}
338+
globalShortcut.register(inspectorShortcut, () => {
339+
mainWindow.webContents.openDevTools();
324340
});
325341
});
326342

@@ -356,24 +372,10 @@ ipcMain.on('openHardware', function(event, arg) {
356372
}
357373

358374
hardwareWindow.show();
375+
} else {
376+
if (hardwareWindow.isMinimized())
377+
hardwareWindow.restore();
378+
hardwareWindow.focus();
359379
}
360380

361381
});
362-
363-
// try{
364-
// if (handleStartupEvent()) {
365-
// logger('handleStartupEvent = true');
366-
// app.quit();
367-
// process.exit(0);
368-
// // setTimeout(function () {
369-
// // }, 1000)
370-
// return;
371-
// } else {
372-
// logger('handleStartupEvent = false');
373-
374-
// }
375-
// } catch(e) {
376-
// logger(e.stack);
377-
// app.quit();
378-
// process.exit(0);
379-
// }

0 commit comments

Comments
 (0)