Skip to content

Commit 82b8e38

Browse files
committed
Merge pull request #4 from zpbx/dev
Update.
2 parents 1ea824e + 6e5e131 commit 82b8e38

File tree

4 files changed

+21
-39
lines changed

4 files changed

+21
-39
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "weibo-keep-v5",
3-
"version": "0.1.0",
3+
"version": "0.1.2",
44
"homepage": "https://github.com/UserScript/Weibo-Keep-V5",
55
"authors": [
66
"cssmagic"

dist/weibo-keep-v5.user.js

+10-19
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// ==UserScript==
22
// @name Weibo-Keep-V5
3-
// @version 0.1.0
3+
// @version 0.1.2
4+
// @author cssmagic
45
// @namespace https://github.com/UserScript
6+
// @homepage https://github.com/UserScript/Weibo-Keep-V5
57
// @description To keep Sina Weibo at V5.
68
// @description:zh 让新浪微博保持在 V5 界面。
79
// @downloadURL https://rawgit.com/UserScript/Weibo-Keep-V5/master/dist/weibo-keep-v5.user.js
@@ -152,20 +154,10 @@ void function (root) {
152154
void function () {
153155
'use strict'
154156

155-
//url
156-
var host = location.host
157-
var path = location.pathname
158-
var query = location.search
159-
var req = path + query
160-
var paramV6 = 'wvr=6'
161-
var paramV5 = 'wvr=5'
162-
163157
//cookie
164158
var cookieKey = 'wvr'
165159
var cookieKeyV6 = 'wvr6'
166160
var cookieDomain = '.weibo.com'
167-
168-
//util
169161
function _setCookie(key, value, path, days, domain) {
170162
var str = key + '=' + encodeURIComponent(value) + ';'
171163
if (path) str += 'path=' + path + ';'
@@ -175,6 +167,11 @@ void function () {
175167
}
176168

177169
//url
170+
var path = location.pathname
171+
var query = location.search
172+
var req = path + query
173+
var paramV6 = 'wvr=6'
174+
var paramV5 = 'wvr=5'
178175
function _isV6URL(url) {
179176
url = url || req
180177
return $.str.include(url, paramV6)
@@ -233,17 +230,11 @@ void function () {
233230

234231
//weibo config
235232
function _getWeiboConfig() {
236-
return (unsafeWindow || window).$CONFIG
233+
return unsafeWindow.$CONFIG || {}
237234
}
238235
function _isDebugMode() {
239236
var config = _getWeiboConfig()
240-
var result = false
241-
if (config.uid === '1645021302') {
242-
result = true
243-
} else if (config.domain === 'cssmagic') {
244-
result = true
245-
}
246-
return result
237+
return config.uid === '1645021302' || config.domain === 'cssmagic'
247238
}
248239
function _isV6Page() {
249240
var config = _getWeiboConfig()

src/main.js

+7-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
void function () {
22
'use strict'
33

4-
//url
5-
var host = location.host
6-
var path = location.pathname
7-
var query = location.search
8-
var req = path + query
9-
var paramV6 = 'wvr=6'
10-
var paramV5 = 'wvr=5'
11-
124
//cookie
135
var cookieKey = 'wvr'
146
var cookieKeyV6 = 'wvr6'
157
var cookieDomain = '.weibo.com'
16-
17-
//util
188
function _setCookie(key, value, path, days, domain) {
199
var str = key + '=' + encodeURIComponent(value) + ';'
2010
if (path) str += 'path=' + path + ';'
@@ -24,6 +14,11 @@ void function () {
2414
}
2515

2616
//url
17+
var path = location.pathname
18+
var query = location.search
19+
var req = path + query
20+
var paramV6 = 'wvr=6'
21+
var paramV5 = 'wvr=5'
2722
function _isV6URL(url) {
2823
url = url || req
2924
return $.str.include(url, paramV6)
@@ -82,17 +77,11 @@ void function () {
8277

8378
//weibo config
8479
function _getWeiboConfig() {
85-
return (unsafeWindow || window).$CONFIG
80+
return unsafeWindow.$CONFIG || {}
8681
}
8782
function _isDebugMode() {
8883
var config = _getWeiboConfig()
89-
var result = false
90-
if (config.uid === '1645021302') {
91-
result = true
92-
} else if (config.domain === 'cssmagic') {
93-
result = true
94-
}
95-
return result
84+
return config.uid === '1645021302' || config.domain === 'cssmagic'
9685
}
9786
function _isV6Page() {
9887
var config = _getWeiboConfig()

src/meta.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// ==UserScript==
22
// @name Weibo-Keep-V5
3-
// @version 0.1.0
3+
// @version 0.1.2
4+
// @author cssmagic
45
// @namespace https://github.com/UserScript
6+
// @homepage https://github.com/UserScript/Weibo-Keep-V5
57
// @description To keep Sina Weibo at V5.
68
// @description:zh 让新浪微博保持在 V5 界面。
79
// @downloadURL https://rawgit.com/UserScript/Weibo-Keep-V5/master/dist/weibo-keep-v5.user.js

0 commit comments

Comments
 (0)