Skip to content

Commit aecb192

Browse files
csxiaoyaojianxiancsxiaoyaojianxian
committed
update
1 parent 0cc749a commit aecb192

File tree

24 files changed

+74
-55
lines changed

24 files changed

+74
-55
lines changed

‎01-JS语言基础/02-常用操作/03-2-Object区别Array.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,25 @@
2828
var obj = Object.assign(o1, o2, o3);
2929
console.log(obj); // { a: 1, b: 2, c: 3 }
3030
console.log(o1); // { a: 1, b: 2, c: 3 }, 第一个目标对象自身也会改变
31+
// ! Object.assign() 只能实现对一维对象的深拷贝
32+
var obj1 = {x: 1, y: 2}, obj2 = Object.assign({}, obj1);
33+
console.log(obj1) // {x: 1, y: 2}
34+
console.log(obj2) // {x: 1, y: 2}
35+
obj2.x = 2;
36+
console.log(obj1) // {x: 1, y: 2}
37+
console.log(obj2) // {x: 2, y: 2}
38+
var obj1 = {
39+
x: 1,
40+
y: {
41+
m: 1
42+
}
43+
};
44+
var obj2 = Object.assign({}, obj1);
45+
console.log(obj1) // {x: 1, y: {m: 1}}
46+
console.log(obj2) // {x: 1, y: {m: 1}}
47+
obj2.y.m = 2;
48+
console.log(obj1) // {x: 1, y: {m: 2}}
49+
console.log(obj2) // {x: 2, y: {m: 2}}
3150

3251
// 方法3：遍历赋值法
3352
var extend=function(o,n){

‎02-前端拾零/01-checkbox&radio&select.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h3>select</h3>
3232
<select class="select" value="1">
3333
<option value="csxiaoyao">csxiaoyao</option>
3434
<option value="sunshine">sunshine</option>
35-
<option value="victorsun">victorsun</option>
35+
<option value="csxiaoyao">csxiaoyao</option>
3636
</select>
3737
<br>
3838
<button id="btn7">设置选中</button>

‎06-常用功能/03-强制竖屏/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212

1313
<div class="page-content" style="transform-origin: center center 0px; transform: scale(1.3);">
14-
victorsun
14+
csxiaoyao
1515
</div>
1616

1717

1818
<script src="zepto.min.js"></script>
1919
<script>
20-
// ÊÊÓ¦ºáÊúÆÁ
20+
// 适应横竖屏
2121
function checkDirect() {
2222
var a = document.documentElement.clientHeight,
2323
s = document.documentElement.clientWidth;
@@ -71,7 +71,7 @@
7171
});
7272
};
7373

74-
//Ç¿ÖÆÊúÆÁcontain
74+
//强制竖屏contain
7575
//a>s?e_cover(".page-content",'center center'): eH_cover(".page-content",'center center');
7676

7777
a > s ? e(".page-content", 'center center') : eH(".page-content", 'center center');

‎06-常用功能/browserType.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* @Author: victorsun
2+
* @Author: csxiaoyao
33
* @Date: 2017-09-14 14:32:07
4-
* @Last Modified by: victorsun
4+
* @Last Modified by: csxiaoyao
55
* @Last Modified time: 2017-09-14 16:36:02
66
*/
77

‎06-常用功能/characterFilter.js‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
/*
2-
* @Author: victorsun
2+
* @Author: csxiaoyao
33
* @Date: 2017-09-07 14:12:02
4-
* @Last Modified by: victorsun
4+
* @Last Modified by: csxiaoyao
55
* @Last Modified time: 2017-09-09 14:12:02
66
*/
77

88

99
/*
10-
url转向验证
11-
描述：对通过javascript语句载入（或转向）的页面进行验证，防止转到第三方网页和跨站脚本攻击
12-
返回值：true -- 合法；false -- 非法
13-
例：
14-
合法的值
10+
url转向验证
11+
描述：对通过javascript语句载入（或转向）的页面进行验证，防止转到第三方网页和跨站脚本攻击
12+
返回值：true -- 合法；false -- 非法
13+
例：
14+
合法的值
1515
http://xxx.csxiaoyao.com/hi/redirect.html?url=http://www.csxiaoyao.com
1616
http://xxx.csxiaoyao.com/hi/redirect.html?url=a.html
1717
http://xxx.csxiaoyao.com/hi/redirect.html?url=/a/1.html
18-
非法的值
18+
非法的值
1919
http://xxx.csxiaoyao.com/hi/redirect.html?url=http://www.baidu.com
2020
http://xxx.csxiaoyao.com/hi/redirect.html?url=javascript:codehere
2121
http://xxx.csxiaoyao.com/hi/redirect.html?url=//www.csxiaoyao.com
@@ -25,7 +25,7 @@ function VaildURL(sUrl)
2525
return (/^(https?:\/\/)?[\w\-.]+\.(csxiaoyao|sunshinestudio)\.(com|cn)($|\/|\\)/i).test(sUrl)||(/^[\w][\w\/\.\-_%]+$/i).test(sUrl)||(/^[\/\\][^\/\\]/i).test(sUrl) ? true : false;
2626
}
2727

28-
//html正文编码：对需要出现在HTML正文里(除了HTML属性外)的不信任输入进行编码
28+
//html正文编码：对需要出现在HTML正文里(除了HTML属性外)的不信任输入进行编码
2929
function HtmlEncode(sStr)
3030
{
3131
sStr = sStr.replace(/&/g,"&amp;");
@@ -36,7 +36,7 @@ function HtmlEncode(sStr)
3636
return sStr;
3737
}
3838

39-
//html正文解码：对HtmlEncode函数的结果进行解码
39+
//html正文解码：对HtmlEncode函数的结果进行解码
4040
function HtmlUnEncode(sStr)
4141
{
4242
sStr = sStr.replace(/&amp;/g,"&");
@@ -48,11 +48,11 @@ function HtmlUnEncode(sStr)
4848
}
4949

5050
/*
51-
html属性编码：对需要出现在HTML属性里的不信任输入进行编码
52-
注意:
53-
(1)该函数不适用于属性为一个URL地址的编码.这些标记包括:a/img/frame/iframe/script/xml/embed/object...
54-
属性包括:href/src/lowsrc/dynsrc/background/...
55-
(2)该函数不适用于属性名为 style="[Un-trusted input]" 的编码
51+
html属性编码：对需要出现在HTML属性里的不信任输入进行编码
52+
注意:
53+
(1)该函数不适用于属性为一个URL地址的编码.这些标记包括:a/img/frame/iframe/script/xml/embed/object...
54+
属性包括:href/src/lowsrc/dynsrc/background/...
55+
(2)该函数不适用于属性名为 style="[Un-trusted input]" 的编码
5656
*/
5757
function HtmlAttributeEncode(sStr)
5858
{
@@ -68,11 +68,11 @@ function HtmlAttributeEncode(sStr)
6868

6969

7070
/*
71-
对需要出现在一个URI的一部分的不信任输入进行编码
72-
例如:
71+
对需要出现在一个URI的一部分的不信任输入进行编码
72+
例如:
7373
<a href="http://search.msn.com/results.aspx?q1=[Un-trusted-input]& q2=[Un-trusted-input]">Click Here!</a>
74-
以下字符将会被编码:
75-
除[a-zA-Z0-9.-_]以外的字符都会被替换成URL编码
74+
以下字符将会被编码:
75+
除[a-zA-Z0-9.-_]以外的字符都会被替换成URL编码
7676
*/
7777
function UriComponentEncode(sStr)
7878
{
@@ -89,21 +89,21 @@ function UriComponentEncode(sStr)
8989
}
9090

9191

92-
//用做过滤HTML标签里面的 比如这个例子里的<input value="XXXX"> XXXX就是要过滤的
92+
//用做过滤HTML标签里面的 比如这个例子里的<input value="XXXX"> XXXX就是要过滤的
9393
String.prototype.escHtmlEp = function() { return this.replace(/[&'"<>\/\\\-\x00-\x1f\x80-\xff]/g, function(r){ return "&#"+r.charCodeAt(0)+";" }); };
9494

95-
//用做过滤直接放到HTML里的
95+
//用做过滤直接放到HTML里的
9696
String.prototype.escHtml = function() { return this.replace(/[&'"<>\/\\\-\x00-\x09\x0b-\x0c\x1f\x80-\xff]/g, function(r){ return "&#"+r.charCodeAt(0)+";" }).replace(/\r\n/g, "<BR>").replace(/\n/g, "<BR>").replace(/\r/g, "<BR>").replace(/ /g, "&nbsp;"); };
9797

98-
//用做过滤直接放到HTML里js中的
98+
//用做过滤直接放到HTML里js中的
9999
String.prototype.escScript = function() { return this.replace(/[\\"']/g, function(r){ return "\\"+r; }).replace(/%/g, "\\x25").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\x01/g, "\\x01"); };
100100

101-
//用做过滤直接URL参数里的 比如 http://show8.qq.com/abc_cgi?a=XXX XXX就是要过滤的
101+
//用做过滤直接URL参数里的 比如 http://show8.qq.com/abc_cgi?a=XXX XXX就是要过滤的
102102
String.prototype.escUrl = function() { return escape(this).replace(/\+/g, "%2B"); };
103103

104-
//用做过滤直接放到<a href="javascript:XXXX">中的
104+
//用做过滤直接放到<a href="javascript:XXXX">中的
105105
String.prototype.escHrefScript = function() { return this.escScript().escMiniUrl().escHtmlEp(); };
106106

107-
//用做过滤直接放到正则表达式中的
107+
//用做过滤直接放到正则表达式中的
108108
String.prototype.escRegexp = function() { return this.replace(/[\\\^\$\*\+\?\{\}\.\(\)\[\]]/g, function(a,b){ return "\\"+a; }); };
109109

‎09-模块化/01-模块化规范/01-Javascript模块的基本写法.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<script>
1010
/*
11-
* @Author: victorsun
11+
* @Author: csxiaoyao
1212
* @Date: 2017-08-24 14:12:02
13-
* @Last Modified by: victorsun
13+
* @Last Modified by: csxiaoyao
1414
* @Last Modified time: 2017-08-24 14:33:08
1515
*/
1616

‎09-模块化/01-模块化规范/02-规范化使用模块.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<script>
1010
/*
11-
* @Author: victorsun
11+
* @Author: csxiaoyao
1212
* @Date: 2017-08-24 14:34:31
1313
* @Last Modified by: csxiaoyao
1414
* @Last Modified time: 2018-04-15 14:25:56

‎09-模块化/01-模块化规范/js/main.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* @Author: victorsun
2+
* @Author: csxiaoyao
33
* @Date: 2017-08-24 15:00:22
4-
* @Last Modified by: victorsun
4+
* @Last Modified by: csxiaoyao
55
* @Last Modified time: 2017-08-24 15:59:38
66
*/
77
// main.js

‎10-websocket/node/server.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* @Author: victorsun
2+
* @Author: csxiaoyao
33
* @Date: 2017-08-24 21:19:43
4-
* @Last Modified by: victorsun
4+
* @Last Modified by: csxiaoyao
55
* @Last Modified time: 2017-08-25 15:59:31
66
*/
77

‎10-websocket/ws聊天室/css/chatroom.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* @Author: victorsun
2+
* @Author: csxiaoyao
33
* @Date: 2017-07-07 09:45:45
4-
* @Last Modified by: victorsun
4+
* @Last Modified by: csxiaoyao
55
* @Last Modified time: 2017-07-07 09:46:05
66
*/
77
body,p{margin:0px; padding:0px; font-size:14px; color:#333; font-family:Arial, Helvetica, sans-serif;}

0 commit comments

Comments
 (0)