Skip to content
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

Fixed the external.invoke (fix #19) #33

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

Fixed the external.invoke (fix #19) #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fd2372
bump web-view from 0.6 to 0.7
Dec 17, 2022
da25d99
replaced external.invoke with window.webkit.messageHandlers.external.…
Dec 17, 2022
c8f7c62
factor out a function that handle the external communication
Dec 17, 2022
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ quick-xml = "0.17"
rand = "0.7"
lazy_static = "1.4"
crossbeam = "0.7.3"
web-view = "0.6"
web-view = "0.7"
tinyfiledialogs = "3.3.9"
getopts = "0.2"
webbrowser = "0.5.2"
Expand Down
22 changes: 11 additions & 11 deletions web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,37 @@
<button class='w3-button'>Load</button>
<div class='w3-dropdown-content w3-bar-block w3-border'>
<button class='w3-bar-item w3-button'
onclick="external.invoke('load_gamelog')">Load gamelog.txt</button>
onclick="sendMessageToExternal('load_gamelog')">Load gamelog.txt</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('load_soundpack')">Load soundpack</button>
onclick="sendMessageToExternal('load_soundpack')">Load soundpack</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('load_ignore_list')">Load ignore.txt</button>
onclick="sendMessageToExternal('load_ignore_list')">Load ignore.txt</button>
</div>
</div>
<div class='w3-dropdown-hover'>
<button class='w3-button'>Settings</button>
<div class='w3-dropdown-content w3-bar-block w3-border'>
<button class='w3-bar-item w3-button'
onclick="external.invoke('set_default_paths')">Set current paths as default</button>
onclick="sendMessageToExternal('set_default_paths')">Set current paths as default</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('remove_default_paths')">Delete default paths setting</button>
onclick="sendMessageToExternal('remove_default_paths')">Delete default paths setting</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('set_default_volumes')">Set current volumes as default</button>
onclick="sendMessageToExternal('set_default_volumes')">Set current volumes as default</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('remove_default_volumes')">Delete default volumes setting</button>
onclick="sendMessageToExternal('remove_default_volumes')">Delete default volumes setting</button>
</div>
</div>
<div class='w3-dropdown-hover w3-right'>
<button class='w3-button'>Options</button>
<div class='w3-dropdown-content w3-bar-block w3-border' style='right:0'>
<button class='w3-bar-item w3-button'
onclick="external.invoke('link_original')">&#x1f517; - zwei's original SoundSense & soundpack</button>
onclick="sendMessageToExternal('link_original')">&#x1f517; - zwei's original SoundSense & soundpack</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('link_fork')">&#x1f517; - jecowa's soundpack fork</button>
onclick="sendMessageToExternal('link_fork')">&#x1f517; - jecowa's soundpack fork</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('link_source')">&#x1f517; - SoundSense-RS Github repository</button>
onclick="sendMessageToExternal('link_source')">&#x1f517; - SoundSense-RS Github repository</button>
<button class='w3-bar-item w3-button'
onclick="external.invoke('show_about')">&#x2139; - About</button>
onclick="sendMessageToExternal('show_about')">&#x2139; - About</button>
</div>
</div>
</header>
Expand Down
18 changes: 14 additions & 4 deletions web/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,36 @@

let is_windows = null;
let channels = null;

function sendMessageToExternal(cmd) {
if (window.external !== undefined) {
return window.external.invoke(cmd);
} else if (window.webkit.messageHandlers.external !== undefined) {
return window.webkit.messageHandlers.external.postMessage(cmd);
}
throw new Error('Failed to locate webkit external handler');
}

function addSlider(channel_name) {
channels.insertAdjacentElement(
'beforeend',
createSlider(channel_name)
);
document.getElementById(channel_name+"_slider")
.addEventListener(is_windows?'change':'input',function(){
external.invoke("change_volume:"+channel_name+":"+this.value);
sendMessageToExternal("change_volume:"+channel_name+":"+this.value);
},
false
);
document.getElementById(channel_name+"_skip_button")
.addEventListener('click',function(){
external.invoke("skip_current_sound:"+channel_name);
sendMessageToExternal("skip_current_sound:"+channel_name);
},
false
);
document.getElementById(channel_name+"_play_pause_button")
.addEventListener('click',function(){
external.invoke("play_pause:"+channel_name);
sendMessageToExternal("play_pause:"+channel_name);
},
false
);
Expand Down Expand Up @@ -151,7 +161,7 @@ function createError(name, text) {
}

function thresholdSelect(channel_name, value) {
external.invoke("change_threshold:"+channel_name+":"+value);
sendMessageToExternal("change_threshold:"+channel_name+":"+value);
}

function main() {
Expand Down