1
0
mirror of https://shylinux.com/x/icebergs synced 2025-04-26 01:24:05 +08:00
This commit is contained in:
harveyshao 2022-04-11 00:56:51 +08:00
parent d0f656f725
commit d99cd8c0c6
2 changed files with 3 additions and 2 deletions

View File

@ -98,10 +98,10 @@ func (m *Message) RenderCmd(index string, args ...interface{}) {
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=0.8,user-scalable=no">
<link rel="stylesheet" type="text/css" href="/page/can.css">
<script src="/page/can.js"></script>
<script>can(%s)</script>
</head>
<body>
<script src="/page/can.js"></script>
<script>can(%s)</script>
</body>
`, list))
}

View File

@ -133,6 +133,7 @@ func (c *Context) Merge(s *Context) *Context {
}
}
}
for key, cmd := range s.Commands {
if p, ok := c.Commands[key]; ok && s != c {
switch hand := cmd.Hand; key {