master..e0bb6c5 · jsaddle

git.iko.soy/jsaddle

10 files changed+19−25

unifiedsplit

cabal.project+1 jsaddle-clib/jsaddle-clib.cabal+1−1 jsaddle-warp/jsaddle-warp.cabal+1−1 jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+2−2 jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+2−8 jsaddle-wkwebview/jsaddle-wkwebview.cabal+2−4 jsaddle/jsaddle.cabal+2−2 jsaddle/src/Language/Javascript/JSaddle/Object.hs+4−3 jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+1−1 nix/hix.nix+3−3

cabal.project+1

@@ -2,6 +2,7 @@ packages:

22 jsaddle/

33 jsaddle-warp/

44 jsaddle-wkwebview/

5+-- jsaddle-webkitgtk/

56 jsaddle-webkit2gtk/

67 jsaddle-clib/

jsaddle-clib/jsaddle-clib.cabal+1−1

@@ -1,5 +1,5 @@

11name: jsaddle-clib

2−version: 0.9.8.0

2+version: 0.9.7.1

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

jsaddle-warp/jsaddle-warp.cabal+1−1

@@ -1,5 +1,5 @@

11name: jsaddle-warp

2−version: 0.9.8.0

2+version: 0.9.7.1

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+2−2

@@ -1,5 +1,5 @@

11name: jsaddle-webkit2gtk

2−version: 0.9.8.0

2+version: 0.9.7.1

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

@@ -35,7 +35,7 @@ library

3535 gi-gtk >=3.0.17 && <3.1,

3636 gi-webkit2 >=4.0.14 && <4.1,

3737 gi-javascriptcore >=4.0.14 && <4.1,

38− haskell-gi-base >=0.20 && <0.26,

38+ haskell-gi-base >=0.20 && <0.24,

3939 haskell-gi-overloading >=0.0 && < 2.0,

4040 jsaddle >=0.9.4.0 && <0.10,

4141 text >=1.2.1.3 && <1.3,

jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+2−8

@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF

5555import qualified GI.Gtk as Gtk (main, init)

5656import GI.Gtk

5757 (windowSetPosition, windowSetDefaultSize, windowNew,

58− scrolledWindowNew, Adjustment, containerAdd,

58+ scrolledWindowNew, noAdjustment, containerAdd,

5959 WindowType(..), WindowPosition(..), widgetDestroy,

6060 widgetGetToplevel, widgetShowAll, onWidgetDestroy,

6161 mainQuit)

62−import GI.Gio (Cancellable)

62+import GI.Gio (noCancellable)

6363import GI.JavaScriptCore (valueToString)

6464import GI.WebKit2

6565 (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText,

@@ -82,12 +82,6 @@ import Language.Javascript.JSaddle (JSM, Results, Batch)

8282import Language.Javascript.JSaddle.Run (runJavaScript)

8383import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)

8484

85−noAdjustment :: Maybe Adjustment

86−noAdjustment = Nothing

87−

88−noCancellable :: Maybe Cancellable

89−noCancellable = Nothing

90−

9185quitWebView :: WebView -> IO ()

9286quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?

9387 widgetDestroy w

jsaddle-wkwebview/jsaddle-wkwebview.cabal+2−4

@@ -1,5 +1,5 @@

11name: jsaddle-wkwebview

2−version: 0.9.8.0

2+version: 0.9.7.1

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

@@ -29,13 +29,11 @@ library

2929 base <5

3030 default-language: Haskell2010

3131 hs-source-dirs: src

32+ frameworks: Foundation, WebKit

3233 ghc-options: -ferror-spans -Wall

33− if os(linux)

34− buildable: False

3534 if impl(ghcjs)

3635 hs-source-dirs: src-ghcjs

3736 else

38− frameworks: Foundation, WebKit

3937 build-depends:

4038 aeson >=0.8.0.2 && <1.6,

4139 bytestring >=0.10.6.0 && <0.11,

jsaddle/jsaddle.cabal+2−2

@@ -1,5 +1,5 @@

11name: jsaddle

2−version: 0.9.8.0

2+version: 0.9.7.1

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

@@ -10,7 +10,7 @@ description:

1010 This package provides an EDSL for calling JavaScript that

1111 can be used both from GHCJS and GHC. When using GHC

1212 the application is run using Warp and WebSockets to

13− drive a small JavaScript helper.

13+ drive a small JavaScipt helper.

1414category: Web, Javascript

1515author: Hamish Mackenzie

1616

jsaddle/src/Language/Javascript/JSaddle/Object.hs+4−3

@@ -526,11 +526,12 @@ array args = do

526526 Object . coerce <$> fromListIO rargs

527527

528528-- | JavaScript's global object

529+global :: Object

529530#ifdef ghcjs_HOST_OS

530−foreign import javascript unsafe "$r = globalThis"

531− global :: Object

531+global = js_window

532+foreign import javascript unsafe "$r = window"

533+ js_window :: Object

532534#else

533−global :: Object

534535global = Object . JSVal . unsafePerformIO $ newIORef 4

535536#endif

536537

jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+1−1

@@ -41,7 +41,7 @@ initState = "\

4141 \ jsaddle_values.set(1, undefined);\n\

4242 \ jsaddle_values.set(2, false);\n\

4343 \ jsaddle_values.set(3, true);\n\

44− \ jsaddle_values.set(4, globalThis);\n\

44+ \ jsaddle_values.set(4, window);\n\

4545 \ var jsaddle_index = 100;\n\

4646 \ var expectedBatch = 1;\n\

4747 \ var lastResults = [0, {\"tag\": \"Success\", \"contents\": [[], []]}];\n\

nix/hix.nix+3−3

@@ -1,8 +1,8 @@

1−{pkgs, ...}:

21{ modules = [({pkgs, ...}: {

3− packages.webkit2gtk3-javascriptcore.components.library.doHaddock = false;

2+ reinstallableLibGhc = !pkgs.stdenv.hostPlatform.isGhcjs;

3+ packages.jsaddle-warp.components.tests.test-tool.buildable = pkgs.lib.mkForce false;

4+ packages.jsaddle-webkit2gtk.components.library.buildable = pkgs.lib.mkForce pkgs.stdenv.hostPlatform.isLinux;

45 })];

5− shell.buildInputs = [ pkgs.nodejs ];

66 shell.tools.cabal = {};

77 shell.crossPlatforms = p: [ p.ghcjs ];

88}