From 976f76bd5216fda22599fc79db64cdfa971c4f1a Mon Sep 17 00:00:00 2001
From: shylinux <shylinux@icloud.com>
Date: Fri, 5 Nov 2021 08:38:12 +0800
Subject: [PATCH] opt git

---
 frame.js              | 2 +-
 lib/user.js           | 4 ++--
 page/index.css        | 1 +
 plugin/story/spide.js | 5 ++++-
 plugin/story/trend.js | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frame.js b/frame.js
index 115c6189..085c6a61 100644
--- a/frame.js
+++ b/frame.js
@@ -413,7 +413,7 @@ Volcanos("onlayout", {help: "页面布局", list: [], _init: function(can, targe
 
         can.page.Select(can, target, can.core.Keys(html.FIELDSET, chat.MAIN), function(field, index) {
             if (can.user.isMobile) {
-                can.page.Modify(can, field, {style: {"padding-top": can.user.isLandscape? "0px": ""}})
+                can.page.Modify(can, field, {style: {"padding-top": can.user.isLandscape()? "0px": ""}})
             } else {
                 height -= can.page.Select(can, field, can.core.Keys(html.DIV, html.ACTION))[0].offsetHeight
 
diff --git a/lib/user.js b/lib/user.js
index 994f4dc9..97b30573 100644
--- a/lib/user.js
+++ b/lib/user.js
@@ -20,7 +20,7 @@ Volcanos("user", {help: "用户操作", agent: {
         },
     },
     isIE: navigator.userAgent.indexOf("MSIE") > -1,
-    isLandscape: window.innerWidth > window.innerHeight,
+    isLandscape: function() { return window.innerWidth > window.innerHeight },
     isWeiXin: navigator.userAgent.indexOf("MicroMessenger") > -1,
     isIPhone: navigator.userAgent.indexOf("iPhone") > -1,
     isMobile: navigator.userAgent.indexOf("Mobile") > -1,
@@ -50,7 +50,7 @@ Volcanos("user", {help: "用户操作", agent: {
         return text && (document.title = text), document.title
     },
     topic: function(can, name) {
-        can.user.isMobile && (name += " mobile") && can.user.isLandscape && (name += " landscape")
+        can.user.isMobile && (name += " mobile") && can.user.isLandscape() && (name += " landscape")
         can.page.Modify(can, document.body, {className: name})
     },
     language: function(can) {
diff --git a/page/index.css b/page/index.css
index 9704739a..fdeb5170 100644
--- a/page/index.css
+++ b/page/index.css
@@ -180,6 +180,7 @@ fieldset {
 }
 fieldset>form.option {
     float:left;
+    display:contents;
 }
 fieldset>form.option>div.item {
     float:left; margin-right:3px;
diff --git a/plugin/story/spide.js b/plugin/story/spide.js
index e0d10976..1fc9fd3b 100644
--- a/plugin/story/spide.js
+++ b/plugin/story/spide.js
@@ -200,10 +200,13 @@ Volcanos("ondetail", {help: "用户交互", list: [],
                 can.run(event, can.misc.Concat([ctx.ACTION, "inner"], cmds), function(msg) {
                     msg.Option(ice.MSG_ACTION, cli.CLOSE)
                     can.get("Action", "size", function(left, top, width, height) { left = left||0
+                        if (height > window.innerHeight) { height = window.innerHeight }
                         var top = 120, margin = 20; if (can.user.isMobile) { margin = 0
-                            if (can.user.isLandscape) {
+                            if (can.user.isLandscape()) {
+                                height += (can.user.mod.isCmd? -20: 200)
                                 top = 24, sub.Conf(chat.HEIGHT, height-top)
                             } else {
+                                height += (can.user.mod.isCmd? -80: 200)
                                 top = 48, sub.Conf(chat.HEIGHT, height-top)
                             }
                         } else {
diff --git a/plugin/story/trend.js b/plugin/story/trend.js
index 661d1a10..a03d65a1 100644
--- a/plugin/story/trend.js
+++ b/plugin/story/trend.js
@@ -4,7 +4,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg,
         can.onappend._status(can, ["from", "commit", "total", "max", "date", "text", "add", "del"])
 
         can.msg = msg, can.data = msg.Table(), can.onimport._sum(can)
-        can.Action(chat.HEIGHT, msg.Option(chat.HEIGHT)||can.user.mod.isCmd? "max": can.user.isMobile&&can.user.isLandscape? "200": "400")
+        can.Action(chat.HEIGHT, msg.Option(chat.HEIGHT)||can.user.mod.isCmd? "max": can.user.isMobile&&can.user.isLandscape()? "200": "400")
         can.Action("speed", parseInt(msg.Option("speed")||"100"))
 
         can.onappend.plugin(can, {type: chat.OUTPUT, index: "web.wiki.draw"}, function(sub) {