mirror of
https://github.com/zombieFox/nightTab.git
synced 2025-02-05 12:59:57 +01:00
[bug] fix link add state not changing when using keybaord shortcuts
This commit is contained in:
parent
848f236d0d
commit
517f0d56ba
@ -58,7 +58,7 @@ var control = (function() {
|
|||||||
element: helper.e(".control-link-add"),
|
element: helper.e(".control-link-add"),
|
||||||
type: "button",
|
type: "button",
|
||||||
func: function() {
|
func: function() {
|
||||||
link.add();
|
link.add.open();
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
element: helper.e(".control-link-edit"),
|
element: helper.e(".control-link-edit"),
|
||||||
|
@ -11,13 +11,14 @@ var keyboard = (function() {
|
|||||||
} else if (state.get().menu) {
|
} else if (state.get().menu) {
|
||||||
menu.close();
|
menu.close();
|
||||||
shade.close();
|
shade.close();
|
||||||
pagelock.unlock();
|
|
||||||
} else if (state.get().autoSuggest) {
|
} else if (state.get().autoSuggest) {
|
||||||
autoSuggest.destroy();
|
autoSuggest.destroy();
|
||||||
|
} else if (state.get().link.add) {
|
||||||
|
link.add.close();
|
||||||
|
shade.close();
|
||||||
} else if (state.get().modal) {
|
} else if (state.get().modal) {
|
||||||
modal.close();
|
modal.close();
|
||||||
shade.close();
|
shade.close();
|
||||||
pagelock.unlock();
|
|
||||||
} else if (state.get().link.edit) {
|
} else if (state.get().link.edit) {
|
||||||
helper.setObject({
|
helper.setObject({
|
||||||
object: state.get(),
|
object: state.get(),
|
||||||
@ -43,7 +44,7 @@ var keyboard = (function() {
|
|||||||
if (state.get().modal) {
|
if (state.get().modal) {
|
||||||
modal.close();
|
modal.close();
|
||||||
};
|
};
|
||||||
link.add();
|
link.add.open();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}, false);
|
}, false);
|
||||||
@ -65,7 +66,10 @@ var keyboard = (function() {
|
|||||||
window.addEventListener("keydown", function(event) {
|
window.addEventListener("keydown", function(event) {
|
||||||
// ctrl+alt+m
|
// ctrl+alt+m
|
||||||
if (event.ctrlKey && event.altKey && event.keyCode == 77) {
|
if (event.ctrlKey && event.altKey && event.keyCode == 77) {
|
||||||
if (state.get().modal) {
|
if (state.get().link.add) {
|
||||||
|
link.add.close();
|
||||||
|
shade.close();
|
||||||
|
} else if (state.get().modal) {
|
||||||
modal.close();
|
modal.close();
|
||||||
shade.close();
|
shade.close();
|
||||||
};
|
};
|
||||||
|
@ -727,45 +727,53 @@ var link = (function() {
|
|||||||
helper.e(".link-form-text-icon").focus();
|
helper.e(".link-form-text-icon").focus();
|
||||||
};
|
};
|
||||||
|
|
||||||
var add = function() {
|
var add = {
|
||||||
mod.add.open();
|
open: function() {
|
||||||
stagedLink.init();
|
mod.add.open();
|
||||||
modal.open({
|
stagedLink.init();
|
||||||
heading: "Add a new bookmark",
|
modal.open({
|
||||||
successAction: function() {
|
heading: "Add a new bookmark",
|
||||||
stagedLink.data.timeStamp = new Date().getTime();
|
successAction: function() {
|
||||||
bookmarks.add(JSON.parse(JSON.stringify(stagedLink.data)));
|
stagedLink.data.timeStamp = new Date().getTime();
|
||||||
data.save();
|
bookmarks.add(JSON.parse(JSON.stringify(stagedLink.data)));
|
||||||
mod.add.close();
|
data.save();
|
||||||
render.clear();
|
mod.add.close();
|
||||||
render.item.all();
|
render.clear();
|
||||||
render.item.tabindex();
|
render.item.all();
|
||||||
sortable(".link-area");
|
render.item.tabindex();
|
||||||
control.dependents();
|
sortable(".link-area");
|
||||||
control.render();
|
control.dependents();
|
||||||
stagedLink.reset();
|
control.render();
|
||||||
shade.close();
|
stagedLink.reset();
|
||||||
pagelock.unlock();
|
shade.close();
|
||||||
},
|
pagelock.unlock();
|
||||||
cancelAction: function() {
|
},
|
||||||
mod.add.close();
|
cancelAction: function() {
|
||||||
stagedLink.reset();
|
console.log("hit");
|
||||||
autoSuggest.destroy();
|
mod.add.close();
|
||||||
shade.close();
|
stagedLink.reset();
|
||||||
pagelock.unlock();
|
autoSuggest.destroy();
|
||||||
},
|
shade.close();
|
||||||
actionText: "Add",
|
pagelock.unlock();
|
||||||
size: "small",
|
},
|
||||||
content: render.form()
|
actionText: "Add",
|
||||||
});
|
size: "small",
|
||||||
shade.open({
|
content: render.form()
|
||||||
action: function() {
|
});
|
||||||
mod.add.close();
|
shade.open({
|
||||||
modal.close();
|
action: function() {
|
||||||
pagelock.unlock();
|
mod.add.close();
|
||||||
}
|
modal.close();
|
||||||
});
|
pagelock.unlock();
|
||||||
pagelock.lock();
|
}
|
||||||
|
});
|
||||||
|
pagelock.lock();
|
||||||
|
},
|
||||||
|
close: function() {
|
||||||
|
mod.add.close();
|
||||||
|
modal.close();
|
||||||
|
pagelock.unlock();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var edit = function() {
|
var edit = function() {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
var version = (function() {
|
var version = (function() {
|
||||||
|
|
||||||
var current = "3.51.0";
|
var current = "3.52.0";
|
||||||
|
|
||||||
var compare = function(a, b) {
|
var compare = function(a, b) {
|
||||||
var pa = a.split(".");
|
var pa = a.split(".");
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"name": "nightTab",
|
"name": "nightTab",
|
||||||
"short_name": "nightTab",
|
"short_name": "nightTab",
|
||||||
"description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
|
"description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
|
||||||
"version": "3.51.0",
|
"version": "3.52.0",
|
||||||
"manifest_version": 2,
|
"manifest_version": 2,
|
||||||
"chrome_url_overrides": {
|
"chrome_url_overrides": {
|
||||||
"newtab": "index.html"
|
"newtab": "index.html"
|
||||||
|
Loading…
Reference in New Issue
Block a user