Skip to content

Use node module "path" #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use node module "path" #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2098ad1
Refactoring.
Sep 1, 2019
8e5446e
Crossplatfom by using node module "path".
Sep 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

const { ipcRenderer, remote } = require('electron');
const customTitlebar = require('custom-electron-titlebar');
const path = require("path");

/**
* @desc Main view class containing all rendering and
Expand Down Expand Up @@ -136,7 +137,7 @@
* @param {*} pathName
*/
_createTabElement(pathName) {
const filename = pathName.substring(pathName.lastIndexOf('\\') + 1);
const filename = path.basename(pathName);
const tabElement = document.createElement('div');
const labelElement = document.createElement('div');
const closeElement = document.createElement('div');
Expand Down Expand Up @@ -316,8 +317,9 @@
}

// Switch to tab if already open
if (this._paths.indexOf(pathName) >= 0) {
this._switchTab(this._tabs[this._paths.indexOf(pathName)]);
let itab = this._paths.indexOf(pathName);
if (itab >= 0) {
this._switchTab(this._tabs[itab]);
return;
}

Expand Down