Skip to content

Commit 3622d92

Browse files
magicoflolismagicoflolis
committed
2.12.2
Signed-off-by: magicoflolis <magicoflolis@gmail.com>
1 parent 8da9b8b commit 3622d92

65 files changed

Lines changed: 109387 additions & 60622 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,51 @@
1-
# Magics Userscript+ (under development)
1+
# Magics Userscript+
22

3-
- [Magics Userscript+ (under development)](#magics-userscript-under-development)
4-
- [About](#about)
5-
- [Features](#features)
3+
> Finds available UserJS for current site.
4+
5+
*Fork of [Userscript+ : Show Site All UserJS](https://greasyfork.org/scripts/24508-userscript-show-site-all-userjs). Authors source code & information found [here](https://github.com/jae-jae/Userscript-Plus#userscript).*
6+
7+
- [Magics Userscript+](#magics-userscript)
68
- [Installation](#installation)
79
- [Manual](#manual)
10+
- [About](#about)
11+
- [Features](#features)
812
- [Build Setup](#build-setup)
13+
- [Known bug](#known-bug)
914
- [License](#license)
1015

11-
## About
12-
13-
_Fork of [Userscript+ : Show Site All UserJS](https://greasyfork.org/scripts/24508-userscript-show-site-all-userjs). Authors source code & information found [here](https://github.com/jae-jae/Userscript-Plus#userscript)._
16+
***
1417

15-
**Finds available UserJS for current site.**
18+
## Installation
1619

17-
Magics Userscript+ is designed to be used along side with `Tampermonkey OR compatiable UserJS manager`
20+
> **There are no excluded websites, use at your own risk.**
1821
19-
Currently [Userscript+](https://github.com/jae-jae/Userscript-Plus#userscript) can only find UserJS through [GreasyFork](https://greasyfork.org), I've added support for [SleazyFork](https://sleazyfork.org) along with additional features!
22+
- [Chrome](https://github.com/magicoflolis/Userscript-Plus)
2023

21-
| Preview |
22-
:----------:
23-
|![Example](https://raw.githubusercontent.com/magicoflolis/Userscript-Plus/master/resources/example.png)|
24+
- [Firefox AMO](https://addons.mozilla.org/firefox/addon/userscript-plus)
2425

25-
## Features
26+
> The userscript **WON'T** work for all websites. [info](#known-bug).
2627
27-
- Added [SleazyFork](https://sleazyfork.org)
28+
- [Greasy Fork](https://greasyfork.org/scripts/421603)
2829

29-
## Installation
30+
### Manual
3031

31-
> The userscript version is **limited** [info](https://github.com/jae-jae/Userscript-Plus#known-bug). Browser extension should be able to run on most sites.
32+
- Download the [zip](https://api.github.com/repos/magicoflolis/Userscript-Plus/zipball/master), load the [extension folder](https://github.com/magicoflolis/Userscript-Plus/tree/master/extension) as a [Temporary Extension](https://extensionworkshop.com/documentation/develop/temporary-installation-in-firefox/).
3233

33-
- [Chrome](https://github.com/magicoflolis/Userscript-Plus)
34+
***
3435

35-
- [Firefox AMO](https://addons.mozilla.org/firefox/addon/userscript-plus)
36+
## About
3637

37-
- Userscript available from [GreasyFork](https://greasyfork.org/scripts/421603) or GitHub [direct link](https://github.com/magicoflolis/Userscript-Plus/raw/master/dist/magic-userjsplus.user.js)
38+
Currently [Userscript+](https://github.com/jae-jae/Userscript-Plus#userscript) can only find userscripts through [GreasyFork](https://greasyfork.org), I've added support for [SleazyFork](https://sleazyfork.org) along with a few additional features!
3839

39-
### Manual
40+
| Preview |
41+
:----------:
42+
|![Preview](https://raw.githubusercontent.com/magicoflolis/Userscript-Plus/master/resources/preview.png)|
4043

41-
> **Note:** Userscript+ will be installed as a [Temporary Extension](https://extensionworkshop.com/documentation/develop/temporary-installation-in-firefox/)
44+
## Features
4245

43-
- Download the [zip](https://api.github.com/repos/magicoflolis/Userscript-Plus/zipball/master), load the [extension folder](https://github.com/magicoflolis/Userscript-Plus/tree/master/extension) as a [Temporary Extension](https://extensionworkshop.com/documentation/develop/temporary-installation-in-firefox/).
46+
- Added [SleazyFork](https://sleazyfork.org).
47+
- Added Dark Theme.
48+
- Compatible with TamperMonkey and ViolentMonkey.
4449

4550
## Build Setup
4651

@@ -57,6 +62,16 @@ web-ext run -s ./extension/
5762
web-ext run -p <profile> -s ./extension/
5863
```
5964

65+
> Code is a bit of a mess right now
66+
67+
## Known bug
68+
69+
- May leave a opened tab when TamperMonkey is used alongside.
70+
- In some sites below the plug-in interface icon is not displayed，Such as: Github
71+
- **This will result in *i.table.noDataText* when no UserJS is found for current site.**
72+
73+
> **Reason**：This is because the security policy of these sites to prevent the plug-in icon font file loading, resulting in the icon does not display properly.
74+
6075
## License
6176

6277
MIT

‎build/userscript.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,18 @@ var time = +new Date();
3131

3232
// let ljs = `// @require https://cdn.jsdelivr.net/gh/jae-jae/l.js/userjs/l.userjs.min.js
3333
// // @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
34-
// // @resource uiJs https://cdn.jsdelivr.net/gh/jae-jae/Userscript-Plus/dist/ui.js?_=${time}`,
34+
// // @resource uiJs https://raw.githubusercontent.com/magicoflolis/Userscript-Plus/master/dist/ui.js?_=${time}`,
3535
// ljs_GF = `// @require https://greasyfork.org/scripts/23419-l-js/code/ljs.js
3636
// // @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
37-
// // @resource uiJs https://cdn.jsdelivr.net/gh/jae-jae/Userscript-Plus/dist/ui.gf.js?_=${time}`;
37+
// // @resource uiJs https://raw.githubusercontent.com/magicoflolis/Userscript-Plus/master/dist/ui.gf.js?_=${time}`;
3838
let ljs = `// @require https://cdn.jsdelivr.net/gh/jae-jae/l.js/userjs/l.userjs.min.js
3939
// @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
4040
// @resource uiJs https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.js?_=${time}`,
4141
ljs_GF = `// @require https://greasyfork.org/scripts/23419-l-js/code/ljs.js
4242
// @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
4343
// @resource uiJs https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.gf.js?_=${time}`;
4444

45+
4546
renderOut("./dist/magic-userjs.user.js", ljs);
4647
//greasyfork version
4748
renderOut("./dist/magic-userjs.gf.user.js", ljs_GF);

‎dist/firefox/updates.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
{
66
"version": "2.0.1",
77
"browser_specific_settings": { "gecko": { "strict_min_version": "55" } },
8-
"update_info_url": "https://github.com/magicoflolis/Userscript-Plus/releases/tag/2.0.1a",
9-
"update_link": "https://github.com/magicoflolis/Userscript-Plus/releases/download/2.0.1a/uscriptplus_2.0.1a.firefox.signed.xpi"
8+
"update_info_url": "https://github.com/magicoflolis/Userscript-Plus/releases/tag/2.0.2",
9+
"update_link": "https://github.com/magicoflolis/Userscript-Plus/releases/download/2.0.2uscriptplus_2.0.2.firefox.signed.xpi"
1010
}
1111
]
1212
}

‎dist/magic-userjs.gf.user.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// @name:ru-RU Magic Userscript+ : Показать пользовательские скрипты (UserJS) для сайта. Jaeger
88
// @name:ru Magic Userscript+ : Показать пользовательские скрипты (UserJS) для сайта. Jaeger
99
// @namespace https://github.com/magicoflolis/Userscript-Plus
10-
// @version 2.3.11
10+
// @version 2.3.12
1111
// @description Show current site all UserJS，The easier way to install UserJs for Tampermonkey.
1212
// @description:zh 显示当前网站的所有可用UserJS(Tampermonkey)脚本,交流QQ群:104267383
1313
// @description:zh-CN 显示当前网站的所有可用UserJS(Tampermonkey)脚本,交流QQ群:104267383
@@ -50,8 +50,8 @@
5050
// @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
5151
// @require https://greasyfork.org/scripts/23419-l-js/code/ljs.js
5252
// @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
53-
// @resource uiJs https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.gf.js?_=1616636684745
54-
// @resource ui https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.html?_=1616636684746
53+
// @resource uiJs https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.gf.js?_=1623139263269
54+
// @resource ui https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.html?_=1623139263269
5555
// @resource count https://greasyfork.org/scripts/by-site.json
5656
// @resource adult https://sleazyfork.org/scripts/by-site.json
5757
// @grant GM_xmlhttpRequest
@@ -60,7 +60,6 @@
6060
// @grant GM_setValue
6161
// @grant unsafeWindow
6262
// @noframes
63-
// @noframe
6463
// @connect cdn.bootcss.com
6564
// @connect raw.githubusercontent.com
6665
// @connect gist.githubusercontent.com
@@ -82,8 +81,7 @@ unsafeWindow.GmAjax = GM_xmlhttpRequest;
8281
this.quietKey = 'jae_fetch_userjs_quiet';
8382
this.countKey = 'jae_fetch_userjs_count';
8483
this.adultKey = 'jae_fetch_userjs_adult';
85-
this.tplBox = '<div id="jae_userscript_box"><div class="jae-userscript" class=""></div></div>';
86-
//this.tplBox = '<div id="jae_userscript_box"><style>.jae-userscript{position:fixed;width:370px;bottom:10px;right:20px;z-index:9999999999;height:56px}.jae-userscript-shadow{box-shadow:0 1px 4px rgba(0,0,0,.3),\\t\\t\\t\\t0px 0 20px rgba(0,0,0,.1) inset}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%;box-shadow:0 15px 10px rgba(0,0,0,.7);transform:rotate(-3deg)}.jae-userscript-shadow::after{right:10px;left:auto;transform:rotate(3deg)}</style><div class="jae-userscript" class=""></div></div>';
84+
this.tplBox = '<div id="jae_userscript_box"><style>.jae-userscript{position:fixed;width:370px;bottom:10px;right:20px;z-index:9999999999;height:56px}.jae-userscript-shadow{box-shadow:0 1px 4px rgba(0,0,0,.3),\\t\\t\\t\\t0px 0 20px rgba(0,0,0,.1) inset}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%;box-shadow:0 15px 10px rgba(0,0,0,.7);transform:rotate(-3deg)}.jae-userscript-shadow::after{right:10px;left:auto;transform:rotate(3deg)}</style><div class="jae-userscript" class=""></div></div>';
8785
}
8886

8987
getMainHost() {
@@ -168,11 +166,11 @@ unsafeWindow.GmAjax = GM_xmlhttpRequest;
168166
if (count) {
169167
$('body').append(this.tplBox);
170168

171-
let ui = GM_getResourceText('ui');
172-
let dom = document.getElementsByClassName('jae-userscript')[0];
173-
//ar tpl = '<iframe name="jaeFetchUserJSFrame" src="about:blank" style="width:100%;height:100%;border:0px;display: block!important;" allowTransparency="true"></iframe>';
174-
dom.innerHTML = '<iframe name="jaeFetchUserJSFrame" src="about:blank" allowTransparency="true"></iframe>';
175-
var iframeDom = dom.children[0];
169+
let ui = GM_getResourceText('ui'),
170+
dom = document.getElementsByClassName('jae-userscript')[0],
171+
tpl = '<iframe name="jaeFetchUserJSFrame" src="about:blank" style="width:100%;height:100%;border:0px;display: block!important;" allowTransparency="true"></iframe>';
172+
dom.innerHTML = tpl;
173+
let iframeDom = dom.children[0];
176174
iframe.write(iframeDom, ui);
177175

178176
this.execFrameJs(jaeFetchUserJSFrame.window);

‎dist/magic-userjs.user.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// @name:ru-RU Magic Userscript+ : Показать пользовательские скрипты (UserJS) для сайта. Jaeger
88
// @name:ru Magic Userscript+ : Показать пользовательские скрипты (UserJS) для сайта. Jaeger
99
// @namespace https://github.com/magicoflolis/Userscript-Plus
10-
// @version 2.3.11
10+
// @version 2.3.12
1111
// @description Show current site all UserJS，The easier way to install UserJs for Tampermonkey.
1212
// @description:zh 显示当前网站的所有可用UserJS(Tampermonkey)脚本,交流QQ群:104267383
1313
// @description:zh-CN 显示当前网站的所有可用UserJS(Tampermonkey)脚本,交流QQ群:104267383
@@ -50,8 +50,8 @@
5050
// @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
5151
// @require https://cdn.jsdelivr.net/gh/jae-jae/l.js/userjs/l.userjs.min.js
5252
// @require https://greasyfork.org/scripts/23420-userjs-base-js/code/userjs-basejs.js
53-
// @resource uiJs https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.js?_=1616636684745
54-
// @resource ui https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.html?_=1616636684745
53+
// @resource uiJs https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.js?_=1623139263269
54+
// @resource ui https://cdn.jsdelivr.net/gh/magicoflolis/Userscript-Plus/dist/ui.html?_=1623139263269
5555
// @resource count https://greasyfork.org/scripts/by-site.json
5656
// @resource adult https://sleazyfork.org/scripts/by-site.json
5757
// @grant GM_xmlhttpRequest
@@ -60,7 +60,6 @@
6060
// @grant GM_setValue
6161
// @grant unsafeWindow
6262
// @noframes
63-
// @noframe
6463
// @connect cdn.bootcss.com
6564
// @connect raw.githubusercontent.com
6665
// @connect gist.githubusercontent.com
@@ -82,8 +81,7 @@ unsafeWindow.GmAjax = GM_xmlhttpRequest;
8281
this.quietKey = 'jae_fetch_userjs_quiet';
8382
this.countKey = 'jae_fetch_userjs_count';
8483
this.adultKey = 'jae_fetch_userjs_adult';
85-
this.tplBox = '<div id="jae_userscript_box"><div class="jae-userscript" class=""></div></div>';
86-
//this.tplBox = '<div id="jae_userscript_box"><style>.jae-userscript{position:fixed;width:370px;bottom:10px;right:20px;z-index:9999999999;height:56px}.jae-userscript-shadow{box-shadow:0 1px 4px rgba(0,0,0,.3),\\t\\t\\t\\t0px 0 20px rgba(0,0,0,.1) inset}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%;box-shadow:0 15px 10px rgba(0,0,0,.7);transform:rotate(-3deg)}.jae-userscript-shadow::after{right:10px;left:auto;transform:rotate(3deg)}</style><div class="jae-userscript" class=""></div></div>';
84+
this.tplBox = '<div id="jae_userscript_box"><style>.jae-userscript{position:fixed;width:370px;bottom:10px;right:20px;z-index:9999999999;height:56px}.jae-userscript-shadow{box-shadow:0 1px 4px rgba(0,0,0,.3),\\t\\t\\t\\t0px 0 20px rgba(0,0,0,.1) inset}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%}.jae-userscript-shadow::before,.jae-userscript-shadow::after{content:"";position:absolute;z-index:-1;bottom:15px;left:10px;width:50%;height:20%;box-shadow:0 15px 10px rgba(0,0,0,.7);transform:rotate(-3deg)}.jae-userscript-shadow::after{right:10px;left:auto;transform:rotate(3deg)}</style><div class="jae-userscript" class=""></div></div>';
8785
}
8886

8987
getMainHost() {
@@ -168,11 +166,11 @@ unsafeWindow.GmAjax = GM_xmlhttpRequest;
168166
if (count) {
169167
$('body').append(this.tplBox);
170168

171-
let ui = GM_getResourceText('ui');
172-
let dom = document.getElementsByClassName('jae-userscript')[0];
173-
//ar tpl = '<iframe name="jaeFetchUserJSFrame" src="about:blank" style="width:100%;height:100%;border:0px;display: block!important;" allowTransparency="true"></iframe>';
174-
dom.innerHTML = '<iframe name="jaeFetchUserJSFrame" src="about:blank" allowTransparency="true"></iframe>';
175-
var iframeDom = dom.children[0];
169+
let ui = GM_getResourceText('ui'),
170+
dom = document.getElementsByClassName('jae-userscript')[0],
171+
tpl = '<iframe name="jaeFetchUserJSFrame" src="about:blank" style="width:100%;height:100%;border:0px;display: block!important;" allowTransparency="true"></iframe>';
172+
dom.innerHTML = tpl;
173+
let iframeDom = dom.children[0];
176174
iframe.write(iframeDom, ui);
177175

178176
this.execFrameJs(jaeFetchUserJSFrame.window);

0 commit comments

Comments
 (0)