diff --git a/index.css b/index.css index fcb2f22c..6251028c 100644 --- a/index.css +++ b/index.css @@ -235,6 +235,7 @@ div.project div.zone>div.item { text-align:center; padding:3px; } div.project div.zone>div.item>div.icon { margin-left:3px; float:right; } div.project div.zone>div.list>div.zone>div.item { text-align:left; padding-left:20px; } div.project div.zone>div.list>div.zone>div.item:hover { margin-left:10px; transition:all 0.3s; } +div.project div.list fieldset { position:static; } div.content { position:relative; } div.content>div.toggle { position:absolute; } div.content>div.toggle:hover { background-color:var(--hover-bg-color); color:var(--hover-fg-color); cursor:pointer; } diff --git a/lib/page.js b/lib/page.js index 3d33a2c6..23f927b3 100644 --- a/lib/page.js +++ b/lib/page.js @@ -207,7 +207,7 @@ Volcanos("page", { case html.A: return ""+(arg[2]||arg[1])+"" case html.IMG: return arg[2]? "": "" case html.SPAN: - arg[2] && typeof arg[2] == code.OBJECT && (arg[2] = arg[2].join(lex.SP)) + arg[2] && typeof arg[2] == code.OBJECT && arg[2].join && (arg[2] = arg[2].join(lex.SP)) return arg[2]? ""+arg[1]+"": arg[1] default: /* type inner arg... */ var list = ["<"+type]; for (var i = 2; i < arg.length; i += 2) { list.push(lex.SP+arg[i]+mdb.EQ+arg[i+1]) } diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index d95289f4..d9a0bb0e 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -28,7 +28,7 @@ fieldset.inner>div.output>div.layout>div.layout>iframe.profile { border-left:var fieldset.inner>div.output>div.layout>div.layout>div.profile h1 { text-align:left; padding:10px 0; border-bottom:var(--box-border); margin:20px 0; } fieldset.inner>div.output>div.layout>div.layout>div.profile h2 { padding:10px 0; border-bottom:var(--box-border); margin:20px 0; } fieldset.inner>div.output>div.layout>div.layout>div.profile pre>code { padding-left:10px; border-left:var(--code-border-color) solid 5px; display:block; } -fieldset.inner>div.output>div.layout>div.layout>div.profile div.code { white-space:unset; padding:20px; } +fieldset.inner>div.output>div.layout>div.layout>div.profile>div.code { white-space:unset; padding:20px; } fieldset.inner>div.output>div.layout>div.layout>div.profile div.status>div { padding:5px; float:left; } fieldset.inner>div.output>div.layout>div.display h1 { text-align:left; padding:10px 0; border-bottom:var(--box-border); margin:20px 0; } fieldset.inner>div.output>div.layout>div.display h2 { padding:10px 0; border-bottom:var(--box-border); margin:20px 0; } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index ec977932..dd58a211 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -186,7 +186,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp return can.onmotion.toggle(can, can.ui.profile, true), can.onimport.layout(can) } } - can.onimport.process(can, msg, can.ui.profile, height, width-border, function(sub) { can.page.style(can, sub._output, html.MAX_WIDTH, ""), can.ui.profile._plugin = _msg._profile = sub + can.onimport.process(can, msg, can.ui.profile, height, width-border, function(sub) { can.page.style(can, sub._output, html.MAX_WIDTH, "") + can.ui.profile._plugin = sub sub.Conf(ctx.ARGS) && can.onexport.session(can, PROFILE_ARGS+can.Option(nfs.PATH)+can.Option(nfs.FILE), JSON.stringify(sub.Conf(ctx.ARGS))) sub.onaction.close = function() { can.onmotion.hidden(can, can.ui.profile), can.onimport.layout(can) can.onexport.session(can, PROFILE_ARGS+can.Option(nfs.PATH)+can.Option(nfs.FILE), "") @@ -317,7 +318,8 @@ Volcanos(chat.ONLAYOUT, { } layout(target, height||target.offsetHeight, width||target.offsetWidth) }, }) -Volcanos(chat.ONSYNTAX, {_init: function(can, msg, cb) { var key = can.onexport.keys(can), path = msg.Option(nfs.PATH, can.Option(nfs.PATH)), file = msg.Option(nfs.FILE, can.Option(nfs.FILE)) +Volcanos(chat.ONSYNTAX, {_init: function(can, msg, cb) { + var key = can.onexport.keys(can), path = msg.Option(nfs.PATH, can.Option(nfs.PATH)), file = msg.Option(nfs.FILE, can.Option(nfs.FILE)) can.onmotion.cache(can, function(save, load) { save({profile: can.ui.profile.className, display: can.ui.display.className}) can.onmotion.hidden(can, can.ui.profile), can.onmotion.hidden(can, can.ui.display) return load(key, function(bak) { can.ui.profile.className = bak.profile, can.ui.display.className = bak.display }) @@ -333,6 +335,7 @@ Volcanos(chat.ONSYNTAX, {_init: function(can, msg, cb) { var key = can.onexport. can.onsyntax._split(can, msg, content, cb, key) }, _split: function(can, msg, content, cb, key) { + var path = msg.Option(nfs.PATH, can.Option(nfs.PATH)), file = msg.Option(nfs.FILE, can.Option(nfs.FILE)) function show(p) { p && p.include && can.core.List(p.include, function(from) { p.keyword = p.keyword||{}, can.core.Item(can.onsyntax[from].keyword, function(key, value) { p.keyword[key] = p.keyword[key] || value }) diff --git a/plugin/table.js b/plugin/table.js index 6888fe0c..64511627 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -192,10 +192,12 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( }, sub.onaction.close = function() { can.onmotion.hidden(can, target) }, can.base.isFunc(cb) && cb(sub) }, target, field) }, - layout: function(can) { can.ui && can.ui.layout && can.ui.layout(can.ConfHeight(), can.ConfWidth()) }, + // layout: function(can) { can.ui && can.ui.layout && can.ui.layout(can.ConfHeight(), can.ConfWidth()) }, }) Volcanos(chat.ONLAYOUT, { - _init: function(can, height, width) { can.core.CallFunc([can.onimport, html.LAYOUT], {can: can, height: height, width: width}) }, + _init: function(can, height, width) { + can.core.CallFunc([can.onimport, html.LAYOUT], {can: can, height: height, width: width}) + }, zone: function(can, height, width) { can.onlayout._init(can, height, width) }, result: function(can, height, width) { can.onlayout._init(can, height, width) }, simple: function(can, height, width) { can.onlayout._init(can, height, width) },