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:f455cfed4c1834592af404947c23b4fc4d1af426
Branches Tags
iotcat:dependabot/npm_and_yarn/minimist-1.2.6
iotcat:master
...
compare: iotcat:3d17eb584fbe34ae8b7e75f133c1f79b608c4749
Branches Tags
iotcat:dependabot/npm_and_yarn/minimist-1.2.6
iotcat:master

3 Commits
f455cfed4c ... 3d17eb584f

Author SHA1 Message Date
iotcat 3d17eb584f sentim
4 years ago
iotcat 7367784f72 bug
4 years ago
iotcat ea981bd6e4 v3.4.9
4 years ago
10 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 6
      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. 6
      ushio-footer.js
  9. 2
      ushio-head.js
  10. 2
      ushio-head.js.dump

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

@ -840,12 +840,12 @@ page.setting={
$(window).bind("scroll resize",function(e){/*mainobj.togglecontrol();*/}); $(window).bind("scroll resize",function(e){/*mainobj.togglecontrol();*/});
$('#_setting').draggable({ $('#_setting').draggable({
start: function() { start: function() {
mainobj.lastStartTime = new Date().valueOf();console.log('33333'); mainobj.lastStartTime = new Date().valueOf();
}, },
stop: function() { stop: function() {
mainobj.lastStopTime = new Date().valueOf(); mainobj.lastStopTime = new Date().valueOf();
console.log(mainobj.lastStopTime - mainobj.lastStartTime); console.log(mainobj.lastStopTime - mainobj.lastStartTime);
if(mainobj.lastStopTime - mainobj.lastStartTime > 0 && mainobj.lastStopTime - mainobj.lastStartTime < 70){ if(mainobj.lastStopTime - mainobj.lastStartTime > 0 && mainobj.lastStopTime - mainobj.lastStartTime < 270){
mainobj.scrollup(); mainobj.scrollup();
} }
} }
@ -891,5 +891,5 @@ function drawBrand(){
if(!session.status){ if(!session.status){
session_ajax_ini(); session_ajax_ini();
} }
console.log('\n' + ' %c Ushio v3.4.8 %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;'); console.log('\n' + ' %c Ushio v3.4.10 %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

@ -132,7 +132,7 @@ if(cookie.get('_lang')){
$('.\\.'+l).show(); $('.\\.'+l).show();
page.tran.getLang = function(){return l;} page.tran.getLang = function(){return l;}
} }
page.tran.getLang = function(){return (navigator.language||navigator.userLanguage).substr(0, 2);}
$(function(){ $(function(){
page.tran.setLang(l); page.tran.setLang(l);
}); });

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", "name": "ushio-js",
"version": "3.4.7", "version": "3.4.9",
"main": "ushio-head.js", "main": "ushio-head.js",
"repository": "https://github.com/iotcat/ushio-js", "repository": "https://github.com/iotcat/ushio-js",
"author": "iotcat <i@iotcat.me>", "author": "iotcat <i@iotcat.me>",

6
ushio-footer.js
Unescape View File

@ -840,12 +840,12 @@ page.setting={
$(window).bind("scroll resize",function(e){/*mainobj.togglecontrol();*/}); $(window).bind("scroll resize",function(e){/*mainobj.togglecontrol();*/});
$('#_setting').draggable({ $('#_setting').draggable({
start: function() { start: function() {
mainobj.lastStartTime = new Date().valueOf();console.log('33333'); mainobj.lastStartTime = new Date().valueOf();
}, },
stop: function() { stop: function() {
mainobj.lastStopTime = new Date().valueOf(); mainobj.lastStopTime = new Date().valueOf();
console.log(mainobj.lastStopTime - mainobj.lastStartTime); console.log(mainobj.lastStopTime - mainobj.lastStartTime);
if(mainobj.lastStopTime - mainobj.lastStartTime > 0 && mainobj.lastStopTime - mainobj.lastStartTime < 70){ if(mainobj.lastStopTime - mainobj.lastStartTime > 0 && mainobj.lastStopTime - mainobj.lastStartTime < 270){
mainobj.scrollup(); mainobj.scrollup();
} }
} }
@ -891,5 +891,5 @@ function drawBrand(){
if(!session.status){ if(!session.status){
session_ajax_ini(); session_ajax_ini();
} }
console.log('\n' + ' %c Ushio v3.4.8 %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;'); console.log('\n' + ' %c Ushio v3.4.10 %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

@ -132,7 +132,7 @@ if(cookie.get('_lang')){
$('.\\.'+l).show(); $('.\\.'+l).show();
page.tran.getLang = function(){return l;} page.tran.getLang = function(){return l;}
} }
page.tran.getLang = function(){return (navigator.language||navigator.userLanguage).substr(0, 2);}
$(function(){ $(function(){
page.tran.setLang(l); page.tran.setLang(l);
}); });

2
ushio-head.js.dump
Unescape View File

@ -132,7 +132,7 @@ if(cookie.get('_lang')){
$('.\\.'+l).show(); $('.\\.'+l).show();
page.tran.getLang = function(){return l;} page.tran.getLang = function(){return l;}
} }
page.tran.getLang = function(){return (navigator.language||navigator.userLanguage).substr(0, 2);}
$(function(){ $(function(){
page.tran.setLang(l); page.tran.setLang(l);
}); });

Write Preview
Loading…
Cancel
Save