iotcat
/
Ushio-js
mirror of https://github.com/IoTcat/Ushio-js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: iotcat:0ee86a9ca1f905beac8c2d3fff341ea68299a976
Branches Tags
iotcat:dependabot/npm_and_yarn/minimist-1.2.6
iotcat:master
...
compare: iotcat:06a3038ae6d15a0ddc0f671d3747eb793dd2a58a
Branches Tags
iotcat:dependabot/npm_and_yarn/minimist-1.2.6
iotcat:master

4 Commits
0ee86a9ca1 ... 06a3038ae6

Author SHA1 Message Date
iotcat 06a3038ae6 hide
4 years ago
iotcat 40d519b725 v3.4.3
4 years ago
iotcat d7650f868d cross-aplayer
4 years ago
iotcat 1647774008 v3.4.2
4 years ago
10 changed files with 244 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 31
      dist/ushio-footer.js
  2. 2
      dist/ushio-footer.min.js
  3. 2
      dist/ushio-footer.min.js.map
  4. 2
      dist/ushio-head.js
  5. 2
      dist/ushio-head.min.js
  6. 2
      dist/ushio-head.min.js.map
  7. 2
      package.json
  8. 31
      ushio-footer.js
  9. 2
      ushio-head.js
  10. 199
      ushio-head.js.dump

31
dist/ushio-footer.js vendored
Unescape View File

@ -321,7 +321,7 @@ session.onload(function(){
console.log('Ushio - session loaded.. '+(new Date().valueOf()/1000 - page.openTime)+'s');
});
session.onload(function(){
if(typeof block_aplayer == "undefined"){
if(typeof block_aplayer == "undefined" || session.get('aplayer/status') == 'play'){
player_ini();
}
});
@ -715,7 +715,13 @@ page.showUshio = function(){
['<button><b>'+close+'</b></button>', function (instance, toast) {
instance.hide({ transitionOut: 'fadeOut' }, toast, 'button');
}, true]
]
],
onOpening: function () {
$('#_setting').hide();
},
onClosed: function () {
$('#_setting').show();
},
});
});
@ -774,7 +780,7 @@ page.setting={
var iebrws=document.all;
mainobj.cssfixedsupport=!iebrws||iebrws&&document.compatMode=="CSS1Compat"&&window.XMLHttpRequest;
mainobj.$body=(window.opera)?(document.compatMode=="CSS1Compat"?$("html"):$("body")):$("html,body");
mainobj.$control=$('<div id="topcontrol" >'+mainobj.controlHTML+"</div>").css({position:mainobj.cssfixedsupport?"fixed":"absolute",'z-index': 9999,bottom:mainobj.controlattrs.offsety,right:mainobj.controlattrs.offsetx,opacity:0,cursor:"pointer"}).attr({title:"Ushio Setting"}).click(function(){mainobj.scrollup();return false;}).appendTo("body");if(document.all&&!window.XMLHttpRequest&&mainobj.$control.text()!=""){mainobj.$control.css({width:mainobj.$control.width()});}mainobj.togglecontrol();
mainobj.$control=$('<div id="_setting" >'+mainobj.controlHTML+"</div>").css({position:mainobj.cssfixedsupport?"fixed":"absolute",'z-index': 9999,bottom:mainobj.controlattrs.offsety,right:mainobj.controlattrs.offsetx,opacity:0,cursor:"pointer"}).attr({title:"Ushio Setting"}).click(function(){mainobj.scrollup();return false;}).appendTo("body");if(document.all&&!window.XMLHttpRequest&&mainobj.$control.text()!=""){mainobj.$control.css({width:mainobj.$control.width()});}mainobj.togglecontrol();
$('a[href="'+mainobj.anchorkeyword+'"]').click(function(){mainobj.scrollup();return false;});
$(window).bind("scroll resize",function(e){mainobj.togglecontrol();});
});
@ -783,15 +789,6 @@ page.setting={
page.setting.init();
/* brand */
function drawBrand(){
if(!session.status){
session_ajax_ini();
}
console.log('\n' + ' %c Ushio v3.4.1 %c ' + page.ip + ' %c '+ ((session.method == 'WebSocket')?'WebSocket':'Ajax') +' %c https://ushio.cool/ \n', 'color: #FFFFCC; background: #030307; padding:5px 0;', 'color: #FF99FF; background: #030307; padding:5px 0;', 'color: '+((session.method == 'WebSocket')?'#91FF3A':'#F8FF00')+'; background: #030307; padding:5px 0;', 'background: #4682B4; padding:5px 0;');
}
/* session health */
SessionLastCntTime = new Date().valueOf();
var session_errCnt = 1;
@ -811,3 +808,13 @@ setInterval(()=>{
throw new Error('ushio::Page Reload!');
}
}, 7000);
/* brand */
function drawBrand(){
if(!session.status){
session_ajax_ini();
}
console.log('\n' + ' %c Ushio v3.4.3 %c ' + page.ip + ' %c '+ ((session.method == 'WebSocket')?'WebSocket':'Ajax') +' %c https://ushio.cool/ \n', 'color: #FFFFCC; background: #030307; padding:5px 0;', 'color: #FF99FF; background: #030307; padding:5px 0;', 'color: '+((session.method == 'WebSocket')?'#91FF3A':'#F8FF00')+'; background: #030307; padding:5px 0;', 'background: #4682B4; padding:5px 0;');
}

2
dist/ushio-footer.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ushio-footer.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ushio-head.js vendored
Unescape View File

@ -25,7 +25,7 @@ function randomStr(length) {
}
/* include css */
if(typeof block_aplayer == "undefined"){
if(/*typeof block_aplayer == "undefined"*/true){
if(window.screen.width < 600) document.write('<link rel="stylesheet" href="https://cdn.yimian.xyz/ushio-js/ushio-js.mobile.min.css">');
else document.write('<link rel="stylesheet" href="https://cdn.yimian.xyz/ushio-js/ushio-js.min.css">');
}

2
dist/ushio-head.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ushio-head.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "ushio-js",
"version": "3.4.1",
"version": "3.4.3",
"main": "ushio-head.js",
"repository": "https://github.com/iotcat/ushio-js",
"author": "iotcat <i@iotcat.me>",

31
ushio-footer.js
Unescape View File

@ -321,7 +321,7 @@ session.onload(function(){
console.log('Ushio - session loaded.. '+(new Date().valueOf()/1000 - page.openTime)+'s');
});
session.onload(function(){
if(typeof block_aplayer == "undefined"){
if(typeof block_aplayer == "undefined" || session.get('aplayer/status') == 'play'){
player_ini();
}
});
@ -715,7 +715,13 @@ page.showUshio = function(){
['<button><b>'+close+'</b></button>', function (instance, toast) {
instance.hide({ transitionOut: 'fadeOut' }, toast, 'button');
}, true]
]
],
onOpening: function () {
$('#_setting').hide();
},
onClosed: function () {
$('#_setting').show();
},
});
});
@ -774,7 +780,7 @@ page.setting={
var iebrws=document.all;
mainobj.cssfixedsupport=!iebrws||iebrws&&document.compatMode=="CSS1Compat"&&window.XMLHttpRequest;
mainobj.$body=(window.opera)?(document.compatMode=="CSS1Compat"?$("html"):$("body")):$("html,body");
mainobj.$control=$('<div id="topcontrol" >'+mainobj.controlHTML+"</div>").css({position:mainobj.cssfixedsupport?"fixed":"absolute",'z-index': 9999,bottom:mainobj.controlattrs.offsety,right:mainobj.controlattrs.offsetx,opacity:0,cursor:"pointer"}).attr({title:"Ushio Setting"}).click(function(){mainobj.scrollup();return false;}).appendTo("body");if(document.all&&!window.XMLHttpRequest&&mainobj.$control.text()!=""){mainobj.$control.css({width:mainobj.$control.width()});}mainobj.togglecontrol();
mainobj.$control=$('<div id="_setting" >'+mainobj.controlHTML+"</div>").css({position:mainobj.cssfixedsupport?"fixed":"absolute",'z-index': 9999,bottom:mainobj.controlattrs.offsety,right:mainobj.controlattrs.offsetx,opacity:0,cursor:"pointer"}).attr({title:"Ushio Setting"}).click(function(){mainobj.scrollup();return false;}).appendTo("body");if(document.all&&!window.XMLHttpRequest&&mainobj.$control.text()!=""){mainobj.$control.css({width:mainobj.$control.width()});}mainobj.togglecontrol();
$('a[href="'+mainobj.anchorkeyword+'"]').click(function(){mainobj.scrollup();return false;});
$(window).bind("scroll resize",function(e){mainobj.togglecontrol();});
});
@ -783,15 +789,6 @@ page.setting={
page.setting.init();
/* brand */
function drawBrand(){
if(!session.status){
session_ajax_ini();
}
console.log('\n' + ' %c Ushio v3.4.1 %c ' + page.ip + ' %c '+ ((session.method == 'WebSocket')?'WebSocket':'Ajax') +' %c https://ushio.cool/ \n', 'color: #FFFFCC; background: #030307; padding:5px 0;', 'color: #FF99FF; background: #030307; padding:5px 0;', 'color: '+((session.method == 'WebSocket')?'#91FF3A':'#F8FF00')+'; background: #030307; padding:5px 0;', 'background: #4682B4; padding:5px 0;');
}
/* session health */
SessionLastCntTime = new Date().valueOf();
var session_errCnt = 1;
@ -811,3 +808,13 @@ setInterval(()=>{
throw new Error('ushio::Page Reload!');
}
}, 7000);
/* brand */
function drawBrand(){
if(!session.status){
session_ajax_ini();
}
console.log('\n' + ' %c Ushio v3.4.3 %c ' + page.ip + ' %c '+ ((session.method == 'WebSocket')?'WebSocket':'Ajax') +' %c https://ushio.cool/ \n', 'color: #FFFFCC; background: #030307; padding:5px 0;', 'color: #FF99FF; background: #030307; padding:5px 0;', 'color: '+((session.method == 'WebSocket')?'#91FF3A':'#F8FF00')+'; background: #030307; padding:5px 0;', 'background: #4682B4; padding:5px 0;');
}

2
ushio-head.js
Unescape View File

@ -25,7 +25,7 @@ function randomStr(length) {
}
/* include css */
if(typeof block_aplayer == "undefined"){
if(/*typeof block_aplayer == "undefined"*/true){
if(window.screen.width < 600) document.write('<link rel="stylesheet" href="https://cdn.yimian.xyz/ushio-js/ushio-js.mobile.min.css">');
else document.write('<link rel="stylesheet" href="https://cdn.yimian.xyz/ushio-js/ushio-js.min.css">');
}

199
ushio-head.js.dump
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save