diff --git a/frame.js b/frame.js index cc221076..347b6f89 100644 --- a/frame.js +++ b/frame.js @@ -9,7 +9,8 @@ Volcanos(chat.ONENGINE, {_init: function(can, meta, list, cb, target) { can.requ can.core.ItemCB(sub.onaction, function(key, cb) { can.onengine.listen(can, key, function(msg) { can.core.CallFunc(cb, {can: sub, msg: msg}) }) }) can.core.CallFunc([sub.onaction, chat._INIT], {can: sub, cb: next, target: sub._target}), delete(sub._history), delete(sub._conf.feature) }, target) - }, function() { can.onlayout._init(can, target), can.onmotion._init(can, target), can.onkeymap._init(can, target) + }, function() { + can.onlayout._init(can, target), can.onmotion._init(can, target), can.onkeymap._init(can, target) can.onengine.signal(can, chat.ONMAIN, can.request()), can.base.isFunc(cb) && cb(can) }), can._path = location.href }, diff --git a/lib/date.js b/lib/date.js index 6538bafc..d96e5f66 100644 --- a/lib/date.js +++ b/lib/date.js @@ -250,4 +250,6 @@ Volcanos("date", { // @1900-2100区间内的公历转农历 '7f07e7f0e47f531b0723b0b6fb0721','7f0e26665b66a449801e9808297c35','665f67f0e37f1489801eb072297c35', '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722'], }) -Volcanos("page", {trans: function(can, text) { return can.base.replaceAll(text, "<", "<", ">", ">") }}) +Volcanos("page", {trans: function(can, text) { + return can.base.replaceAll(text, "&", "&", "<", "<", ">", ">") +}}) diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 9d1311e2..93383ab2 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -26,6 +26,7 @@ fieldset.inner>div.output>div.layout>div.tabs { font-family:monospace; font-size fieldset.inner>div.output>div.layout>div.path { font-family:monospace; font-size:14px; display:none; } fieldset.inner>div.output>div.layout>div.layout div.content * { font-family:monospace; font-size:14px; outline:none; } fieldset.inner>div.output>div.layout>div.layout>div.profile { max-width:unset; } +fieldset.inner>div.output>div.layout>div.layout>iframe.profile { border-left:var(--plugin-border-color) solid 1px; } 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 div.status>div { padding:5px; float:left; } fieldset.inner>div.output>div.project>div.zone>div.item { font-style:italic; font-weight:bold; line-height:32px; } diff --git a/plugin/local/code/inner/syntax.js b/plugin/local/code/inner/syntax.js index f948f7ab..e0ecbfab 100644 --- a/plugin/local/code/inner/syntax.js +++ b/plugin/local/code/inner/syntax.js @@ -187,26 +187,29 @@ Volcanos(chat.ONSYNTAX, { }, }, mod: {prefix: {"//": code.COMMENT}, keyword: {"go": code.KEYWORD, "module": code.KEYWORD, "require": code.KEYWORD, "replace": code.KEYWORD}}, sum: {}, js: {prefix: {"// ": code.COMMENT}, regexp: {"[A-Z_0-9]+": code.CONSTANT}, keyword: { - "import": code.KEYWORD, "from": code.KEYWORD, - "var": code.KEYWORD, "function": code.KEYWORD, "typeof": code.KEYWORD, "const": code.KEYWORD, "new": code.KEYWORD, "delete": code.KEYWORD, + "let": code.KEYWORD, "const": code.KEYWORD, "var": code.KEYWORD, "if": code.KEYWORD, "else": code.KEYWORD, - "for": code.KEYWORD, "in": code.KEYWORD, "while": code.KEYWORD, "break": code.KEYWORD, "continue": code.KEYWORD, "switch": code.KEYWORD, "case": code.KEYWORD, "default": code.KEYWORD, - "return": code.KEYWORD, "try": code.KEYWORD, "catch": code.KEYWORD, "debugger": code.KEYWORD, - - "import": code.KEYWORD, "from": code.KEYWORD, "export": code.KEYWORD, "default": code.KEYWORD, - "async": code.KEYWORD, "await": code.KEYWORD, - "class": code.KEYWORD, "static": code.KEYWORD, - "let": code.KEYWORD, + "for": code.KEYWORD, "in": code.KEYWORD, "while": code.KEYWORD, "break": code.KEYWORD, "continue": code.KEYWORD, + "try": code.KEYWORD, "catch": code.KEYWORD, "debugger": code.KEYWORD, + "function": code.KEYWORD, "return": code.KEYWORD, "arguments": code.OBJECT, "callee": code.OBJECT, "this": code.OBJECT, "true": code.CONSTANT, "false": code.CONSTANT, "null": code.CONSTANT, "undefined": code.CONSTANT, - "Array": code.DATATYPE, "JSON": code.DATATYPE, "Date": code.DATATYPE, "Math": code.DATATYPE, "XMLHttpRequest": code.DATATYPE, "WebSocket": code.DATATYPE, - "window": code.OBJECT, "console": code.OBJECT, "navigator": code.OBJECT, - "location": code.OBJECT, "history": code.OBJECT, "document": code.OBJECT, - "arguments": code.OBJECT, "callee": code.OBJECT, "this": code.OBJECT, - - "setTimeout": code.FUNCTION, "alert": code.FUNCTION, "confirm": code.FUNCTION, "parseInt": code.FUNCTION, "parseFloat": code.FUNCTION, "encodeURIComponent": code.FUNCTION, "decodeURIComponent": code.FUNCTION, + "setTimeout": code.FUNCTION, "alert": code.FUNCTION, "confirm": code.FUNCTION, "prompt": code.FUNCTION, + "document": code.OBJECT, "console": code.OBJECT, + "location": code.OBJECT, "history": code.OBJECT, + "window": code.OBJECT, "navigator": code.OBJECT, + "localStorage": code.OBJECT, "sessionStorage": code.OBJECT, + + "typeof": code.KEYWORD, "new": code.KEYWORD, "delete": code.KEYWORD, + + "import": code.KEYWORD, "from": code.KEYWORD, "export": code.KEYWORD, "default": code.KEYWORD, + "class": code.KEYWORD, "static": code.KEYWORD, + "async": code.KEYWORD, "await": code.KEYWORD, + + "Array": code.DATATYPE, "JSON": code.DATATYPE, "Date": code.DATATYPE, "Math": code.DATATYPE, "XMLHttpRequest": code.DATATYPE, "WebSocket": code.DATATYPE, + "hasOwnProperty": code.FUNCTION, "isArray": code.FUNCTION, "forEach": code.FUNCTION, "apply": code.FUNCTION, "call": code.FUNCTION, "length": code.FUNCTION, "split": code.FUNCTION, "trim": code.FUNCTION, "toLowerCase": code.FUNCTION, "indexOf": code.FUNCTION, "lastIndexOf": code.FUNCTION, "concat": code.FUNCTION, "reverse": code.FUNCTION, "slice": code.FUNCTION, "join": code.FUNCTION, "sort": code.FUNCTION, "push": code.FUNCTION, "pop": code.FUNCTION, @@ -248,40 +251,41 @@ Volcanos(chat.ONSYNTAX, { "#[^ ;]+": code.CONSTANT, }, keyword: { - "body": code.KEYWORD, "fieldset": code.KEYWORD, "legend": code.KEYWORD, "form": code.KEYWORD, "input": code.KEYWORD, "select": code.KEYWORD, "textarea": code.KEYWORD, - "table": code.KEYWORD, "thead": code.KEYWORD, "tbody": code.KEYWORD, "tr": code.KEYWORD, "th": code.KEYWORD, "td": code.KEYWORD, "h1": code.KEYWORD, "h2": code.KEYWORD, "h3": code.KEYWORD, - "a": code.KEYWORD, - "p": code.KEYWORD, - "ul": code.KEYWORD, "li": code.KEYWORD, + "p": code.KEYWORD, "a": code.KEYWORD, + "ul": code.KEYWORD, "ol": code.KEYWORD, "li": code.KEYWORD, + + "fieldset": code.KEYWORD, "legend": code.KEYWORD, "form": code.KEYWORD, + "select": code.KEYWORD, "input": code.KEYWORD, "textarea": code.KEYWORD, + + "background-color": code.FUNCTION, "color": code.FUNCTION, + "font-family": code.FUNCTION, "font-weight": code.FUNCTION, "font-style": code.FUNCTION, "font-size": code.FUNCTION, "line-height": code.FUNCTION, + "text-align": code.FUNCTION, "white-space": code.FUNCTION, "tab-size": code.FUNCTION, + "padding": code.FUNCTION, "padding-left": code.FUNCTION, "padding-top": code.FUNCTION, "padding-right": code.FUNCTION, "padding-bottom": code.FUNCTION, + "border": code.FUNCTION, "border-left": code.FUNCTION, "border-top": code.FUNCTION, "border-right": code.FUNCTION, "border-bottom": code.FUNCTION, + "margin": code.FUNCTION, "margin-left": code.FUNCTION, "margin-top": code.FUNCTION, "margin-right": code.FUNCTION, "margin-bottom": code.FUNCTION, + "height": code.FUNCTION, "width": code.FUNCTION, "min-width": code.FUNCTION, "max-width": code.FUNCTION, "max-height": code.FUNCTION, + "display": code.FUNCTION, "visibility": code.FUNCTION, "overflow": code.FUNCTION, "float": code.FUNCTION, "clear": code.FUNCTION, "both": code.CONSTANT, + "position": code.FUNCTION, "left": code.FUNCTION, "top": code.FUNCTION, "right": code.FUNCTION, "bottom": code.FUNCTION, + "border-radius": code.FUNCTION, "outline": code.FUNCTION, "box-shadow": code.FUNCTION, "text-shadow": code.FUNCTION, + "caret-color": code.FUNCTION, "cursor": code.FUNCTION, "pointer": code.CONSTANT, + + "body": code.KEYWORD, + "table": code.KEYWORD, "thead": code.KEYWORD, "tbody": code.KEYWORD, "tr": code.KEYWORD, "th": code.KEYWORD, "td": code.KEYWORD, "label": code.KEYWORD, "span": code.KEYWORD, "img": code.KEYWORD, "svg": code.KEYWORD, "div": code.KEYWORD, "video": code.KEYWORD, "iframe": code.KEYWORD, "hover": code.DATATYPE, "focus": code.DATATYPE, "not": code.DATATYPE, "type": code.FUNCTION, "name": code.FUNCTION, - "padding": code.FUNCTION, "padding-left": code.FUNCTION, "padding-top": code.FUNCTION, - "border": code.FUNCTION, "border-left": code.FUNCTION, "border-top": code.FUNCTION, "border-right": code.FUNCTION, "border-bottom": code.FUNCTION, - "margin": code.FUNCTION, "margin-left": code.FUNCTION, "margin-top": code.FUNCTION, "margin-right": code.FUNCTION, "margin-bottom": code.FUNCTION, - "display": code.FUNCTION, "visibility": code.FUNCTION, "overflow": code.FUNCTION, "position": code.FUNCTION, "z-index": code.FUNCTION, "box-sizing": code.FUNCTION, "border-box": code.CONSTANT, - "height": code.FUNCTION, "width": code.FUNCTION, "min-width": code.FUNCTION, "max-width": code.FUNCTION, "max-height": code.FUNCTION, - "left": code.FUNCTION, "top": code.FUNCTION, "right": code.FUNCTION, "bottom": code.FUNCTION, - "border-radius": code.FUNCTION, "outline": code.FUNCTION, "box-shadow": code.FUNCTION, + "z-index": code.FUNCTION, "box-sizing": code.FUNCTION, "border-box": code.CONSTANT, "justify-content": code.FUNCTION, "solid": code.CONSTANT, "unset": code.CONSTANT, "block": code.CONSTANT, "none": code.CONSTANT, "hidden": code.CONSTANT, "visible": code.CONSTANT, "auto": code.CONSTANT, "relative": code.CONSTANT, "absolute": code.CONSTANT, "sticky": code.CONSTANT, "fixed": code.CONSTANT, - "float": code.FUNCTION, "clear": code.FUNCTION, "both": code.CONSTANT, "transition": code.FUNCTION, "transform": code.FUNCTION, "translate": code.FUNCTION, "rotate": code.FUNCTION, - - "padding-bottom": code.FUNCTION, - "background": code.FUNCTION, - "background-size": code.FUNCTION, - "background-position": code.FUNCTION, - "background-color": code.FUNCTION, "color": code.FUNCTION, "caret-color": code.FUNCTION, - "font-family": code.FUNCTION, "font-style": code.FUNCTION, "font-weight": code.FUNCTION, "font-size": code.FUNCTION, - "line-height": code.FUNCTION, "text-align": code.FUNCTION, "tab-size": code.FUNCTION, "white-space": code.FUNCTION, + + "background": code.FUNCTION, "background-position": code.FUNCTION, "background-size": code.FUNCTION, "monospace": code.CONSTANT, "italic": code.CONSTANT, "bold": code.CONSTANT, "center": code.CONSTANT, - "cursor": code.FUNCTION, "pointer": code.CONSTANT, "stroke-width": code.FUNCTION, "stroke": code.FUNCTION, "fill": code.FUNCTION, "dark": code.CONSTANT, "light": code.CONSTANT, "transparent": code.CONSTANT, @@ -326,30 +330,40 @@ Volcanos(chat.ONSYNTAX, { "contexts": code.CONSTANT, }, }, - html: {split: {operator: "<=/>"}, + html: {split: {operator: ""}, keyword: { "DOCTYPE": code.KEYWORD, "html": code.KEYWORD, "head": code.KEYWORD, "body": code.KEYWORD, "meta": code.KEYWORD, "title": code.KEYWORD, "link": code.KEYWORD, "script": code.KEYWORD, - "src": code.FUNCTION, "href": code.FUNCTION, "rel": code.FUNCTION, "style": code.FUNCTION, "width": code.FUNCTION, "height": code.FUNCTION, - - "button": code.KEYWORD, - "fieldset": code.KEYWORD, "legend": code.KEYWORD, "form": code.KEYWORD, + "src": code.FUNCTION, "href": code.FUNCTION, "rel": code.FUNCTION, "style": code.FUNCTION, + "h1": code.KEYWORD, "h2": code.KEYWORD, "h3": code.KEYWORD, - "p": code.KEYWORD, "a": code.KEYWORD, "br": code.KEYWORD, "hr": code.KEYWORD, - "label": code.KEYWORD, "span": code.KEYWORD, "img": code.KEYWORD, "svg": code.KEYWORD, "div": code.KEYWORD, - "table": code.KEYWORD, "thead": code.KEYWORD, "tbody": code.KEYWORD, "tfoot": code.KEYWORD, - "tr": code.KEYWORD, "th": code.KEYWORD, "td": code.KEYWORD, "ul": code.KEYWORD, "ol": code.KEYWORD, "li": code.KEYWORD, - "colgroup": code.KEYWORD, "col": code.KEYWORD, "colspan": code.FUNCTION, "rowspan": code.FUNCTION, - "video": code.KEYWORD, "audio": code.KEYWORD, "iframe": code.KEYWORD, - - "pre": code.KEYWORD, "code": code.KEYWORD, "sub": code.KEYWORD, "sup": code.KEYWORD, "em": code.KEYWORD, "strong": code.KEYWORD, "i": code.KEYWORD, "b": code.KEYWORD, "u": code.KEYWORD, - "dl": code.KEYWORD, "dt": code.KEYWORD, "dd": code.KEYWORD, - "var": code.KEYWORD, "kbd": code.KEYWORD, "samp": code.KEYWORD, "time": code.KEYWORD, - "blockquote": code.KEYWORD, "q": code.KEYWORD, "cite": code.KEYWORD, "abbr": code.KEYWORD, "address": code.KEYWORD, + "p": code.KEYWORD, "em": code.KEYWORD, "strong": code.KEYWORD, "sub": code.KEYWORD, "sup": code.KEYWORD, "i": code.KEYWORD, "b": code.KEYWORD, "u": code.KEYWORD, + "pre": code.KEYWORD, "code": code.KEYWORD, "var": code.KEYWORD, "kbd": code.KEYWORD, "samp": code.KEYWORD, + "ul": code.KEYWORD, "ol": code.KEYWORD, "li": code.KEYWORD, + "header": code.KEYWORD, "nav": code.KEYWORD, "main": code.KEYWORD, "aside": code.KEYWORD, "footer": code.KEYWORD, "article": code.KEYWORD, "section": code.KEYWORD, + "img": code.KEYWORD, "video": code.KEYWORD, "audio": code.KEYWORD, "iframe": code.KEYWORD, + + "div": code.KEYWORD, "span": code.KEYWORD, + "svg": code.KEYWORD, + + "a": code.KEYWORD, + "height": code.FUNCTION, "width": code.FUNCTION, + + "fieldset": code.KEYWORD, "legend": code.KEYWORD, "form": code.KEYWORD, + "select": code.KEYWORD, "option": code.KEYWORD, "button": code.KEYWORD, "input": code.KEYWORD, "textarea": code.KEYWORD, + + "br": code.KEYWORD, "hr": code.KEYWORD, + "label": code.KEYWORD, + "table": code.KEYWORD, "thead": code.KEYWORD, "tbody": code.KEYWORD, "tfoot": code.KEYWORD, + "tr": code.KEYWORD, "th": code.KEYWORD, "td": code.KEYWORD, + "colgroup": code.KEYWORD, "col": code.KEYWORD, "colspan": code.FUNCTION, "rowspan": code.FUNCTION, + + "dl": code.KEYWORD, "dt": code.KEYWORD, "dd": code.KEYWORD, + "time": code.KEYWORD, + "blockquote": code.KEYWORD, "q": code.KEYWORD, "cite": code.KEYWORD, "abbr": code.KEYWORD, "address": code.KEYWORD, "source": code.KEYWORD, "muted": code.FUNCTION, "autoplay": code.FUNCTION, "loop": code.FUNCTION, "controls": code.FUNCTION, "rect": code.KEYWORD, "circle": code.KEYWORD, "fill": code.FUNCTION, "x": code.FUNCTION, "y": code.FUNCTION, "r": code.FUNCTION, }, }, }) - diff --git a/publish/chrome/contexts.css b/publish/chrome/contexts.css index 08835775..1df04362 100644 --- a/publish/chrome/contexts.css +++ b/publish/chrome/contexts.css @@ -88,7 +88,7 @@ body>div.carte div.item { background-color:var(--carte-bg-color); } body>div.carte div.item:hover { background-color:var(--hover-bg-color); } /* icon */ -fieldset.contexts form.option>div.icon { font-size:26px; line-height:28px; padding:0 5px; height:32px; margin:0; } +fieldset.contexts form.option>div.icon { background-color:unset; font-size:26px; line-height:28px; padding:0 5px; height:32px; margin:0; } fieldset.contexts form.option>div.item.icons>span.icon { font-size:26px; line-height:28px; padding:0 5px; height:32px; } fieldset.contexts form.option>div.item.icons>span.icon.create { line-height:30px; } fieldset.contexts div.action>div.item.icons>span.icon { font-size:26px; line-height:28px; padding:0 5px; height:32px; }