git.iko.soy/jsaddle
on master help sign in
call functions safely in `(#)`, `jsf`, etc.
b481073Francesco Mazzoli
jsaddle/src/Language/Javascript/JSaddle/Evaluate.hs+1−1
compare with master
unifiedsplit
@@ -50,7 +50,7 @@ eval :: (ToJSString script)
50 -> JSM JSVal
50 -> JSM JSVal
51#ifdef ghcjs_HOST_OS
51#ifdef ghcjs_HOST_OS
52eval script = liftIO $ js_eval (toJSString script)
52eval script = liftIO $ js_eval (toJSString script)
53−foreign import javascript unsafe "$r = eval($1);"
53+foreign import javascript safe "$r = eval($1);"
54 js_eval :: JSString -> IO JSVal
54 js_eval :: JSString -> IO JSVal
55#else
55#else
56eval = evaluateScript . toJSString
56eval = evaluateScript . toJSString
jsaddle/src/Language/Javascript/JSaddle/Object.hs+2−2
@@ -557,7 +557,7 @@ objCallAsFunction :: MakeArgs args
557objCallAsFunction f this args = do
557objCallAsFunction f this args = do
558 rargs <- makeArgs args >>= liftIO . Array.fromListIO
558 rargs <- makeArgs args >>= liftIO . Array.fromListIO
559 liftIO $ js_apply f this rargs
559 liftIO $ js_apply f this rargs
560−foreign import javascript unsafe "$r = $1.apply($2, $3)"
560+foreign import javascript safe "$r = $1.apply($2, $3)"
561 js_apply :: Object -> Object -> MutableJSArray -> IO JSVal
561 js_apply :: Object -> Object -> MutableJSArray -> IO JSVal
562#else
562#else
563objCallAsFunction f this args = do
563objCallAsFunction f this args = do
@@ -577,7 +577,7 @@ objCallAsConstructor :: MakeArgs args
577objCallAsConstructor f args = do
577objCallAsConstructor f args = do
578 rargs <- makeArgs args >>= liftIO . Array.fromListIO
578 rargs <- makeArgs args >>= liftIO . Array.fromListIO
579 liftIO $ js_new f rargs
579 liftIO $ js_new f rargs
580−foreign import javascript unsafe "\
580+foreign import javascript safe "\
581 switch($2.length) {\
581 switch($2.length) {\
582 case 0 : $r = new $1(); break;\
582 case 0 : $r = new $1(); break;\
583 case 1 : $r = new $1($2[0]); break;\
583 case 1 : $r = new $1($2[0]); break;\