From 2c6fc729900464808f40ad3274a4723a2b58249b Mon Sep 17 00:00:00 2001 From: jykim Date: Wed, 29 Nov 2017 15:27:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=88=EB=A1=9C=EA=B7=B8=EB=A6=AC=EA=B8=B0?= =?UTF-8?q?=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/require.js | 1 - src/renderer/src/workspace.js | 9 +- src/renderer/src/ws.js | 762 +++++++++--------- .../views/modal/picture_draw_new.html | 2 +- src/renderer/views/modal/sprite_draw_new.html | 2 +- 5 files changed, 396 insertions(+), 380 deletions(-) diff --git a/src/renderer/src/require.js b/src/renderer/src/require.js index 6552eee25..92ebac321 100644 --- a/src/renderer/src/require.js +++ b/src/renderer/src/require.js @@ -29,7 +29,6 @@ const sharedObject = remote.getGlobal('sharedObject'); const mainWindowId = sharedObject.mainWindowId; const _mainWindow = BrowserWindow.fromId(mainWindowId); const archiver = require('archiver'); -sharedObject.isInitEntry = false; import parser from './bower_components/entryjs/extern/util/filbert.js'; const filbert = parser; diff --git a/src/renderer/src/workspace.js b/src/renderer/src/workspace.js index a053cbfbb..28556e72c 100644 --- a/src/renderer/src/workspace.js +++ b/src/renderer/src/workspace.js @@ -411,9 +411,12 @@ angular.module('workspace').controller("WorkspaceController", ['$scope', '$rootS } else { project_name = project.name; if (project.path) { - myProject.isModeChange = false; - myProject.isSaved = true; - myProject.isSavedPath = project.path; + var parser = path.parse(project.path); + if(parser.ext) { + myProject.isModeChange = false; + myProject.isSaved = true; + myProject.isSavedPath = project.path; + } } sessionStorage.setItem('isDefaultProject', false); $scope.project.parent = project.parent; diff --git a/src/renderer/src/ws.js b/src/renderer/src/ws.js index e423196b7..83510ed28 100644 --- a/src/renderer/src/ws.js +++ b/src/renderer/src/ws.js @@ -44,17 +44,17 @@ /* 0 */ /***/ function(module, exports, __webpack_require__) { - __webpack_require__(684); - __webpack_require__(688); - __webpack_require__(695); - __webpack_require__(249); - __webpack_require__(58); - __webpack_require__(849); + __webpack_require__(685); + __webpack_require__(689); + __webpack_require__(696); + __webpack_require__(250); + __webpack_require__(59); __webpack_require__(851); - __webpack_require__(1188); - __webpack_require__(825); - __webpack_require__(731); - __webpack_require__(1199); + __webpack_require__(853); + __webpack_require__(1197); + __webpack_require__(826); + __webpack_require__(732); + __webpack_require__(1208); /***/ }, /* 1 */, @@ -103,7 +103,8 @@ /* 44 */, /* 45 */, /* 46 */, -/* 47 */ +/* 47 */, +/* 48 */ /***/ function(module, exports) { /* @@ -156,26 +157,26 @@ }; /***/ }, -/* 48 */ +/* 49 */ /***/ function(module, exports) { module.exports = "data:image/png;base64,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" /***/ }, -/* 49 */ +/* 50 */ /***/ function(module, exports) { module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAHCAYAAADam2dgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFlJREFUeNpizIn61MDAwGDPgBtcYAQqeg9kCOBRxMAExI0M+MEERhAJNG0/kHLAZtWUZXyGTFBOIhB/wKIoEWYdA1D1AyzWNgLFL4AYjMiiSNaCrYGJAwQYANL5GA7jJmyVAAAAAElFTkSuQmCC" /***/ }, -/* 50 */ +/* 51 */ /***/ function(module, exports) { module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAYAAABy6+R8AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHNJREFUeNpi/P//vwADA0MBAwRMYGRk/MCABaCoA3Ia/iPAeagkhgaoHBgwockbAPF+ZI1Q9n6oHHZTkG3EJUdII1bDCNn4n5B/8WlE0cDEQAkg2XkkBwRZQY6WIjCcgU0jekBcAGJH5PQHZTtC5cAAIMAAkYWCgj8a9uYAAAAASUVORK5CYII=" /***/ }, -/* 51 */, -/* 52 */ +/* 52 */, +/* 53 */ /***/ function(module, exports, __webpack_require__) { /* @@ -427,21 +428,21 @@ /***/ }, -/* 53 */, /* 54 */, /* 55 */, /* 56 */, /* 57 */, -/* 58 */ +/* 58 */, +/* 59 */ /***/ function(module, exports, __webpack_require__) { // style-loader: Adds some css to the DOM by adding a