diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2018-11-10 08:00:05 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2018-11-10 08:00:05 +0000 |
| commit | 76bf589609308f3d35f649431c0da4fb4f1ca473 (patch) | |
| tree | 4b3348d185a2d6d9310a24eac5131dafc53ba2a8 | |
| parent | Merge branch 'new-tup' (diff) | |
| download | mmm-76bf589609308f3d35f649431c0da4fb4f1ca473.tar.gz mmm-76bf589609308f3d35f649431c0da4fb4f1ca473.zip | |
cleanup a bit
| -rw-r--r-- | mmm/Tupdefault | 2 | ||||
| -rw-r--r-- | mmm/mmmfs/browser.moon | 2 | ||||
| -rw-r--r-- | root/Tupdefault.lua | 13 |
3 files changed, 9 insertions, 8 deletions
diff --git a/mmm/Tupdefault b/mmm/Tupdefault index b98f543..b827c36 100644 --- a/mmm/Tupdefault +++ b/mmm/Tupdefault @@ -1,4 +1,4 @@ include_rules -: foreach *.moon |> ^ MOON %f^ moonc -o %o %f 2>/dev/null |> %B.lua <modules> +: foreach *.moon |> ^ MOON %f^ moonc -p > %o %f |> %B.lua <modules> : <modules> |> ^ BNDL %d^ moon &(root)/bundle.moon %o %d %<modules> |> .bundle.lua ../<modules> diff --git a/mmm/mmmfs/browser.moon b/mmm/mmmfs/browser.moon index 43afa2e..370c039 100644 --- a/mmm/mmmfs/browser.moon +++ b/mmm/mmmfs/browser.moon @@ -49,7 +49,7 @@ class Browser Key if last then last.type else 'mmm/dom' -- whether inspect tab is active - @inspect = ReactiveVar false + @inspect = ReactiveVar (MODE == 'CLIENT' and window.location.search\match '[?&]inspect') -- retrieve or create the wrapper and main elements main = get_or_create 'div', 'browser-root', class: 'main view' diff --git a/root/Tupdefault.lua b/root/Tupdefault.lua index e4e433c..5cd45a9 100644 --- a/root/Tupdefault.lua +++ b/root/Tupdefault.lua @@ -1,9 +1,3 @@ -facets = tup.glob '*' -inputs = '' -for i, file in ipairs(facets) do - inputs = inputs .. " '" .. file .. "'" -end - LUA_PATH = {} LUA_PATH += root .. '/?.lua' LUA_PATH += root .. '/?.server.lua' @@ -14,6 +8,13 @@ LUA_PATH = 'LUA_PATH="' .. table.concat(LUA_PATH, ';') .. '"' bundle = LUA_PATH .. ' moon ' .. root .. '/bundle_fileder.moon' render = LUA_PATH .. ' moon ' .. root .. '/render.moon' +-- @TODO: whish there was a better glob for this? +facets = tup.glob '*$*' +inputs = '' +for i, file in ipairs(facets) do + inputs = inputs .. " '" .. file .. "'" +end + facets += '<children>' facets += root .. '/<modules>' |