Skip to content

Commit 3f7fbe7

Browse files
frank-lamfrank-lam
committed
Merge branch 'frank'
# Conflicts: # markdown-toc-code.crx # markdown-toc-code.pem
2 parents ea4f4f0 + b124e02 commit 3f7fbe7

File tree

9 files changed

+181
-22
lines changed

9 files changed

+181
-22
lines changed

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This is a chrome extension that supports parsing articles on GitHub and generati
1010

1111
**like the rendering graphics below, this must make you very excited !**
1212

13-
![markdown-toc2](assets/markdown-toc.gif)
13+
![markdown-toc-2](assets/markdown-toc-2.gif)
1414

1515

1616

@@ -40,4 +40,8 @@ This is a chrome extension that supports parsing articles on GitHub and generati
4040
- 2018-12-04 : version 0.0.1
4141
- features
4242
- software is born
43+
- 2018-12-08 : version 0.0.2
44+
- features
45+
- 侧边栏显示，不遮挡正文内容
46+
- 拖动自适应效果
4347

‎assets/markdown-toc-2.gif

1.32 MB
Loading

‎markdown-toc-code.crx

42.5 KB
Binary file not shown.

‎markdown-toc-code.pem

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCdxR8JmENFZrNH
3+
pEQhDud38UsDMVaKnkp6rlqthfGYxhXhVxNakKz6uUVkjIP89wPP25FhRwNijtge
4+
CCz+0ry3QkaV2gPtPYe3ytv7TlSpXR0oxZ8RZOKsw049eVOYy8PNaSWUR4jkoUgw
5+
9VWruL6TR9tfHi1PqltRtDb4+eYCfN+TakCgjZKXsHrlMPZQrcoFQdoWTKSdoiOl
6+
ovFiB/DORj3JD1B1zexWaQtmZpVO6JRq/vwsYV5Y3BLNO3XWWYX4pBwqPdoPEYG6
7+
kmy0VD9Tyr6dL+IhB9xcfw0g38uerI0z7LTHLhQkBbpBHsCKsAodw5711Qxf7jEt
8+
gb/VMiQJAgMBAAECggEAOzR5aL7YY8dd+MEGhgdTSnnkpe6SZNNw7KfYRGzS1Htl
9+
Q5pLG33WRAJZrZljgH7r0ck6PbCJ7ybeqCp2RCwuAHFhDqPxPEqOTyTTt3NWJvZX
10+
1nCOuFbND3r9Nel9OwYgVMmj/gh4MR/q+OBgBWB/N8LL6l5nL5Gk0jzYMkeJDp5Z
11+
r46cxyTS66ZlSQf4xrwOD7jHOfIbrvJ+3tD+yfq9vm4ls6ErPqM3L/N8oeQIlGTH
12+
FRGSjiWVSpswB7j7LX4sLDg9v1VGLXdEBO135DWPeQlB4BBwBazLT6+f3CtZIgFd
13+
XE+oEhaQReKVClE50VgpfDF8OawpKLwhc/6LZubv3wKBgQDUkxQH/jWOhuJFgeUC
14+
zDinmDZ6csve7WsSDUf2WmHIGtKabh6orJRMH9K8g6OZqOtuxndHW7bYu6AUNKte
15+
5DBfvQuLh1I/7nglTrcvMCx1gwJAlG02/L0D3Zfxs7tZ5Jp73mCCAXNmV9u7EypP
16+
vcGLB1kn+UYfZDS8PFY6to9+XwKBgQC9//QpnbtAeIfKZamAT5M5fBpjtNS4tRmz
17+
b1rQHN+K+mmo0ondhpyKphLaoEf+Jbo95y8koQgrX9iTBb7SsVay0kFUoFQEZeuK
18+
0DelJ3TQn0jm3MsusVhKFOqZVWg3O8ptavWVNcyO6JkzG2xxO1UXga79YPjsxrUD
19+
6sYGkIOmlwKBgCrSXgymJv/JKDe8TPfdT+RjA0ZzbaJAzXrbdg2oc14uGRLG8CIm
20+
cdFL79XN5t0DbDnqfQjA7vqGAV9QpNz+tsfyeyrmXalHTqilTL2SxMH/XCrKO54C
21+
F8l5kCw+epVHOd+OEn7d7/ND652p5LIflad+GXW1/2w/cWgh93ToZcudAoGAdyar
22+
bOnAwzaTGadVe+TrU/Jy7jI58LeJrZBYqAhjW9mcJ0YZNTY0t3JcgoRfgY8RU77G
23+
PrdJ00GhJNpGiAS0dSIL3FFLPxLXes8HBmhPBoHNixHNzbNjxdmGIbCA0ZqKYMHh
24+
zrfVV42gfX9mK0BlJX+rSLTmhj46yIETvIwmM3MCgYEAg8cNU/ow5N40FhckEEBp
25+
EEEMlZ8+qHFPf0jvA0Bb34RVrwXMSUeecEsNE+sKyU4JdDZcpcbvyQZL7iGrnBs2
26+
CQ1X5yHFAllMiyleZ1W5PL1HU00BKdZGODsfa8RMNs+nIV89mhwQVNEjFPO7ZchM
27+
OCdo2mxwhyhY8TRjtTeUggA=
28+
-----END PRIVATE KEY-----

‎markdown-toc-code/css/content.css

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,42 @@
2020

2121
/* 目录栏的样式 */
2222
.div_toc{
23-
width: -webkit-calc(100% - 6px);
23+
width: -webkit-calc(100% - 5px);
2424
height: 100%;
2525
float: left;
2626
padding: 20px;
2727
overflow: auto;
2828
overflow-x: hidden;
2929
background-color: #fafbfc;
30-
border: 1px solid #d1d5da;
30+
/* border: 1px solid #d1d5da; */
31+
border-right-width: 0;
3132
}
3233

3334
.div_right_bar{
34-
width: 6px;
35+
width: 5px;
3536
height: 100%;
36-
background-color: white;
37-
cursor: e-resize;
37+
background-color: #fafbfc;
38+
cursor: col-resize;
3839
float: left;
40+
border-right: 1px solid #d1d5da;
3941
}
4042

43+
/* 这个地方 */
44+
4145
.toc{
4246
position: fixed;
43-
width: 400px;
47+
width: 350px;
4448
min-height: 200px;
45-
z-index: 999;
46-
47-
left: 10px;
48-
top: 70px;
49-
border-radius: 3px;
50-
height: 85%;
49+
z-index: 999;
50+
min-width: 200px;
51+
left: 0px;
52+
top: 0px;
53+
border-radius: 0px;
54+
height: 100%;
5155
bottom: 100px;
5256
float: left;
5357
}
5458

59+
body{
60+
margin-left: 350px;
61+
}

‎markdown-toc-code/img/icon.png renamed to ‎markdown-toc-code/img/icon2.png

File renamed without changes.

‎markdown-toc-code/img/logo.ico

4.19 KB
Binary file not shown.

‎markdown-toc-code/js/content-script.js

Lines changed: 128 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,27 @@ function addStyle(obj, atrr) {
99
}
1010

1111
// Github页面 过去一秒后开始加载元素 渲染toc目录
12-
setTimeout(function () {
12+
// setTimeout(function () {
13+
// var git_reg = /[https://github.com].*/;
14+
// if (git_reg.test(document.URL)) {
15+
// var _readme = $('article');
16+
// var data = _readme.querySelectorAll('h1,h2,h3');
17+
// var div = init(data);
18+
// document.body.appendChild(div);
19+
// }
20+
// // alert($(window).width);
21+
// console.log(document.getElementById('div_right_bar'));
22+
// bindResize(document.getElementById('div_right_bar'));
23+
// // 因为你这里你根本不知道页面结构到底加载好了没 资源 z加载enme完毕了吗
24+
// document.getElementsByTagName('html')[0].style.marginLeft = "350px";
25+
// }, 1000)
26+
//看看 这里执行了吗
27+
let $container;
28+
let $repoheadDetailsContainer;
29+
let $jsRepoNav;
30+
let containerClient;
31+
const domInit = function(){
32+
console.log(new Date().getTime(),'初始化开始')
1333
var git_reg = /[https://github.com].*/;
1434
if (git_reg.test(document.URL)) {
1535
var _readme = $('article');
@@ -20,7 +40,56 @@ setTimeout(function () {
2040
// alert($(window).width);
2141
console.log(document.getElementById('div_right_bar'));
2242
bindResize(document.getElementById('div_right_bar'));
23-
}, 1000)
43+
const $idHtml = document.querySelector('#js-repo-pjax-container');
44+
$container = $idHtml.children[1];
45+
$repoheadDetailsContainer = document.querySelector('.repohead-details-container');
46+
$jsRepoNav = document.querySelector('.js-repo-nav');
47+
containerClient = $container.getClientRects()[0];
48+
49+
// 因为你这里你根本不知道页面结构到底加载好了没 资源 z加载enme完毕了吗
50+
// document.querySelector('.Header').style.paddingLeft = '350px';
51+
initTocBar(350);
52+
// document.querySelector('#js-repo-pjax-container').style.paddingLeft = '350px';
53+
54+
55+
// document.getElementsByTagName('html')[0].style.marginLeft = "350px";
56+
}
57+
document.addEventListener('DOMContentLoaded',domInit,false);
58+
59+
60+
function initTocBar(initWidth){
61+
var els = document.getElementById('toc').style;
62+
63+
//宇宙超级无敌运算中...
64+
let w = document.body.clientWidth;
65+
let w2 = initWidth + 'px';
66+
67+
var minWidth = 200;
68+
var moveWidth = parseInt(initWidth);
69+
if(moveWidth < 200){
70+
return;
71+
}
72+
var $header = document.querySelector('.Header');
73+
74+
75+
if(moveWidth > minWidth && initWidth > containerClient.left){
76+
document.getElementsByTagName('html')[0].style.marginLeft = w2;
77+
$header.style.paddingLeft = 0 + 'px';
78+
// $container.style.marginLeft = '10px';
79+
$container.style.marginLeft = '10px';
80+
$repoheadDetailsContainer.style.marginLeft = '10px';
81+
$jsRepoNav.style.marginLeft = '10px';
82+
}else{
83+
$header.style.paddingLeft = moveWidth + 'px';
84+
document.getElementsByTagName('html')[0].style.marginLeft = 0;
85+
$container.style.marginLeft = 'auto';
86+
$repoheadDetailsContainer.style.marginLeft = 'auto';
87+
$jsRepoNav.style.marginLeft = 'auto';
88+
}
89+
els.width = initTocBar + 'px';
90+
}
91+
92+
2493

2594
// 这里是画出 toc的逻辑
2695
function init(list) {
@@ -59,7 +128,7 @@ function init(list) {
59128
isGetFisrtLevel = true;
60129

61130
var header_p = document.createElement("li");
62-
header_p.textContent = "Article TOC for GitHub";
131+
header_p.textContent = "GitHub Markdown TOC";
63132
addStyle(header_p, {"listStyle": "none","font-size":"20px","margin-bottom":"10px"});
64133

65134
var gotop_li = document.createElement("li");
@@ -136,12 +205,63 @@ function bindResize(el) {
136205

137206
//移动事件
138207
function mouseMove(e) {
139-
//宇宙超级无敌运算中...
140-
els.width = e.clientX - x + 'px';
141-
els.width = e.clientX + 'px';
142-
console.log("clientX:"+e.clientX);
143-
console.log("x:"+x);
208+
console.log(e);
209+
// document.querySelector('#js-repo-pjax-container').style.paddingLeft = "0px";
210+
// console.log
211+
//宇宙超级无敌运算中...
212+
let w = document.body.clientWidth;
213+
let w2 = e.clientX + 'px';
214+
// haha xiecuole
215+
// els.width = e.clientX - x + 'px';
216+
// 好的你来操作
217+
218+
// if(e.clientX && e.clientX > (w-980)/2 ){
219+
// document.getElementsByTagName('html')[0].style.marginLeft = w2;
220+
// }else{
221+
// document.getElementsByTagName('html')[0].style.marginLeft = '0px';
222+
// }
223+
// console.log(e.clientX);
224+
// if(e.clientX > 100){
225+
226+
// }
227+
// console.log("e.clientX " + e.clientX);
228+
229+
230+
// var readmeWidth = document.getElementById("readme").clientWidth;
231+
// var maxWidth = document.getElementById("readme").clientWidth * 0.8;
232+
var minWidth = 200;
233+
var moveWidth = parseInt(e.clientX);
234+
if(moveWidth < 200){
235+
return;
236+
}
237+
var $header = document.querySelector('.Header');
238+
144239

240+
if(moveWidth > minWidth && e.clientX > containerClient.left){
241+
document.getElementsByTagName('html')[0].style.marginLeft = w2;
242+
$header.style.paddingLeft = 0 + 'px';
243+
// $container.style.marginLeft = '10px';
244+
$container.style.marginLeft = '10px';
245+
$repoheadDetailsContainer.style.marginLeft = '10px';
246+
$jsRepoNav.style.marginLeft = '10px';
247+
}else{
248+
$header.style.paddingLeft = moveWidth + 'px';
249+
document.getElementsByTagName('html')[0].style.marginLeft = 0;
250+
$container.style.marginLeft = 'auto';
251+
$repoheadDetailsContainer.style.marginLeft = 'auto';
252+
$jsRepoNav.style.marginLeft = 'auto';
253+
}
254+
els.width = e.clientX + 'px';
255+
256+
return;
257+
if( moveWidth > minWidth && e.clientX > (w-980)/2 ){
258+
document.getElementsByTagName('html')[0].style.marginLeft = w2;
259+
$header.style.paddingLeft = 0 + 'px';
260+
261+
}
262+
263+
264+
els.width = e.clientX + 'px';
145265
}
146266
//停止事件
147267
function mouseUp() {

‎markdown-toc-code/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"script":["js/background.js"]
2323
},
2424
"browser_action": {
25-
"default_icon": "img/icon.png",
25+
"default_icon": "img/logo.ico", // https://www.easyicon.net/1201150-menu_icon.html
2626
"default_popup": "popup.html"
2727
}
2828
}

0 commit comments

Comments
 (0)