efront 4.14.0 → 4.14.2

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,5 +1,35 @@
+- zh-CN: 未知错误！
+  en:    Unknown error!
+
+- zh-CN: 文件系统
+  en:    file system
+
+- zh-CN: 网络
+  en:    network
+
+- zh-CN: 无法访问$1
+  en:    Unable to access $1
+
+- zh-CN: Cookie解析异常!
+  en:    Cookie parsing exception!
+
+- zh-CN: 数据无法解析！
+  en:    Data cannot be parsed!
+
+- zh-CN: 无法连接可加密的服务器！
+  en:    Unable to connect to an encrypted server!
+
+- zh-CN: 无可用的数据源
+  en:    No available data source
+
+- zh-CN: 通道不存在！
+  en:    The channel does not exist!
+
+- zh-CN: 服务器忙!
+  en:    The server is busy!
+
 - zh-CN: $1不是有效的色彩信息
-  en: $1 is not a valid color
+  en:    $1 is not a valid color
 
 - zh-CN: 加载失败
   en:    Loading failed

package/coms/basic/cross_.js

@@ -143,16 +143,22 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     var onerror1 = function (e) {
         if (!~requests.indexOf(_xhr)) return;
         removeFromList(requests, _xhr);
-        errored = e || "未知错误！";
+        errored = e || i18n`未知错误！`;
         if (typeof errored === 'string') {
             errored = createResponse(e, xhr.status);
         }
         flush();
         digest();
     };
+    var getErrorSystem = function () {
+        if (!/^(\w+\:|\/\/)/.test(url) && /^file\:/i.test(location.href) || /^file\:/i.test(url)) return i18n`文件系统`;
+        if (navigator.onLine) return i18n`网络`;
+        return i18n`服务器`;
+    };
+
     var onerror = async function (e) {
         if (e.type === 'error') {
-            e = createResponse("无法访问服务器！");
+            e = createResponse(i18n`无法访问${getErrorSystem()}`);
         }
         headers = extend({}, _headers);
         for (var r of reforms) {
@@ -212,7 +218,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                             if (isencrypt) cookie = encode62.safedecode(cookie, xhr.encrypt);
                         }
                         catch (e) {
-                            onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse });
+                            onerror({ status: xhr.status, response: i18n`Cookie解析异常!`, toString: toResponse });
                             return;
                         }
                         cookie_.addCookie(cookie, originDomain);
@@ -233,13 +239,13 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     xhr.responseText = xhr.response;
                 }
                 catch (e) {
-                    return onerror("数据无法解析！")
+                    return onerror(i18n`数据无法解析！`);
                 }
             };
             switch (xhr.status) {
                 case 0:
                     if (!xhr.response) {
-                        onerror("无法访问服务器");
+                        onerror(i18n`无法访问${getErrorSystem()}`);
                         break;
                     }
                 case 200:
@@ -493,7 +499,7 @@ function addReform(r) {
 function getCode() {
     return new Promise((ok, oh) => {
         this('get', base + "!").then((xhr) => { return ok(encode62.timedecode(xhr.response || xhr.responseText)) }, () => {
-            return oh('无法连接可加密的服务器！');
+            return oh(i18n`无法连接可加密的服务器！`);
         });
     });
 }

package/coms/basic/data.js

@@ -816,7 +816,9 @@ var data = {
         }
     },
     fromAll(refs, params, parse) {
-        return this.createResponse(Promise.all(refs.map(r => this.from(r, params, parse))).then(datas => {
+        return this.createResponse(Promise.all(refs.map(r => this.from(r, params, parse).loading_promise.catch(e => []))).then(datas => {
+            datas = datas.filter(a => !!a);
+            if (!datas.length) throw new Error(i18n`无可用的数据源`);
             return datas.concat.apply([], datas);
         }));
     },

package/coms/compile//347/264/240/351/246/250.js

@@ -488,14 +488,28 @@ var Method = function () {
     return body;
 }
 var vlist = [], mlist = [macros], clist = [], base = '';
+var killneg = function (v, n) {
+    if (n === "-") {
+        if (/^\-/.test(v)) {
+            v = v.slice(1);
+        }
+        else {
+            v = n + v;
+        }
+    }
+    return v;
+};
 var calcvars = function (v) {
     var decode = /^['"`]/.test(v) ? strings.decode : a => a;
-    return v.replace(/@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\}/g, function (m) {
+    return v.replace(/(^\-)?(@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\})/g, function (_, n, m) {
         var value = getFromScopeList(m, vlist, m);
         value = decode(value);
+        value = killneg(value, n);
         return value;
-    }).replace(/(^|\s|[\]\)\(\[\-\+\*\/,;])(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
-        return q + getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
+    }).replace(/(^|\s|[\]\)\(\[\+\*\/,;]|^\-)(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
+        var v = getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
+        v = killneg(v, q);
+        return v;
     });
 };
 var initvars = function (vars) {

package/coms/compile//347/264/240/351/246/250_test.js

@@ -86,6 +86,7 @@ assert(素馨(`a{a:extract(2,3,2)}`), `a{a:3;}`);
 assert(素馨(`a{a:extract(2 3,2)}`), `a{a:3;}`);
 assert(素馨(`value: range(10px, 30px, 10);`, '', true), `value:10px 20px 30px;`);
 assert(素馨(`value: range(4);`, '', true), `value:1 2 3 4;`);
+assert(素馨(`@a:-1;b{a:-@a}`, '', true), `b{a:1;}`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/kugou/dance.js

@@ -1,4 +1,5 @@
 var activeDevice, ratio = 1;
+var strokeColor = '#096';
 function line(buffer, style, lineWidth = window.devicePixelRatio || 1) {
     var canvas = this;
     var context = canvas.getContext("2d");
@@ -27,7 +28,7 @@ function line(buffer, style, lineWidth = window.devicePixelRatio || 1) {
         var [x, y] = buffer[cx];
         context.lineTo(x * width, y * height);
     }
-    context.strokeStyle = style || "#00bd7bd4";
+    context.strokeStyle = style || strokeColor;
     context.lineWidth = lineWidth;
     context.stroke();
 }
@@ -69,7 +70,7 @@ function draw(buffer) {
     if (canvas.height !== canvas.offsetHeight * devicePixelRatio) canvas.height = canvas.offsetHeight * devicePixelRatio;
     context.clearRect(0, 0, canvas.width, canvas.height);
     context.beginPath();
-    context.strokeStyle = "#00bd7bd4";
+    context.strokeStyle = strokeColor;
     context.lineWidth = window.devicePixelRatio || 1;
     var max = 2;
     var v = (this.volume >= 0 ? this.volume : 1) * buffer.length - .5;
@@ -91,7 +92,7 @@ function draw(buffer) {
             }
         });
         context.lineWidth = 1;
-        context.strokeStyle = "#00bd7bd4";
+        context.strokeStyle = strokeColor;
         context.stroke();
         if (this === activeDevice) {
             context.beginPath();

package/coms/kugou/musicList.js

@@ -9,7 +9,8 @@ var isSameSong = function (m1, m2) {
         m1.hash && m1.hash === m2.hash || // 酷狗
         m1.id && m1.id === m2.id || // 网易云 千千静听
         m1.rid && m1.rid === m2.rid || // 酷我
-        m1.mid && m1.mid === m2.mid; // 酷我
+        m1.mid && m1.mid === m2.mid ||// 酷我
+        m1.url && m1.url === m2.url;
 };
 
 function addMethod(name, func) {

package/coms/kugou/playList.less

@@ -6,8 +6,6 @@
     right: 0;
     max-width: 460px;
     box-shadow: 0 0 20px -6px rgba(0, 0, 0, .6);
-    margin-bottom: 10px;
-    overflow: visible;
     background: #131416;
     margin-top: 0;
     transition: margin .2s ease-out;

package/coms/kugou/player.html

@@ -5,21 +5,18 @@
 </div>
 <div class="track"></div>
 <div class="avatar" ng-style="{'background-image': info.avatarUrl,transform:currentRotate}"></div>
-<div class="info">
-    <div class="time">
-        <span ng-bind="currentTime"></span>&nbsp;/&nbsp;
-        <span ng-bind="totalTime"></span>
-    </div>
-    <div class="song">
-        <span class="name" ng-bind=getSongName()></span>
-        <span class="spliter" ng-if="getSongName()&&getSingerName()">&nbsp;-&nbsp;</span>
-        <span class="singer" ng-bind=getSingerName()></span>
-    </div>
+<btn class="play"></btn>
+<div class="time">
+    <span ng-bind="currentTime"></span>
 </div>
+<div class="total">
+    <span ng-bind="totalTime"></span>
+</div>
+<div class="song" ng-bind=getSongName()></div>
+<div class="singer" ng-bind=getSingerName()></div>
 <btn class="prev" ng-click=play(index-1)></btn>
-<btn class="play" ng-click="playing?pause():play()"></btn>
 <btn class="next" ng-click=play(index+1)></btn>
-<sbtn class="list"></sbtn>
+<!-- <sbtn class="list"></sbtn> -->
 <krc elementid=krcpad></krc>
 <canvas elementid="dance"></canvas>
-<div class="avatar" ng-click="effectPage()"></div>
+<div class="avatar" ng-click="playing?pause():play()" ng-click="effectPage()"></div>

package/coms/kugou/player.js

@@ -37,6 +37,7 @@ var patchMusicInfo = async function (info) {
             info.songName = info.songname;
             break;
         case "kugo":
+        default:
             if (info.hash) {
                 res = await data.from("song-info", info);
                 krc = await data.from("search-krc", res);
@@ -208,8 +209,12 @@ var $scope = {
         var { sin, cos } = Math;
         var { currentTheta } = $scope;
         if (player.offsetHeight <= calcPixel(80)) {
-            var centerx = 44 / width, centery = .5;
-            var start = 11 * ratio | 0, end = 77 * ratio | 0;
+            var avatar = player.querySelector(".avatar");
+            var { clientTop, clientWidth, offsetLeft } = avatar;
+            var offsetWidth = clientWidth;
+            offsetLeft += clientTop;
+            var centerx = (offsetWidth / 2 + offsetLeft) / width, centery = .5;
+            var start = offsetLeft * ratio | 0, end = (offsetLeft + offsetWidth) * ratio | 0;
             var cost = cos(currentTheta);
             var sint = sin(currentTheta);
             for (var cx = start, dx = end; cx < dx; cx++) {
@@ -431,6 +436,13 @@ var createControls = function () {
 };
 
 var player = function (player) {
+    var savatar = player.querySelector('canvas');
+    var switchPlayList = function () {
+        if (onclick.preventClick) return;
+        onclick.preventClick = true;
+        if (playList.parentNode) remove(playList);
+        else popup(playList, savatar);
+    }
     render(player, $scope);
     player.play = function (hash) {
         $scope.play(hash);
@@ -439,5 +451,17 @@ var player = function (player) {
         $scope.pause();
     };
     appendChild.before(document.body, player);
+    on("contextmenu")(player, e => e.preventDefault());
+    on("click.self")(player, function (a) {
+        if ($scope.playing) $scope.pause();
+        else $scope.play();
+    });
+    var timeout = 0;
+    on("pointerdown")(player, function () {
+        timeout = setTimeout(switchPlayList, 600);
+    });
+    on("pointerup")(player, function () {
+        clearTimeout(timeout);
+    })
     return player;
 }(createControls());

package/coms/kugou/player.less

@@ -1,19 +1,8 @@
-.song {
-    color: #fff;
-}
-
-.singer {
-    color: #ccc;
-}
-
-.time {
-    position: absolute;
-    right: 8px;
-    bottom: 4px;
-    text-align: right;
-}
+@avatar-left: 36px;
+@avatar-top: -12px;
+@avatar-size: 72px;
 
-@main-color: #2c7bb5;
+@main-color: #021c;
 
 &.pause .play:before {
     content: "";
@@ -26,20 +15,22 @@
     vertical-align: middle;
 }
 
+krc {
+    pointer-events: none;
+}
+
 &.play .play:before {
-    content: "";
-    display: inline-block;
+    display: none;
     border: .4em solid;
     vertical-align: middle;
 }
 
-.avatar,
-&:after {
+.avatar {
     border-radius: 50%;
-    width: 72px;
-    height: 72px;
-    top: -12px;
-    left: 8px;
+    width: @avatar-size;
+    height: @avatar-size;
+    top: @avatar-top;
+    left: @avatar-left;
     position: absolute;
     background-size: cover;
     border: 3px solid #000;
@@ -99,11 +90,25 @@
     overflow: hidden;
     z-index: -1;
 
+    &:before {
+        content: "";
+        left: @avatar-left+@border-width + 72px;
+        position: absolute;
+        min-width: 100px;
+        width: auto;
+        height: auto;
+        border-radius: 60px 0 0 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        background-color: @main-color;
+    }
+
+    @blank-size : @avatar-size;
+    @border-width : 40px;
+    @border-size: @blank-size / 2 + @border-width;
+
     &:after {
-        @size : 10000px;
-        @blank-size : 70px;
-        @margin-y: @size + 35px;
-        @margin-x: @size + 35px;
         box-sizing: content-box;
         content: "";
         display: block;
@@ -111,19 +116,20 @@
         position: absolute;
         width: @blank-size;
         height: @blank-size;
-        border: @size solid #000;
-        margin: -@margin-x -@margin-y;
-        top: 24px;
-        left: 44px;
+        border: @border-width solid #000;
+        margin: -@border-size;
+        top: 12px-@avatar-top;
+        left: @avatar-left + @blank-size/2;
     }
 
     &:after {
-        border-radius: 50%;
+        border-radius: @border-size;
     }
 }
 
 &>div.progress {
     z-index: 1;
+    pointer-events: none;
 
     >.track:after,
     >.avatar {
@@ -132,13 +138,13 @@
     }
 
     >.track {
-        background: @main-color;
         opacity: .7;
         transition: height .3s, opacity .3s;
-        top: 12px;
+        top: -@avatar-top;
     }
 
     >.avatar {
+        border-color: lighten(@main-color, 100%);
         opacity: 1;
         top: 0;
     }
@@ -148,7 +154,7 @@
     overflow : hidden;
     padding : 0;
     height : 72px;
-    margin-top: -12px;
+    margin-top: @avatar-top;
 }
 
 & {
@@ -159,7 +165,7 @@
     user-select: none;
     position: fixed;
     bottom: 0;
-    color: #fff;
+    color: #ccc;
     left: 0;
     right: 0;
     padding: 0 0 0 78px;
@@ -169,47 +175,80 @@
 
     >btn,
     >sbtn {
+        @btn-width: 42px;
         text-align: center;
         line-height: 60px;
-        width: 50px;
+        width: @btn-width;
         height: 60px;
         vertical-align: top;
-        position: relative;
+        position: absolute;
         background: transparent;
+        z-index: 2;
 
-        &.info,
-        &.prev,
-        &.list,
-        &.next,
         &.play {
-            z-index: 2;
+            top: @avatar-top/2;
+            pointer-events: none;
+            left: @avatar-left+16px;
         }
+
+        &.next {
+            right: 0;
+        }
+
+        &.prev {
+            top: 0;
+            left: @avatar-left - @btn-width+6px;
+        }
+
     }
 
-    >.info {
-        width: 100%;
-        margin-right: -200px;
+    .time {
+        left: 6px;
+        text-align: center;
+        top: 46px;
+        color: #fff9;
         line-height: 1;
-        text-align: left;
-        padding: 46px 5px 0 5px;
         z-index: 2;
-        position: relative;
-        font-size: 8px;
+        font-size: 12px;
+    }
 
-        .spliter {
-            .singer;
-        }
+    .total {
+        z-index: 2;
+        right: 6px;
+        top: 46px;
+        color: #fff9;
+        line-height: 1;
+        font-size: 12px;
+    }
+
+    .singer {
+        color: #fffc;
+        font-size: 8px;
+        display: block;
+        top: 46px;
+        z-index: 2;
+        left: @avatar-left+@avatar-size;
+        right: 60px;
+    }
 
 
-        >div {
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-        }
+    .song {
+        left: @avatar-left + @avatar-size + 6px;
+        line-height: 1;
+        top: 22px;
+        font-size: 16px;
+        right: 60px;
+        z-index: 2;
     }
 
+
     >div {
-        display: inline-block;
+        text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        position: absolute;
+        pointer-events: none;
         height: 60px;
     }
 }
@@ -218,10 +257,16 @@
     height: 100%;
     z-index: 10;
     opacity: 1;
+    @ptop: -@avatar-top;
 
     >div.progress>.track {
         height: 3px;
         opacity: 1;
+        top: @ptop;
+
+        &:after {
+            top: 24px - @avatar-top - @ptop;
+        }
     }
 
     >.track {
@@ -247,7 +292,7 @@
     font-size: 8px;
     text-align: left;
     line-height: 16px;
-    padding-left: 84px;
+    padding-left: @avatar-left+@avatar-size+4px;
 
     .active,
     .active+.after {
@@ -273,10 +318,6 @@
     font-size: 16px;
 }
 
-&:not(.play):not(.page)>.background {
-    opacity: 0;
-    transition: opacity .4s ease;
-}
 
 &>.background {
     background-color: #999;
@@ -399,32 +440,35 @@
     pointer-events: none;
 
     &+.avatar {
+        pointer-events: all;
         border-color: transparent;
-        z-index: 1;
+        z-index: 2;
+    }
+}
+
+& {
+    text-align: right;
+
+    >.track {
+        height: 60px;
+        margin-top: 0;
+        border-top: 0 solid #666;
+        transition: margin-top .2s ease-out, border-top .2s ease-out, height .2s ease-out;
     }
 }
 
-// & {
-//     >.track {
-//         height: 60px;
-//         margin-top: 0;
-//         border-top: 0 solid #666;
-//         transition: margin-top .2s ease-out, border-top .2s ease-out, height .2s ease-out;
-//     }
-// }
-
-// &.effect {
-//     opacity: 1;
-
-//     >.track {
-//         height: 420px;
-//         margin-top: -360px;
-//         border-top: 360px solid #666;
-//     }
-// }
+&.effect {
+    opacity: 1;
+
+    >.track {
+        height: 420px;
+        margin-top: -360px;
+        border-top: 360px solid #666;
+    }
+}
 
 &:not(.page)>canvas {
-    top: -12px;
+    top: @avatar-top;
 }
 
 &.dragging {