diff --git a/gulpfile.js b/gulpfile.js index df1d003..e965c11 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -24,6 +24,9 @@ gulp.task("package:win32", function(done) { ignore: "/package($|/)", asar: true, }, function(err) { + if (err) { + console.error(err); + } done(); }); }); diff --git a/index.js b/index.js index 7123858..78fd069 100644 --- a/index.js +++ b/index.js @@ -80,7 +80,12 @@ var fileMenu = { accelerator: 'CmdOrCtrl+O', click: function() { dialog.showOpenDialog({ - properties: ['openFile', 'openDirectory'] + defaultPath: app.getPath('userDesktop'), + properties: ['openFile'], + filters: [{ + name: 'Documents', + extensions: ['txt', 'md', 'text'] + }, ], }, function(fileNames) { if (fileNames) { createWindow(fileNames[0]); diff --git a/js/diagram.js b/js/diagram.js index ff5f1f3..b98e603 100644 --- a/js/diagram.js +++ b/js/diagram.js @@ -70,7 +70,7 @@ var refresh = function(data) { $(this).find("ellipse").attr("stroke-width", "4"); }); svg.find("g.node").on("click", function(e) { - var text = $(this).find("title").text(); + var text = $(this).find("title").text().trim(); if ($(this).find("ellipse").length === 0) { var lines = metaData[text].lines; emitter.emit("page-click", lines); diff --git a/js/editor.js b/js/editor.js index 31a8696..2d9d9bc 100644 --- a/js/editor.js +++ b/js/editor.js @@ -57,7 +57,11 @@ var getFileName = function(forceDialog) { return ok(EDITOR_FILE_NAME); } else { dialog.showSaveDialog({ - title: "save file" + title: "save file", + filters: [{ + name: 'Documents', + extensions: ['txt', 'md', 'text'] + }, ], }, function(fileName) { if (fileName) { ok(fileName); diff --git a/js/script.js b/js/script.js index 5fb2c11..6371d45 100644 --- a/js/script.js +++ b/js/script.js @@ -1,11 +1,26 @@ -var $ = require("./js/jquery-2.1.4.min"); +//process.env.NODE_PATH = "./"; +if (process.platform == "win32") { + //modulePaths.push(); + var p = process.resourcesPath + "\\app.asar"; + console.log(p); + module.paths.push(p); +} +var resolvePath = function(p) { + if (process.platform == "win32") { + return p.replace(/^\.\//, ''); + } else { + return p; + } +}; var ipcRenderer = require("electron").ipcRenderer; var remote = require("remote"); var fs = require("fs"); -var uiflow = remote.require("./app/uiflow"); -var editor = require("./js/editor"); -var diagram = require("./js/diagram"); var flumine = require("flumine"); +var $ = require(resolvePath("./js/jquery-2.1.4.min")); +var uiflow = remote.require("./app/uiflow"); +var editor = require(resolvePath("./js/editor")); +var diagram = require(resolvePath("./js/diagram")); + [ "open", "save", @@ -86,6 +101,8 @@ $(function() { cElement.width = width * 2; cElement.height = height * 2; var cContext = cElement.getContext("2d"); + cContext.fillStyle = "#fff"; + cContext.fillRect(-10, -10, width * 3, height * 3); cContext.drawImage(image, 0, 0, width * 2, height * 2); var png = cElement.toDataURL("image/png"); diff --git a/package/darwin/guiflow-darwin-x64/guiflow.app/Contents/Resources/app.asar b/package/darwin/guiflow-darwin-x64/guiflow.app/Contents/Resources/app.asar index ff68a66..6f5ea12 100644 Binary files a/package/darwin/guiflow-darwin-x64/guiflow.app/Contents/Resources/app.asar and b/package/darwin/guiflow-darwin-x64/guiflow.app/Contents/Resources/app.asar differ diff --git a/package/linux/guiflow-linux-x64/resources/app.asar b/package/linux/guiflow-linux-x64/resources/app.asar index ff68a66..6f5ea12 100644 Binary files a/package/linux/guiflow-linux-x64/resources/app.asar and b/package/linux/guiflow-linux-x64/resources/app.asar differ diff --git a/package/win32/guiflow-win32-x64/resources/app.asar b/package/win32/guiflow-win32-x64/resources/app.asar index ff68a66..6f5ea12 100644 Binary files a/package/win32/guiflow-win32-x64/resources/app.asar and b/package/win32/guiflow-win32-x64/resources/app.asar differ