Skip to content
This repository was archived by the owner on Nov 16, 2019. It is now read-only.

Commit 96e1325

Browse files
gera2ldgera2ld
committed
Merge branch 'dev'
2 parents 9086e8f + aa370fa commit 96e1325

File tree

24 files changed

+416
-211
lines changed

24 files changed

+416
-211
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"jszip": "^3.0.0",
3030
"merge2": "^1.0.1",
3131
"ncp": "^2.0.0",
32+
"qunitjs": "^2.0.0-rc1",
3233
"sync-promise-lite": "^0.2.3",
3334
"through2": "^2.0.1",
3435
"underscore": "^1.8.3"

‎src/background/utils/tester.js‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ define('utils/tester', function (_require, exports, _module) {
1111
if (custom.exclude) exc = exc.concat(custom.exclude);
1212
var ok = !mat.length && !inc.length;
1313
// @match
14-
ok = ok || mat.length && function (urlParts) {
15-
return mat.some(function (str) {
16-
return matchTest(str, urlParts);
17-
});
18-
}(url.match(match_reg));
14+
ok = ok || mat.length && function (test) {
15+
return mat.some(test);
16+
}(matchTester(url));
1917
// @include
2018
ok = ok || inc.some(function (str) {
2119
return autoReg(str).test(url);
@@ -38,30 +36,41 @@ define('utils/tester', function (_require, exports, _module) {
3836
return str2RE(str); // String with wildcards
3937
}
4038

41-
var match_reg = /(.*?):\/\/([^\/]*)\/(.*)/;
42-
function matchTest(str, urlParts) {
43-
if (str == '<all_urls>') return true;
44-
var parts = str.match(match_reg);
45-
var ok = !!parts;
46-
// scheme
47-
ok = ok && (
39+
function matchTester(url) {
40+
function matchScheme(rule, data) {
4841
// exact match
49-
parts[1] == urlParts[1]
42+
if (rule == data) return 1;
5043
// * = http | https
51-
|| parts[1] == '*' && /^https?$/i.test(urlParts[1])
52-
);
53-
// host
54-
ok = ok && (
44+
if (rule == '*' && /^https?$/i.test(data)) return 1;
45+
return 0;
46+
}
47+
function matchHost(rule, data) {
5548
// * matches all
56-
parts[2] == '*'
49+
if (rule == '*') return 1;
5750
// exact match
58-
|| parts[2] == urlParts[2]
51+
if (rule == data) return 1;
5952
// *.example.com
60-
|| /^\*\.[^*]*$/.test(parts[2]) && str2RE(parts[2]).test(urlParts[2])
61-
);
62-
// pathname
63-
ok = ok && str2RE(parts[3]).test(urlParts[3]);
64-
return ok;
53+
if (/^\*\.[^*]*$/.test(rule)) {
54+
// matches the specified domain
55+
if (rule.slice(2) == data) return 1;
56+
// matches subdomains
57+
if (str2RE(rule).test(data)) return 1;
58+
}
59+
return 0;
60+
}
61+
function matchPath(rule, data) {
62+
return str2RE(rule).test(data);
63+
}
64+
var RE = /(.*?):\/\/([^\/]*)\/(.*)/;
65+
var urlParts = url.match(RE);
66+
return function (str) {
67+
if (str == '<all_urls>') return true;
68+
var parts = str.match(RE);
69+
return !!parts
70+
&& matchScheme(parts[1], urlParts[1])
71+
&& matchHost(parts[2], urlParts[2])
72+
&& matchPath(parts[3], urlParts[3]);
73+
};
6574
}
6675

6776
exports.testURL = testURL;

‎src/cache.js‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ define('cache', function (require, _exports, module) {
3030
var BaseView = cache.BaseView = Backbone.View.extend({
3131
initialize: function () {
3232
var _this = this;
33+
_this.subviews = {data: {}};
34+
_this.childViews = [];
3335
if (_this.templateUrl) {
3436
_this.__gotTemplate = cache.get(_this.templateUrl)
3537
.then(function (fn) {
@@ -39,6 +41,21 @@ define('cache', function (require, _exports, module) {
3941
_.bindAll(_this, 'render', 'postrender');
4042
_this.render();
4143
},
44+
clear: function () {
45+
var _this = this;
46+
if (_this.childViews.length) {
47+
_this.childViews.forEach(function (view) {
48+
view.remove();
49+
});
50+
_this.childViews = [];
51+
}
52+
},
53+
remove: function () {
54+
var _this = this;
55+
_this.clear();
56+
_this.undelegateEvents();
57+
Backbone.View.prototype.remove.call(_this);
58+
},
4259
_render: function () {
4360
this.$el.html(this.templateFn());
4461
},
@@ -54,6 +71,27 @@ define('cache', function (require, _exports, module) {
5471
node.innerHTML = _.i18n(node.dataset.i18n);
5572
});
5673
},
74+
loadSubview: function (name, factory, selector) {
75+
var _this = this;
76+
var view;
77+
var subviews = _this.subviews;
78+
view = subviews.data[name];
79+
if (!view) {
80+
view = factory();
81+
}
82+
var current = subviews.current;
83+
if (name !== current) {
84+
var currentView = subviews.data[current];
85+
if (currentView) {
86+
currentView.remove();
87+
subviews.data[current] = null;
88+
}
89+
}
90+
subviews.data[subviews.current = name] = view;
91+
var $el = selector ? _this.$(selector) : _this.$el;
92+
$el.html(view.render().el);
93+
return view;
94+
},
5795
getValue: function (target) {
5896
var key = target.dataset.id;
5997
var value;
@@ -78,6 +116,30 @@ define('cache', function (require, _exports, module) {
78116

79117
BaseView.prototype.postrender.call(window);
80118

119+
cache.BaseRouter = Backbone.Router.extend({
120+
initialize: function (selector) {
121+
var _this = this;
122+
_this.views = {data: {}};
123+
_this.$root = $(selector);
124+
},
125+
loadView: function (name, factory) {
126+
var _this = this;
127+
var views = _this.views;
128+
var view = views.data[name];
129+
if (!view) view = views.data[name] = factory();
130+
if (name !== views.current) {
131+
var currentView = views.data[views.current];
132+
if (currentView) {
133+
currentView.remove();
134+
views.data[views.current] = null;
135+
}
136+
views.data[views.current = name] = view;
137+
}
138+
_this.$root.html(view.el);
139+
return view;
140+
},
141+
});
142+
81143
!function () {
82144
var xhr = new XMLHttpRequest;
83145
xhr.open('GET', '/images/sprite.svg', true);

‎src/options/app.js‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
define('app', function (require, exports, _module) {
2-
var models = require('models');
32
var MainView = require('views/Main');
43
var ConfirmView = require('views/Confirm');
5-
var EditView = require('views/Edit');
6-
7-
var scriptList = exports.scriptList = new models.ScriptList;
8-
_.bg._.messenger.connect(window, function (res) {
9-
if (res.cmd === 'add') {
10-
res.data.message = '';
11-
scriptList.push(res.data);
12-
} else if (res.data) {
13-
var model = scriptList.get(res.data.id);
14-
if (model) model.set(res.data);
15-
}
16-
});
4+
var models = require('models');
5+
var cache = require('cache');
176

18-
var App = Backbone.Router.extend({
7+
var App = cache.BaseRouter.extend({
198
routes: {
209
'': 'renderMain',
2110
'main/:tab': 'renderMain',
2211
'confirm/:url': 'renderConfirm',
2312
'confirm/:url/:from': 'renderConfirm',
2413
},
2514
renderMain: function (tab) {
26-
this.view = new MainView(tab);
27-
},
28-
renderConfirm: function (url, _from) {
29-
this.view = new ConfirmView(url, _from);
15+
this.loadView('main', function () {
16+
initMain();
17+
return new MainView;
18+
}).loadTab(tab);
3019
},
31-
renderEdit: function (id) {
32-
this.view = new EditView(id);
20+
renderConfirm: function (url, referer) {
21+
this.loadView('confirm', function () {
22+
return new ConfirmView;
23+
}).initData(url, referer);
3324
},
3425
});
35-
var app = new App;
36-
if (!Backbone.history.start())
37-
app.navigate('', {trigger: true, replace: true});
26+
var app = new App('#app');
27+
Backbone.history.start() || app.navigate('', {trigger: true, replace: true});
28+
29+
function initMain() {
30+
var scriptList = exports.scriptList = new models.ScriptList;
31+
_.bg._.messenger.connect(window, function (res) {
32+
if (res.cmd === 'add') {
33+
res.data.message = '';
34+
scriptList.push(res.data);
35+
} else if (res.data) {
36+
var model = scriptList.get(res.data.id);
37+
if (model) model.set(res.data);
38+
}
39+
});
40+
}
3841
});

‎src/options/style.css‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ aside img {
9595
border-right: 1px solid darkgray;
9696
overflow-y: hidden;
9797
}
98-
#tab > header {
98+
.content > header {
9999
height: 30px;
100100
line-height: 30px;
101101
padding: 0 .5rem;
@@ -144,6 +144,9 @@ aside img {
144144
padding: 20px;
145145
overflow-y: auto;
146146
}
147+
.no-pad {
148+
padding: 0;
149+
}
147150
fieldset.title {
148151
margin-top: 20px;
149152
padding: 10px;
@@ -154,6 +157,7 @@ fieldset.title {
154157
display: block;
155158
width: 100%;
156159
height: 200px;
160+
overflow-y: auto;
157161
white-space: normal;
158162
border: 1px solid gray;
159163
}

‎src/options/templates/confirm.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<button id=btnClose data-i18n=buttonClose></button>
99
</div>
1010
<h1><span data-i18n=labelInstall></span> - <span data-i18n=extName></span></h1>
11-
<div id=url class=ellipsis title="<%- it.url %>"><%- it.url %></div>
11+
<div id=url class=ellipsis></div>
1212
<div id=msg class=ellipsis></div>
1313
</div>
1414
<div class=frame-body>

‎src/options/templates/main.html‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
<div class="main">
2-
<aside>
3-
<img src="/images/icon128.png">
4-
<h2 data-i18n=extName></h2>
5-
<div class="line">2013-2016</div>
6-
<hr>
7-
<div class=sidemenu>
8-
<a href="#main/installed" <%= it.tab == 'main' ? 'class="active"' : '' %> data-i18n=sideMenuInstalled></a>
9-
<a href="#main/settings" <%= it.tab == 'settings' ? 'class="active"' : '' %> data-i18n=sideMenuSettings></a>
10-
<a href="#main/about" <%= it.tab == 'about' ? 'class="active"' : '' %> data-i18n=sideMenuAbout></a>
11-
</div>
12-
</aside>
13-
<div id="tab"></div>
14-
</div>
1+
<aside>
2+
<img src="/images/icon128.png">
3+
<h2 data-i18n=extName></h2>
4+
<div class="line">2013-2016</div>
5+
<hr>
6+
<div class=sidemenu>
7+
<a href="#main/installed" <%= it.tab == 'main' ? 'class="active"' : '' %> data-i18n=sideMenuInstalled></a>
8+
<a href="#main/settings" <%= it.tab == 'settings' ? 'class="active"' : '' %> data-i18n=sideMenuSettings></a>
9+
<a href="#main/about" <%= it.tab == 'about' ? 'class="active"' : '' %> data-i18n=sideMenuAbout></a>
10+
</div>
11+
</aside>
12+
<div id="tab"></div>

‎src/options/templates/tab-about.html‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
1-
<div class="content">
2-
<h1>
3-
<span data-i18n=labelAbout></span>
4-
<small>v<%= it.version %></small>
5-
</h1>
6-
<div class=line data-i18n=extDescription></div>
7-
<div class=line>
8-
<label data-i18n=labelRelated></label>
9-
<span data-i18n=anchorSupportPage></span> |
10-
<a href=https://gerald.top/~donate target=_blank data-i18n=labelDonate></a> |
11-
<a href=https://github.com/violentmonkey/violentmonkey-oex/issues target=_blank data-i18n=labelFeedback></a>
12-
</div>
13-
<div class=line>
14-
<label data-i18n=labelAuthor></label>
15-
<span data-i18n=anchorAuthor></span>
16-
</div>
17-
<div class=line>
18-
<label data-i18n=labelTranslator></label>
19-
<span data-i18n=anchorTranslator></span>
20-
</div>
21-
<div class=line>
22-
<label data-i18n=labelCurrentLang></label>
23-
<span id="currentLang"><%= navigator.language %></span> |
24-
<a href=https://violentmonkey.github.io/localization.html#oex target=_blank>
25-
Help with translation
26-
</a>
27-
</div>
1+
<h1>
2+
<span data-i18n=labelAbout></span>
3+
<small>v<%= it.version %></small>
4+
</h1>
5+
<div class=line data-i18n=extDescription></div>
6+
<div class=line>
7+
<label data-i18n=labelRelated></label>
8+
<span data-i18n=anchorSupportPage></span> |
9+
<a href=https://gerald.top/~donate target=_blank data-i18n=labelDonate></a> |
10+
<a href=https://github.com/violentmonkey/violentmonkey-oex/issues target=_blank data-i18n=labelFeedback></a>
11+
</div>
12+
<div class=line>
13+
<label data-i18n=labelAuthor></label>
14+
<span data-i18n=anchorAuthor></span>
15+
</div>
16+
<div class=line>
17+
<label data-i18n=labelTranslator></label>
18+
<span data-i18n=anchorTranslator></span>
19+
</div>
20+
<div class=line>
21+
<label data-i18n=labelCurrentLang></label>
22+
<span id="currentLang"><%= navigator.language %></span> |
23+
<a href=https://violentmonkey.github.io/localization.html#oex target=_blank>
24+
Help with translation
25+
</a>
2826
</div>

0 commit comments

Comments
 (0)