Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit27a23e1

Browse files
authored
Merge pull request#7662 from JBR-0100/fix/deprecated-substr
refactor: replace deprecated String.substr with String.slice
2 parents8be5c4b +a9fb511 commit27a23e1

File tree

57 files changed

+119
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+119
-118
lines changed

‎draftlogs/7662_change.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Replace deprecated`String.substr()` with`String.slice()`[[#7662](https://github.com/plotly/plotly.js/pull/7662)], with thanks to@JBR-0100 for the contribution!

‎src/components/calendars/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function worldCalFmt(fmt, x, calendar) {
143143
// format the cDate according to the translated directive
144144
elsereplacementPart=cDate.formatDate(directiveObj[modifier]);
145145

146-
fmt=fmt.substr(0,i)+replacementPart+fmt.substr(i+directiveLen);
146+
fmt=fmt.slice(0,i)+replacementPart+fmt.slice(i+directiveLen);
147147
i+=replacementPart.length;
148148
}
149149
}

‎src/components/color/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ color.clean = function(container) {
117117
key=keys[i];
118118
val=container[key];
119119

120-
if(key.substr(key.length-5)==='color'){
120+
if(key.slice(-5)==='color'){
121121
// only sanitize keys that end in "color" or "colorscale"
122122

123123
if(Array.isArray(val)){
124124
for(j=0;j<val.length;j++)val[j]=cleanOne(val[j]);
125125
}elsecontainer[key]=cleanOne(val);
126-
}elseif(key.substr(key.length-10)==='colorscale'&&Array.isArray(val)){
126+
}elseif(key.slice(-10)==='colorscale'&&Array.isArray(val)){
127127
// colorscales have the format [[0, color1], [frac, color2], ... [1, colorN]]
128128

129129
for(j=0;j<val.length;j++){
@@ -144,7 +144,7 @@ function cleanOne(val) {
144144
if(isNumeric(val)||typeofval!=='string')returnval;
145145

146146
varvalTrim=val.trim();
147-
if(valTrim.substr(0,3)!=='rgb')returnval;
147+
if(valTrim.slice(0,3)!=='rgb')returnval;
148148

149149
varmatch=valTrim.match(/^rgba?\s*\(([^()]*)\)$/);
150150
if(!match)returnval;

‎src/components/colorbar/draw.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ function drawColorBar(g, opts, gd) {
338338
// wrong class (in case earlier the colorbar was drawn on
339339
// a different side, I think?)
340340
varotherClass=titleClass.charAt(0)==='h' ?
341-
titleClass.substr(1) :
341+
titleClass.slice(1) :
342342
'h'+titleClass;
343343
g.selectAll('.'+otherClass+',.'+otherClass+'-math-group').remove();
344344

‎src/components/rangeslider/defaults.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ module.exports = function handleDefaults(layoutIn, layoutOut, axName) {
4545
if(subplots){
4646
varyIds=subplots.cartesian
4747
.filter(function(subplotId){
48-
returnsubplotId.substr(0,subplotId.indexOf('y'))===axisIds.name2id(axName);
48+
returnsubplotId.slice(0,Math.max(0,subplotId.indexOf('y')))===axisIds.name2id(axName);
4949
})
5050
.map(function(subplotId){
51-
returnsubplotId.substr(subplotId.indexOf('y'),subplotId.length);
51+
returnsubplotId.slice(subplotId.indexOf('y'),subplotId.length);
5252
});
5353
varyNames=Lib.simpleMap(yIds,axisIds.id2name);
5454
for(vari=0;i<yNames.length;i++){

‎src/components/shapes/calc_autorange.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function shapeBounds(ax, shape, paramsToUse) {
115115
drawnParam=paramsToUse[segment.charAt(0)].drawn;
116116
if(drawnParam===undefined)continue;
117117

118-
params=segments[i].substr(1).match(constants.paramRE);
118+
params=segments[i].slice(1).match(constants.paramRE);
119119
if(!params||params.length<drawnParam)continue;
120120

121121
val=convertVal(params[drawnParam]);

‎src/components/shapes/draw.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ function movePath(pathIn, moveX, moveY) {
620620
varyParams=constants.paramIsY[segmentType];
621621
varnParams=constants.numParams[segmentType];
622622

623-
varparamString=segment.substr(1).replace(constants.paramRE,function(param){
623+
varparamString=segment.slice(1).replace(constants.paramRE,function(param){
624624
if(paramNumber>=nParams)returnparam;
625625

626626
if(xParams[paramNumber])param=moveX(param);

‎src/components/shapes/helpers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ exports.extractPathCoords = function(path, paramsToUse, isRaw) {
4141
varrelevantParamIdx=paramsToUse[segment.charAt(0)].drawn;
4242
if(relevantParamIdx===undefined)return;
4343

44-
varparams=segment.substr(1).match(constants.paramRE);
44+
varparams=segment.slice(1).match(constants.paramRE);
4545
if(!params||params.length<relevantParamIdx)return;
4646

4747
varstr=params[relevantParamIdx];
@@ -261,7 +261,7 @@ function convertPath(options, x2p, y2p) {
261261
varyParams=constants.paramIsY[segmentType];
262262
varnParams=constants.numParams[segmentType];
263263

264-
varparamString=segment.substr(1).replace(constants.paramRE,function(param){
264+
varparamString=segment.slice(1).replace(constants.paramRE,function(param){
265265
if(xParams[paramNumber]){
266266
if(xSizemode==='pixel')param=x2p(xAnchor)+Number(param);
267267
elseparam=x2p(param);

‎src/lib/coerce.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ exports.valObjectMeta = {
7676
vark=String(values[i]);
7777

7878
if((k.charAt(0)==='/'&&k.charAt(k.length-1)==='/')){
79-
varregex=newRegExp(k.substr(1,k.length-2));
79+
varregex=newRegExp(k.slice(1,-1));
8080
if(regex.test(v))returntrue;
8181
}elseif(v===values[i])returntrue;
8282
}

‎src/lib/dates.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ exports.dateTime2ms = function(s, calendar) {
166166
// 'G' as a prefix to force the built-in gregorian calendar.
167167
vars0=s.charAt(0);
168168
if(isWorld&&(s0==='G'||s0==='g')){
169-
s=s.substr(1);
169+
s=s.slice(1);
170170
calendar='';
171171
}
172172

173-
varisChinese=isWorld&&calendar.substr(0,7)==='chinese';
173+
varisChinese=isWorld&&calendar.slice(0,7)==='chinese';
174174

175175
varmatch=s.match(isChinese ?DATETIME_REGEXP_CN :DATETIME_REGEXP);
176176
if(!match)returnBADNUM;
@@ -234,7 +234,7 @@ exports.isDateTime = function(s, calendar) {
234234

235235
// pad a number with zeroes, to given # of digits before the decimal point
236236
functionlpad(val,digits){
237-
returnString(val+Math.pow(10,digits)).substr(1);
237+
returnString(val+Math.pow(10,digits)).slice(1);
238238
}
239239

240240
/**
@@ -272,7 +272,7 @@ exports.ms2DateTime = function(ms, r, calendar) {
272272
// other things for a few calendars, so we can't trust it. Just pad
273273
// it manually (after the '-' if there is one)
274274
if(dateStr.charAt(0)==='-'){
275-
while(dateStr.length<11)dateStr='-0'+dateStr.substr(1);
275+
while(dateStr.length<11)dateStr='-0'+dateStr.slice(1);
276276
}else{
277277
while(dateStr.length<10)dateStr='0'+dateStr;
278278
}
@@ -388,7 +388,7 @@ function modDateFormat(fmt, x, formatter, calendar) {
388388
vardigits=Math.min(+(match.charAt(1))||6,6);
389389
varfracSecs=((x/1000%1)+2)
390390
.toFixed(digits)
391-
.substr(2).replace(/0+$/,'')||'0';
391+
.slice(2).replace(/0+$/,'')||'0';
392392
returnfracSecs;
393393
});
394394

@@ -441,7 +441,7 @@ function formatTime(x, tr) {
441441
*/
442442
varsec=Math.min(mod(x/ONESEC,60),MAXSECONDS[tr]);
443443

444-
varsecStr=(100+sec).toFixed(tr).substr(1);
444+
varsecStr=(100+sec).toFixed(tr).slice(1);
445445
if(tr>0){
446446
secStr=secStr.replace(/0+$/,'').replace(/[\.]$/,'');
447447
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp