Skip to content

Commit

Permalink
새로그리기 사이즈 조절
Browse files Browse the repository at this point in the history
  • Loading branch information
kimorkim committed Nov 29, 2017
1 parent 06be1e7 commit 2c6fc72
Show file tree
Hide file tree
Showing 5 changed files with 396 additions and 380 deletions.
1 change: 0 additions & 1 deletion src/renderer/src/require.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 6 additions & 3 deletions src/renderer/src/workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
762 changes: 388 additions & 374 deletions src/renderer/src/ws.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/renderer/views/modal/picture_draw_new.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="row">
<div class="wrap">
<div class="wrap drawnew">
<div class='addnewHelperWorkspace'>
<span ng-bind-html="'Menus.draw_new_ques' | text | unsafe"></span>
<div class='addnewBtnWorkspace' ng-click='addNewPicture()'>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/views/modal/sprite_draw_new.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="row">
<div class="wrap">
<div class="wrap drawnew">
<div class='addnewHelperWorkspace'>
<span ng-bind-html="'Menus.draw_new_ques' | text | unsafe"></span>
<div class='addnewBtnWorkspace' ng-click='addNewSprite()'>
Expand Down

0 comments on commit 2c6fc72

Please sign in to comment.