Skip to content

Commit 85af1e1

Browse files
author
shengyonggen
committed
优化不写协议的问题
1 parent f1cae9a commit 85af1e1

File tree

9 files changed

+49
-28
lines changed

9 files changed

+49
-28
lines changed

‎heatmap.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sa-sdk-javascript",
3-
"version": "1.10.1",
3+
"version": "1.10.3",
44
"description": "official sensorsdata javascript sdk",
55
"main": "sensorsdata.min.js",
66
"scripts": {
@@ -20,5 +20,8 @@
2020
"bugs": {
2121
"url": "https://github.com/sensorsdata/sa-sdk-javascript/issues"
2222
},
23-
"homepage": "https://github.com/sensorsdata/sa-sdk-javascript#readme"
23+
"homepage": "https://github.com/sensorsdata/sa-sdk-javascript#readme",
24+
"dependencies": {
25+
"gulp": "^3.9.1"
26+
}
2427
}

‎sensorsdata.amd.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sensorsdata.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/sdk.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3140,7 +3140,7 @@ saEvent.send = function(p, callback) {
31403140
_distinct_id: store.getDistinctId()
31413141
}
31423142

3143-
return _.extend({}, _.info.properties(),sa.store.getProps(),getUtm(),obj);
3143+
return _.extend({}, _.info.properties(),sd.store.getProps(),getUtm(),obj);
31443144
};
31453145

31463146
var heatmap = {
@@ -3159,13 +3159,11 @@ saEvent.send = function(p, callback) {
31593159
return -1;
31603160
},
31613161
selector:function (el){
3162-
//var classname = _.trim(el.className.baseVal ? el.className.baseVal : el.className);
31633162
var i = el.parentNode && 9 == el.parentNode.nodeType ? -1 : this.getDomIndex(el);
31643163
if(el.id){
31653164
return '#' + el.id;
31663165
}else{
3167-
return el.tagName.toLowerCase() //+ (classname ? classname.replace(/^| +/g, '.') : '')
3168-
+ (~i ? ':nth-child(' + (i + 1) + ')' : '');
3166+
return el.tagName.toLowerCase() + (~i ? ':nth-child(' + (i + 1) + ')' : '');
31693167
}
31703168
},
31713169
getDomSelector : function(el,arr) {
@@ -3385,7 +3383,7 @@ saEvent.send = function(p, callback) {
33853383
return false;
33863384
}
33873385

3388-
parent_ele = target.parentNode;
3386+
var parent_ele = target.parentNode;
33893387

33903388
if(tagName === 'a' || tagName === 'button' || tagName === 'input' || tagName === 'textarea'){
33913389
that.start(ev, target, tagName);

‎src/sensorsdata.full.amd.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ sd.initPara = function(para){
9494
sd.para[i] = sd.para_default[i];
9595
}
9696
}
97+
// 修复没有配置协议的问题，自动取当前页面的协议
98+
if(typeof sd.para.server_url === 'string' && sd.para.server_url.slice(0,3) === '://'){
99+
sd.para.server_url = location.protocol + sd.para.server_url;
100+
}
101+
if(typeof sd.para.web_url === 'string' && sd.para.web_url.slice(0,3) === '://'){
102+
sd.para.web_url = location.protocol + sd.para.web_url;
103+
}
104+
97105
if(sd.para.send_type !== 'image' && sd.para.send_type !== 'ajax' && sd.para.send_type !== 'beacon'){
98106
sd.para.send_type = 'image';
99107
}
@@ -145,7 +153,7 @@ var ObjProto = Object.prototype;
145153
var slice = ArrayProto.slice;
146154
var toString = ObjProto.toString;
147155
var hasOwnProperty = ObjProto.hasOwnProperty;
148-
var LIB_VERSION = '1.10.2';
156+
var LIB_VERSION = '1.10.4';
149157

150158
sd.lib_version = LIB_VERSION;
151159

@@ -3275,7 +3283,7 @@ saEvent.send = function(p, callback) {
32753283
_distinct_id: store.getDistinctId()
32763284
}
32773285

3278-
return _.extend({}, _.info.properties(),sa.store.getProps(),getUtm(),obj);
3286+
return _.extend({}, _.info.properties(),sd.store.getProps(),getUtm(),obj);
32793287
};
32803288

32813289
var heatmap = {
@@ -3294,13 +3302,11 @@ saEvent.send = function(p, callback) {
32943302
return -1;
32953303
},
32963304
selector:function (el){
3297-
//var classname = _.trim(el.className.baseVal ? el.className.baseVal : el.className);
32983305
var i = el.parentNode && 9 == el.parentNode.nodeType ? -1 : this.getDomIndex(el);
32993306
if(el.id){
33003307
return '#' + el.id;
33013308
}else{
3302-
return el.tagName.toLowerCase() //+ (classname ? classname.replace(/^| +/g, '.') : '')
3303-
+ (~i ? ':nth-child(' + (i + 1) + ')' : '');
3309+
return el.tagName.toLowerCase() + (~i ? ':nth-child(' + (i + 1) + ')' : '');
33043310
}
33053311
},
33063312
getDomSelector : function(el,arr) {
@@ -3520,7 +3526,7 @@ saEvent.send = function(p, callback) {
35203526
return false;
35213527
}
35223528

3523-
parent_ele = target.parentNode;
3529+
var parent_ele = target.parentNode;
35243530

35253531
if(tagName === 'a' || tagName === 'button' || tagName === 'input' || tagName === 'textarea'){
35263532
that.start(ev, target, tagName);

‎src/sensorsdata.full.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,14 @@ sd.initPara = function(para){
9191
sd.para[i] = sd.para_default[i];
9292
}
9393
}
94+
// 修复没有配置协议的问题，自动取当前页面的协议
95+
if(typeof sd.para.server_url === 'string' && sd.para.server_url.slice(0,3) === '://'){
96+
sd.para.server_url = location.protocol + sd.para.server_url;
97+
}
98+
if(typeof sd.para.web_url === 'string' && sd.para.web_url.slice(0,3) === '://'){
99+
sd.para.web_url = location.protocol + sd.para.web_url;
100+
}
101+
94102
if(sd.para.send_type !== 'image' && sd.para.send_type !== 'ajax' && sd.para.send_type !== 'beacon'){
95103
sd.para.send_type = 'image';
96104
}
@@ -142,7 +150,7 @@ var ObjProto = Object.prototype;
142150
var slice = ArrayProto.slice;
143151
var toString = ObjProto.toString;
144152
var hasOwnProperty = ObjProto.hasOwnProperty;
145-
var LIB_VERSION = '1.10.2';
153+
var LIB_VERSION = '1.10.4';
146154

147155
sd.lib_version = LIB_VERSION;
148156

@@ -3272,7 +3280,7 @@ saEvent.send = function(p, callback) {
32723280
_distinct_id: store.getDistinctId()
32733281
}
32743282

3275-
return _.extend({}, _.info.properties(),sa.store.getProps(),getUtm(),obj);
3283+
return _.extend({}, _.info.properties(),sd.store.getProps(),getUtm(),obj);
32763284
};
32773285

32783286
var heatmap = {
@@ -3291,13 +3299,11 @@ saEvent.send = function(p, callback) {
32913299
return -1;
32923300
},
32933301
selector:function (el){
3294-
//var classname = _.trim(el.className.baseVal ? el.className.baseVal : el.className);
32953302
var i = el.parentNode && 9 == el.parentNode.nodeType ? -1 : this.getDomIndex(el);
32963303
if(el.id){
32973304
return '#' + el.id;
32983305
}else{
3299-
return el.tagName.toLowerCase() //+ (classname ? classname.replace(/^| +/g, '.') : '')
3300-
+ (~i ? ':nth-child(' + (i + 1) + ')' : '');
3306+
return el.tagName.toLowerCase() + (~i ? ':nth-child(' + (i + 1) + ')' : '');
33013307
}
33023308
},
33033309
getDomSelector : function(el,arr) {
@@ -3517,7 +3523,7 @@ saEvent.send = function(p, callback) {
35173523
return false;
35183524
}
35193525

3520-
parent_ele = target.parentNode;
3526+
var parent_ele = target.parentNode;
35213527

35223528
if(tagName === 'a' || tagName === 'button' || tagName === 'input' || tagName === 'textarea'){
35233529
that.start(ev, target, tagName);

‎src/sensorsdata.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ sd.initPara = function(para){
9999
sd.para[i] = sd.para_default[i];
100100
}
101101
}
102+
// 修复没有配置协议的问题，自动取当前页面的协议
103+
if(typeof sd.para.server_url === 'string' && sd.para.server_url.slice(0,3) === '://'){
104+
sd.para.server_url = location.protocol + sd.para.server_url;
105+
}
106+
if(typeof sd.para.web_url === 'string' && sd.para.web_url.slice(0,3) === '://'){
107+
sd.para.web_url = location.protocol + sd.para.web_url;
108+
}
109+
102110
if(sd.para.send_type !== 'image' && sd.para.send_type !== 'ajax' && sd.para.send_type !== 'beacon'){
103111
sd.para.send_type = 'image';
104112
}

‎version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
var sensorsdata_js_sdk_latest_version = '1.10.2';
1+
var sensorsdata_js_sdk_latest_version = '1.10.4';

0 commit comments

Comments
 (0)