Skip to content

Commit c62c930

Browse files
author
Matt
committed
updates based on feedback
1 parent b65de8f commit c62c930

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

app/css/ui.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,7 @@ body {
149149
visibility: hidden;
150150
}
151151

152-
.ui-tabs-tab:hover .ui-icon-close
153-
{
154-
visibility: visible;
155-
}
156-
152+
.ui-state-active .ui-icon,
157153
.ui-tabs-tab:hover .ui-icon-close
158154
{
159155
visibility: visible;

app/js/Tab.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class Tab {
2626
* @param {Element} container
2727
*/
2828

29-
constructor(container, tabName) {
30-
console.log(tabName)
29+
constructor(container, tabName, filename) {
30+
3131
this.tabName = tabName || " ";
3232
this.container = container
3333
this.container.html(defaultTab)
@@ -67,10 +67,13 @@ class Tab {
6767
* @param {Integer} tabId
6868
*/
6969

70-
static generateTabHeaderTemplate(tabId, tabName) {
70+
static generateTabHeaderTemplate(tabId, tabName, filename) {
71+
let tabMarkup = (filename === undefined) ?
72+
`<a href="#tab-${tabId}">${ tabId + " [no name]"}</a>` :
73+
`<a href="#tab-${tabId}" title="${filename}">${ tabName }</a>`
7174
return `
7275
<li data-tab="${tabId}">
73-
<a href="#tab-${tabId}">${tabName || "Untitled-" + tabId }</a>
76+
${ tabMarkup }
7477
<span class="ui-icon ui-icon-close" role="presentation">Remove Tab</span>
7578
</li>
7679
`

app/js/Tabs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ class Tabs {
8383
* @param {Integer} currsorPos The line to start the cursor on
8484
*/
8585

86-
newTab(input, cursorPos, tabName) {
86+
newTab(input, cursorPos, tabName, filename) {
8787

8888
// Generate HTML
89-
const tabEl = $(Tab.generateTabHeaderTemplate(this.totalTabsCreated, tabName))
89+
const tabEl = $(Tab.generateTabHeaderTemplate(this.totalTabsCreated, tabName, filename))
9090
const contentEl = $(Tab.generateTabContentTemplate(this.totalTabsCreated))
9191

9292
// Setup listener to remove tab
@@ -98,7 +98,7 @@ class Tabs {
9898
this.container.append(contentEl)
9999

100100
// Create the new tab
101-
const newTab = new Tab(contentEl, tabName)
101+
const newTab = new Tab(contentEl, tabName, filename)
102102
newTab.setTheme(this.theme)
103103
this.tabs.push(newTab)
104104

app/js/system/MainMenu.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class MainMenu {
5353
}
5454
window.app = this.app
5555

56-
this.app.tabs.newTab(fs.readFileSync(filename, 'utf8'), 0, path.basename(filename) )
56+
this.app.tabs.newTab(fs.readFileSync(filename, 'utf8'), 0, path.basename(filename), filename )
5757

5858
this.updateMenu()
5959
}
@@ -210,18 +210,15 @@ class MainMenu {
210210
}
211211

212212
createRecentSubMenu(updated) {
213-
// give properties
214-
213+
// give properties
215214
const recentFiles = this.settings.get('recent')
216-
console.log( this , recentFiles)
217-
let files = [];
218-
215+
let files = [];
219216
recentFiles.forEach((filename) => {
220217
let mi = {}
221218
mi.label = filename
222219
mi.click = (menuItem) => {
223220
window.app = this.app
224-
this.app.tabs.newTab(fs.readFileSync(filename, 'utf8'), 0, path.basename(filename));
221+
this.app.tabs.newTab(fs.readFileSync(filename, 'utf8'), 0, path.basename(filename), filename);
225222
}
226223
files.push(mi)
227224
})

debug.log

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[0221/112203:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004
2+
[0221/112203:ERROR:node_debugger.cc(86)] Cannot start debugger server

index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<link rel="stylesheet" href="node_modules/codemirror/theme/seti.css" type="text/css">
4949
<link rel="stylesheet" href="node_modules/codemirror/theme/zenburn.css" type="text/css">
5050

51-
5251
<!-- JSON-Splora custom css -->
5352
<link rel="stylesheet" href="app/css/structure.css" type="text/css">
5453
<link rel="stylesheet" href="app/css/ui.css" type="text/css">

0 commit comments

Comments
 (0)