liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support form submission from `getURL` function

This commit is contained in:
David Wendt 2019-09-13 22:53:42 -04:00 committed by Mike Welsh
parent 58ce10ea67
commit b40b10daf6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/avm1/globals.rs
View File

@ -1,4 +1,5 @@
use crate::avm1::{Object, Value, ActionContext, Avm1};
use crate::backend::navigator::NavigationMethod;
use gc_arena::{MutationContext, GcCell};
use rand::Rng;
@ -6,7 +7,7 @@ mod math;
#[allow(non_snake_case)]
pub fn getURL<'a, 'gc>(
_avm: &mut Avm1<'gc>,
avm: &mut Avm1<'gc>,
context: &mut ActionContext<'a, 'gc, '_>,
_this: GcCell<'gc, Object<'gc>>,
args: &[Value<'gc>],
@ -15,10 +16,14 @@ pub fn getURL<'a, 'gc>(
Some(url_val) => {
let url = url_val.clone().into_string();
let window = args.get(1).map(|v| v.clone().into_string());
let method = args.get(2).map(|v| v.clone().into_string());
//TODO: Pull AVM1 locals into key-value storage
context.navigator.navigate_to_url(url, window, None);
let method = match args.get(2) {
Some(Value::String(s)) if s == "GET" => Some(NavigationMethod::GET),
Some(Value::String(s)) if s == "POST" => Some(NavigationMethod::POST),
_ => None
};
let vars_method = method.map(|m| (m, avm.locals_into_form_values()));
context.navigator.navigate_to_url(url, window, vars_method);
},
None => {
//TODO: Does AVM1 error out?