aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2018-11-01 09:45:33 +0000
committers-ol <s-ol@users.noreply.github.com>2018-11-01 09:45:33 +0000
commitb1ea3892278adee65111b5e07b612a72dce1b019 (patch)
tree4b361d3ec658f921b265689d49cbd27356ea2545
parentMerge branch 'root-mmmfs' (diff)
downloadmmm-b1ea3892278adee65111b5e07b612a72dce1b019.tar.gz
mmm-b1ea3892278adee65111b5e07b612a72dce1b019.zip
defer all scripts
-rw-r--r--lib/init.client.moon3
-rw-r--r--lib/init.server.moon5
-rw-r--r--render.moon10
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/init.client.moon b/lib/init.client.moon
index 77ff0ee..144543b 100644
--- a/lib/init.client.moon
+++ b/lib/init.client.moon
@@ -44,3 +44,6 @@ relative = do
_require name
on_client = (f, ...) -> f ...
+
+if on_load
+ for f in *on_load do f!
diff --git a/lib/init.server.moon b/lib/init.server.moon
index 198c64e..cc3851d 100644
--- a/lib/init.server.moon
+++ b/lib/init.server.moon
@@ -46,7 +46,10 @@ on_client = (fn, ...) ->
-- warn code
"<script type=\"application/lua\">
local fn = #{compile fn}
- fn(#{table.concat [string.format '%q', v for v in *args ], ', '})
+ on_load = on_load or {}
+ table.insert(on_load, function()
+ fn(#{table.concat [string.format '%q', v for v in *args ], ', '})
+ end)
</script>"
{
diff --git a/render.moon b/render.moon
index 855a7a0..1246999 100644
--- a/render.moon
+++ b/render.moon
@@ -41,11 +41,11 @@ with io.open output_name, 'w'
<body>
#{content}
- <script src=\"/fengari-web.js\"></script>
- <script src=\"/highlight.pack.js\"></script>
- <script type=\"application/lua\" src=\"/lib/init.lua\"></script>
- <script src=\"//cdnjs.cloudflare.com/ajax/libs/marked/0.5.1/marked.min.js\"></script>
- <script src=\"//cdnjs.cloudflare.com/ajax/libs/svg.js/2.6.6/svg.min.js\"></script>
+ <script defer src=\"/fengari-web.js\"></script>
+ <script defer src=\"/highlight.pack.js\"></script>
+ <script defer src=\"//cdnjs.cloudflare.com/ajax/libs/marked/0.5.1/marked.min.js\"></script>
+ <script defer src=\"//cdnjs.cloudflare.com/ajax/libs/svg.js/2.6.6/svg.min.js\"></script>
+ <script defer type=\"application/lua\" src=\"/lib/init.lua\"></script>
#{rehydrate}
</body>