mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-04-02 01:25:27 +00:00
reorder action steps, add comments
This commit is contained in:
parent
143ddb90df
commit
68764ab024
1 changed files with 13 additions and 11 deletions
|
|
@ -84,26 +84,28 @@ impl Page {
|
||||||
action_page_open.connect_activate({
|
action_page_open.connect_activate({
|
||||||
let navigation = navigation.clone();
|
let navigation = navigation.clone();
|
||||||
move |_, request| {
|
move |_, request| {
|
||||||
let uri = request
|
// Convert to GString
|
||||||
.expect("Parameter required for `page.open` action")
|
let request = GString::from(
|
||||||
.get::<String>()
|
request
|
||||||
.expect("Parameter does not match `String`");
|
.expect("Parameter required for `page.open` action")
|
||||||
|
.get::<String>()
|
||||||
let request = GString::from(uri);
|
.expect("Parameter does not match `String`"),
|
||||||
|
|
||||||
navigation.set_request_text(
|
|
||||||
&request, true, // activate (page reload)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// Add new history record on request change
|
// Add new history record on request change
|
||||||
match navigation.history_current() {
|
match navigation.history_current() {
|
||||||
Some(current) => {
|
Some(current) => {
|
||||||
if current != request {
|
if current != request {
|
||||||
navigation.history_add(request);
|
navigation.history_add(request.clone());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => navigation.history_add(request),
|
None => navigation.history_add(request.clone()),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update
|
||||||
|
navigation.set_request_text(
|
||||||
|
&request, true, // activate (page reload)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue