Fixed bookmark savings
This commit is contained in:
parent
7871d7c189
commit
2019cfe549
2 changed files with 19 additions and 3 deletions
|
@ -2,6 +2,7 @@
|
||||||
* **21.04.20**
|
* **21.04.20**
|
||||||
- Clicking on the music bot does not longer results in the insufficient permission sound when the client has no permissions
|
- Clicking on the music bot does not longer results in the insufficient permission sound when the client has no permissions
|
||||||
- Fixed permission editor overflow
|
- Fixed permission editor overflow
|
||||||
|
- Fixed the bookmark edit window (bookmarks have failed to save)
|
||||||
|
|
||||||
* **18.04.20**
|
* **18.04.20**
|
||||||
- Recoded the channel tree using React
|
- Recoded the channel tree using React
|
||||||
|
|
|
@ -2,7 +2,10 @@ import {createInputModal, createModal, Modal} from "tc-shared/ui/elements/Modal"
|
||||||
import {
|
import {
|
||||||
Bookmark,
|
Bookmark,
|
||||||
bookmarks,
|
bookmarks,
|
||||||
BookmarkType, boorkmak_connect, create_bookmark, create_bookmark_directory,
|
BookmarkType,
|
||||||
|
boorkmak_connect,
|
||||||
|
create_bookmark,
|
||||||
|
create_bookmark_directory,
|
||||||
delete_bookmark,
|
delete_bookmark,
|
||||||
DirectoryBookmark,
|
DirectoryBookmark,
|
||||||
save_bookmark
|
save_bookmark
|
||||||
|
@ -12,8 +15,8 @@ import {icon_cache_loader, IconManager} from "tc-shared/FileManager";
|
||||||
import {profiles} from "tc-shared/profiles/ConnectionProfile";
|
import {profiles} from "tc-shared/profiles/ConnectionProfile";
|
||||||
import {spawnYesNo} from "tc-shared/ui/modal/ModalYesNo";
|
import {spawnYesNo} from "tc-shared/ui/modal/ModalYesNo";
|
||||||
import {Settings, settings} from "tc-shared/settings";
|
import {Settings, settings} from "tc-shared/settings";
|
||||||
import {LogCategory} from "tc-shared/log";
|
|
||||||
import * as log from "tc-shared/log";
|
import * as log from "tc-shared/log";
|
||||||
|
import {LogCategory} from "tc-shared/log";
|
||||||
import * as i18nc from "tc-shared/i18n/country";
|
import * as i18nc from "tc-shared/i18n/country";
|
||||||
import {formatMessage} from "tc-shared/ui/frames/chat";
|
import {formatMessage} from "tc-shared/ui/frames/chat";
|
||||||
import * as top_menu from "../frames/MenuBar";
|
import * as top_menu from "../frames/MenuBar";
|
||||||
|
@ -107,8 +110,11 @@ export function spawnBookmarkModal() {
|
||||||
input_server_address.val(address);
|
input_server_address.val(address);
|
||||||
|
|
||||||
let profile = input_connect_profile.find("option[value='" + entry.connect_profile + "']");
|
let profile = input_connect_profile.find("option[value='" + entry.connect_profile + "']");
|
||||||
if(profile.length == 0)
|
console.error("%o - %s", profile, entry.connect_profile);
|
||||||
|
if(profile.length == 0) {
|
||||||
|
log.warn(LogCategory.GENERAL, tr("Failed to find bookmark profile %s. Displaying default one."), entry.connect_profile);
|
||||||
profile = input_connect_profile.find("option[value=default]");
|
profile = input_connect_profile.find("option[value=default]");
|
||||||
|
}
|
||||||
profile.prop("selected", true);
|
profile.prop("selected", true);
|
||||||
|
|
||||||
input_server_password.val(entry.server_properties.server_password_hash || entry.server_properties.server_password ? "WolverinDEV" : "");
|
input_server_password.val(entry.server_properties.server_password_hash || entry.server_properties.server_password ? "WolverinDEV" : "");
|
||||||
|
@ -287,6 +293,7 @@ export function spawnBookmarkModal() {
|
||||||
if(event.type === "change" && valid) {
|
if(event.type === "change" && valid) {
|
||||||
selected_bookmark.display_name = name;
|
selected_bookmark.display_name = name;
|
||||||
label_bookmark_name.text(name);
|
label_bookmark_name.text(name);
|
||||||
|
save_bookmark(selected_bookmark);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -306,17 +313,25 @@ export function spawnBookmarkModal() {
|
||||||
entry.server_properties.server_address = address;
|
entry.server_properties.server_address = address;
|
||||||
entry.server_properties.server_port = 9987;
|
entry.server_properties.server_port = 9987;
|
||||||
}
|
}
|
||||||
|
save_bookmark(selected_bookmark);
|
||||||
|
|
||||||
label_server_address.text(entry.server_properties.server_address + (entry.server_properties.server_port == 9987 ? "" : (" " + entry.server_properties.server_port)));
|
label_server_address.text(entry.server_properties.server_address + (entry.server_properties.server_port == 9987 ? "" : (" " + entry.server_properties.server_port)));
|
||||||
update_connect_info();
|
update_connect_info();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
input_server_password.on("change keydown", event => {
|
||||||
|
const password = input_server_password.val() as string;
|
||||||
|
(selected_bookmark as Bookmark).server_properties.server_password = password;
|
||||||
|
save_bookmark(selected_bookmark);
|
||||||
|
});
|
||||||
|
|
||||||
input_connect_profile.on('change', event => {
|
input_connect_profile.on('change', event => {
|
||||||
const id = input_connect_profile.val() as string;
|
const id = input_connect_profile.val() as string;
|
||||||
const profile = profiles().find(e => e.id === id);
|
const profile = profiles().find(e => e.id === id);
|
||||||
if(profile) {
|
if(profile) {
|
||||||
(selected_bookmark as Bookmark).connect_profile = id;
|
(selected_bookmark as Bookmark).connect_profile = id;
|
||||||
|
save_bookmark(selected_bookmark);
|
||||||
} else {
|
} else {
|
||||||
log.warn(LogCategory.GENERAL, tr("Failed to change connect profile for profile %s to %s"), selected_bookmark.unique_id, id);
|
log.warn(LogCategory.GENERAL, tr("Failed to change connect profile for profile %s to %s"), selected_bookmark.unique_id, id);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue