🔗 Update relocated script links

tterb · Nov 27, 2017 · ceffb0c · ceffb0c
1 parent d3db3c5
commit ceffb0c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/index.html b/index.html
@@ -204,7 +204,7 @@
     <!-- Settings Menu -->
     <section id="settingsMenu">
       <div id="settings-title" class="title">
-        <img id="cog" src="assets/img/cog.png"/><h2>Settings</h2>
+        <img id="cog" alt="settings" src="assets/img/cog.png"/><h2>Settings</h2>
       </div>
       <div id="editorSettings" class="settings-section">
         <h3>Editor</h3>
@@ -465,19 +465,19 @@ <h4 class="modal-title">Unsaved Changes</h4>
   </div>
   <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
   <script>if(window.module) module = window.module;</script>
-  <script src="assets/js/jquery.min.js"></script>
-  <script src="assets/js/bootstrap/bootstrap.min.js"></script>
-  <script src="assets/js/bootstrap/bootstrap-select.min.js"></script>
-  <script src="assets/js/bootstrap/bootstrap-notify.js"></script>
-  <script src="assets/js/codemirror/search.js"></script>
-  <script src="assets/js/codemirror/searchcursor.js"></script>
-  <script src="assets/js/showdown-icon.js"></script>
-  <script src="assets/js/settings.js"></script>
-  <script src="assets/js/app.js"></script>
-  <script src="assets/js/modal.js"></script>
-  <script src="assets/js/emoji.js"></script>
-  <script src="assets/js/format.js"></script>
-  <script src="assets/js/functions.js"></script>
-  <script src="assets/js/ipc_renderer.js"></script>
+  <script src="js/jquery.min.js"></script>
+  <script src="js/bootstrap/bootstrap.min.js"></script>
+  <script src="js/bootstrap/bootstrap-select.min.js"></script>
+  <script src="js/bootstrap/bootstrap-notify.js"></script>
+  <script src="js/codemirror/search.js"></script>
+  <script src="js/codemirror/searchcursor.js"></script>
+  <script src="js/showdown-icon.js"></script>
+  <script src="js/settings.js"></script>
+  <script src="js/app.js"></script>
+  <script src="js/modal.js"></script>
+  <script src="js/emoji.js"></script>
+  <script src="js/format.js"></script>
+  <script src="js/functions.js"></script>
+  <script src="js/ipc_renderer.js"></script>
 </body>
 </html>
diff --git a/main.js b/main.js
@@ -18,7 +18,7 @@
 
 'use strict';
 // handle setupevents as quickly as possible
-const setupEvents = require('./assets/js/installer/setupEvents');
+const setupEvents = require('./js/installer/setupEvents');
 if(setupEvents.handleSquirrelEvent()) { return; }
 const electron = require('electron');
 const app = electron.app;
@@ -27,7 +27,7 @@ const dialog = electron.dialog;
 const shell = electron.shell;
 const BrowserWindow = electron.BrowserWindow;
 const {Menu, MenuItem} = require('electron');
-const config = require('./assets/js/config');
+const config = require('./js/config');
 const tray = require('./tray');
 const settings = require('electron-settings');
 const fs = require('fs');
@@ -101,7 +101,6 @@ process.argv.forEach(function(val, index, array) {
   }
 });
 
-
 const createWindow = exports.createWindow = (filePath) => {
   let argFile;
   let newWindow = window.createWindow(getWindowConfig());
@@ -244,10 +243,10 @@ var template = [
 		}}
 	]},
 	{label:'&Help', role: 'help', submenu: [
-		{label:'Markdown Help', click:() => {
-			ipcSend('markdown-modal');
-		}},
-		{type:'separator'},
+		// {label:'Markdown Help', click:() => {
+		// 	ipcSend('markdown-modal');
+		// }},
+		// {type:'separator'},
 		{label:'Documentation', click:() => {
 			shell.openExternal(packageJSON.docs);
 		}},
@@ -257,6 +256,10 @@ var template = [
 		{label:'Report Issue', click:() => {
 			shell.openExternal(packageJSON.repository.bugs);
 		}},
+    {type:'separator'},
+    {label:'Markdown Help', click:() => {
+      ipcSend('markdown-modal');
+    }},
 		{type:'separator'},
 		{label:'About Hyde', click:() => {
 			ipcSend('about-modal');
@@ -359,7 +362,6 @@ app.on('ready', function() {
     mainWindow.webContents.openDevTools();
   }
 
-
   // FIXME: Window is still being removed from window.windows array
   mainWindow.on('close', (e) => {
     if(process.platform === 'darwin') {
@@ -388,6 +390,7 @@ app.on('ready', function() {
 });
 
 ipc.on('changed-state', (state) => {
+  // hasChanges = settings.get('hasChanges');
   hasChanges = state;
 });
 
@@ -407,11 +410,10 @@ app.on('open-file', (e, path) => {
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
-  // On OSX it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd+Q
-  if(process.platform !== 'darwin') {
+  // On OSX it is common for applications and their menu bar to stay active until the user quits explicitly with Cmd+Q
+  // if(process.platform !== 'darwin') {
     app.quit();
-  }
+  // }
 });
 
 app.on('quit', (e) => {