Merge branch 'master' of https://github.com/entrylabs/entry-offline

entrylabs · Nov 21, 2017 · 1204fbc · 1204fbc
2 parents 714a999 + 3ee5f2c
commit 1204fbc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/renderer/src/native_controll.js b/src/renderer/src/native_controll.js
@@ -217,13 +217,9 @@ Entry.plugin = (function () {
     var view_menus;
     that.setZoomMenuState = function (state) {
         if(!view_menus) {
-            if(isOsx) {
-                view_menus = menu.items[2].submenu.items;
-            } else {
-                view_menus = menu.items[1].submenu.items;
-            }
+            view_menus = menu.items[2].submenu.items;
         }
-
+        
         switch(state) {
             case 'default':
                 view_menus[0].enabled = false;
@@ -297,8 +293,8 @@ Entry.plugin = (function () {
         let fileFilter = '';
 
         if (EntryStatic.isPracticalCourse) {
-            fileName = '[매뉴얼]엔트리로봇연결.zip';
-            fileNamePath = '[매뉴얼]엔트리로봇연결.zip';
+            fileName = '[매뉴얼]엔트리로봇연결.zip';
+            fileNamePath = '[매뉴얼]엔트리로봇연결.zip';
             fileFilter = { name: '*.zip', extensions: ['zip'] };
         } else if(isOsx) {
             fileName = '[매뉴얼]엔트리 하드웨어 연결(맥).pdf';

diff --git a/src/renderer/static/guide/[매뉴얼]엔트리로봇연결.zip b/src/renderer/static/guide/[매뉴얼]엔트리로봇연결.zip