diff --git a/game/game.js b/game/game.js
index ffb051f69..561eda001 100644
--- a/game/game.js
+++ b/game/game.js
@@ -6011,7 +6011,8 @@
};
if(ui.updatep1){
ui.updatep1.style.display='';
- ui.updatep2.style.display='';
+ ui.updatep2.style.display='';
+ ui.updatep3.style.display='';
}
game.download=function(url,folder,onsuccess,onerror,dev){
if(url.indexOf('web/')==0){
@@ -6157,7 +6158,8 @@
}
if(ui.updatep1){
ui.updatep1.style.display='';
- ui.updatep2.style.display='';
+ ui.updatep2.style.display='';
+ ui.updatep3.style.display='';
}
game.download=function(url,folder,onsuccess,onerror,dev){
if(url.indexOf('web/')==0){
@@ -7045,6 +7047,26 @@
oReq.open("GET", sScriptURL);
oReq.send();
},
+ json:function(url,onload,onerror){
+ var oReq=new XMLHttpRequest();
+ if(onload) oReq.addEventListener("load",function(){
+ var result;
+ try{
+ result=JSON.parse(this.responseText);
+ if(!result){
+ throw('err');
+ }
+ }
+ catch(e){
+ onerror();
+ return;
+ }
+ onload(result);
+ });
+ if(onerror) oReq.addEventListener("error",onerror);
+ oReq.open("GET", url);
+ oReq.send();
+ },
layout:function(layout,nosave){
if(!nosave) game.saveConfig('layout',layout);
game.layout=layout;
@@ -19799,7 +19821,7 @@
name:'删除此扩展',
clear:true,
onclick:function(){
- if(this.innerHTML=='确认删除'){
+ if(this.innerHTML=='确认删除'){
var prefix='extension_'+obj.name;
var page=this.parentNode;
var start=page.parentNode.previousSibling;
@@ -19826,10 +19848,10 @@
}
}
else{
- this.innerHTML='确认删除';
+ this.innerHTML='确认删除';
var that=this;
setTimeout(function(){
- that.innerHTML='删除'+obj.name;
+ that.innerHTML='删除此扩展';
},1000);
}
}
@@ -30254,13 +30276,13 @@
ui.create.div('','',importExtension);
- if(!game.download||true){
+ if(!game.download||typeof window.fetch!='function'){
extensionnode.classList.add('on');
importExtension.style.display='';
importextensionexpanded=true;
}
- var reloadnode=ui.create.div('.config.toggle','重新启动',page,game.reload);
+ var reloadnode=ui.create.div('.config.toggle.pointerdiv','重新启动',page,game.reload);
reloadnode.style.display='none';
var placeholder=ui.create.div('.config.toggle',page);
placeholder.style.height=0;
@@ -30292,12 +30314,12 @@
}
var clickExtension=function(){
- var active=this.parentNode.querySelector('.videonode.active');
+ var active=this.parentNode.querySelector('.videonode.current');
if(active){
- active.classList.remove('active');
+ active.classList.remove('current');
}
if(active!=this){
- this.classList.add('active');
+ this.classList.add('current');
}
};
var importExtensionf=function(extname,extversion,noasset,onsuccess,onerror){
@@ -30343,65 +30365,77 @@
}
};
var downloadExtension=function(e){
- if((this.innerHTML!='下载扩展'&&this.innerHTML!='更新扩展'&&this.innerHTML!='更新素材')||!window.JSZip) return;
+ if((this.innerHTML!='下载扩展'&&this.innerHTML!='更新扩展')||!window.JSZip) return;
if(e){
e.stopPropagation();
}
node.updated=true;
var that=this;
var list=[];
- var noasset=false;
- if(this.files.length){
- if(!lib.config.no_extension_asset||this.innerHTML=='更新素材'){
- for(var i=0;i';
li3.style.whiteSpace='nowrap';
ui.updatep1=li1.querySelector('p');
- ui.updatep2=li2;
+ ui.updatep2=li2;
+ ui.updatep3=li3;
if(!game.download){
ui.updatep1.style.display='none';
- ui.updatep2.style.display='none';
+ ui.updatep2.style.display='none';
+ ui.updatep3.style.display='none';
}
var button1,button2,button3,button4,button5;
diff --git a/layout/default/menu.css b/layout/default/menu.css
index efa118c8e..ac2043049 100644
--- a/layout/default/menu.css
+++ b/layout/default/menu.css
@@ -1101,7 +1101,7 @@ input.fileinput::-webkit-file-upload-button {
height: auto;
max-height: 90px;
}
-.videonode.menubutton.extension.active{
+.videonode.menubutton.extension.current{
max-height: 200px;
}
.videonode.menubutton>div{
@@ -1111,6 +1111,9 @@ input.fileinput::-webkit-file-upload-button {
position: relative;
display: block;
}
+#window:not(.nopointer) .videonode.menubutton.extension>.caption>.menubutton:not(.transparent2):not(.nopointer){
+ cursor: pointer;
+}
.videonode.menubutton.extension>.caption>.menubutton{
position: relative;
float: right;