Skip to content

Commit ebb8987

Browse files
brampbramp
committed
Fix some lodash incompatibilities. Fixes bramp#158 
1 parent 64e78ef commit ebb8987

File tree

4 files changed

+38
-34
lines changed

4 files changed

+38
-34
lines changed

‎dist/sequence-diagram.js‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ function clamp(x, min, max) {
893893
}
894894

895895
function wobble(x1, y1, x2, y2) {
896-
assert(_.all([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
896+
assert(_.every([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
897897

898898
// Wobble no more than 1/25 of the line length
899899
var factor = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)) / 25;
@@ -925,7 +925,7 @@ function wobble(x1, y1, x2, y2) {
925925
* Draws a wobbly (hand drawn) rect
926926
*/
927927
function handRect(x, y, w, h) {
928-
assert(_.all([x, y, w, h], _.isFinite), 'x, y, w, h must be numeric');
928+
assert(_.every([x, y, w, h], _.isFinite), 'x, y, w, h must be numeric');
929929
return 'M' + x + ',' + y +
930930
wobble(x, y, x + w, y) +
931931
wobble(x + w, y, x + w, y + h) +
@@ -937,7 +937,7 @@ function handRect(x, y, w, h) {
937937
* Draws a wobbly (hand drawn) line
938938
*/
939939
function handLine(x1, y1, x2, y2) {
940-
assert(_.all([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
940+
assert(_.every([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
941941
return 'M' + x1.toFixed(1) + ',' + y1.toFixed(1) + wobble(x1, y1, x2, y2);
942942
}
943943

@@ -1001,7 +1001,7 @@ _.extend(BaseTheme.prototype, {
10011001
diagram.height += title.height;
10021002
}
10031003

1004-
_.each(actors, function(a) {
1004+
_.each(actors, _.bind(function(a) {
10051005
var bb = this.textBBox(a.name, font);
10061006
a.textBB = bb;
10071007

@@ -1012,7 +1012,7 @@ _.extend(BaseTheme.prototype, {
10121012
a.distances = [];
10131013
a.paddingRight = 0;
10141014
this.actorsHeight_ = Math.max(a.height, this.actorsHeight_);
1015-
}, this);
1015+
}, this));
10161016

10171017
function actorEnsureDistance(a, b, d) {
10181018
assert(a < b, 'a must be less than or equal to b');
@@ -1031,14 +1031,13 @@ _.extend(BaseTheme.prototype, {
10311031
}
10321032
}
10331033

1034-
_.each(signals, function(s) {
1034+
_.each(signals, _.bind(function(s) {
10351035
// Indexes of the left and right actors involved
10361036
var a;
10371037
var b;
10381038

10391039
var bb = this.textBBox(s.message, font);
10401040

1041-
//var bb = t.attr("text", s.message).getBBox();
10421041
s.textBB = bb;
10431042
s.width = bb.width;
10441043
s.height = bb.height;
@@ -1096,7 +1095,7 @@ _.extend(BaseTheme.prototype, {
10961095

10971096
actorEnsureDistance(a, b, s.width + extraWidth);
10981097
this.signalsHeight_ += s.height;
1099-
}, this);
1098+
}, this));
11001099

11011100
// Re-jig the positions
11021101
var actorsX = 0;
@@ -1117,7 +1116,7 @@ _.extend(BaseTheme.prototype, {
11171116
});
11181117

11191118
actorsX = a.x + a.width + a.paddingRight;
1120-
}, this);
1119+
});
11211120

11221121
diagram.width = Math.max(actorsX, diagram.width);
11231122

@@ -1141,7 +1140,7 @@ _.extend(BaseTheme.prototype, {
11411140

11421141
drawActors: function(offsetY) {
11431142
var y = offsetY;
1144-
_.each(this.diagram.actors, function(a) {
1143+
_.each(this.diagram.actors, _.bind(function(a) {
11451144
// Top box
11461145
this.drawActor(a, y, this.actorsHeight_);
11471146

@@ -1153,7 +1152,7 @@ _.extend(BaseTheme.prototype, {
11531152
this.drawLine(
11541153
aX, y + this.actorsHeight_ - ACTOR_MARGIN,
11551154
aX, y + this.actorsHeight_ + ACTOR_MARGIN + this.signalsHeight_);
1156-
}, this);
1155+
}, this));
11571156
},
11581157

11591158
drawActor: function(actor, offsetY, height) {
@@ -1164,7 +1163,7 @@ _.extend(BaseTheme.prototype, {
11641163

11651164
drawSignals: function(offsetY) {
11661165
var y = offsetY;
1167-
_.each(this.diagram.signals, function(s) {
1166+
_.each(this.diagram.signals, _.bind(function(s) {
11681167
// TODO Add debug mode, that draws padding/margin box
11691168
if (s.type == 'Signal') {
11701169
if (s.isSelf()) {
@@ -1178,7 +1177,7 @@ _.extend(BaseTheme.prototype, {
11781177
}
11791178

11801179
y += s.height;
1181-
}, this);
1180+
}, this));
11821181
},
11831182

11841183
drawSelfSignal: function(signal, offsetY) {
@@ -1433,7 +1432,9 @@ if (typeof Snap != 'undefined') {
14331432
},
14341433

14351434
createText: function(text, font) {
1436-
text = _.invoke(text.split('\n'), 'trim');
1435+
text = text.split('\n').map(function(x) {
1436+
return x.trim();
1437+
});
14371438
var t = this.paper_.text(0, 0, text);
14381439
t.attr(font || {});
14391440
if (text.length > 1) {
@@ -1581,7 +1582,7 @@ if (typeof Raphael != 'undefined') {
15811582
* Raphaël extras
15821583
******************/
15831584
Raphael.fn.line = function(x1, y1, x2, y2) {
1584-
assert(_.all([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
1585+
assert(_.every([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
15851586
return this.path('M{0},{1} L{2},{3}', x1, y1, x2, y2);
15861587
};
15871588

@@ -1640,8 +1641,9 @@ if (typeof Raphael != 'undefined') {
16401641
* Strip whitespace from each newline
16411642
*/
16421643
cleanText: function(text) {
1643-
text = _.invoke(text.split('\n'), 'trim');
1644-
return text.join('\n');
1644+
return text.split('\n').map(function(x) {
1645+
return x.trim();
1646+
}).join('\n');
16451647
},
16461648

16471649
/**

‎src/theme-raphael.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (typeof Raphael != 'undefined') {
2323
* Raphaël extras
2424
******************/
2525
Raphael.fn.line = function(x1, y1, x2, y2) {
26-
assert(_.all([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
26+
assert(_.every([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
2727
return this.path('M{0},{1} L{2},{3}', x1, y1, x2, y2);
2828
};
2929

@@ -82,8 +82,9 @@ if (typeof Raphael != 'undefined') {
8282
* Strip whitespace from each newline
8383
*/
8484
cleanText: function(text) {
85-
text = _.invoke(text.split('\n'), 'trim');
86-
return text.join('\n');
85+
return text.split('\n').map(function(x) {
86+
return x.trim();
87+
}).join('\n');
8788
},
8889

8990
/**

‎src/theme-snap.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ if (typeof Snap != 'undefined') {
162162
},
163163

164164
createText: function(text, font) {
165-
text = _.invoke(text.split('\n'), 'trim');
165+
text = text.split('\n').map(function(x) {
166+
return x.trim();
167+
});
166168
var t = this.paper_.text(0, 0, text);
167169
t.attr(font || {});
168170
if (text.length > 1) {

‎src/theme.js‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function clamp(x, min, max) {
9090
}
9191

9292
function wobble(x1, y1, x2, y2) {
93-
assert(_.all([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
93+
assert(_.every([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
9494

9595
// Wobble no more than 1/25 of the line length
9696
var factor = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)) / 25;
@@ -122,7 +122,7 @@ function wobble(x1, y1, x2, y2) {
122122
* Draws a wobbly (hand drawn) rect
123123
*/
124124
function handRect(x, y, w, h) {
125-
assert(_.all([x, y, w, h], _.isFinite), 'x, y, w, h must be numeric');
125+
assert(_.every([x, y, w, h], _.isFinite), 'x, y, w, h must be numeric');
126126
return 'M' + x + ',' + y +
127127
wobble(x, y, x + w, y) +
128128
wobble(x + w, y, x + w, y + h) +
@@ -134,7 +134,7 @@ function handRect(x, y, w, h) {
134134
* Draws a wobbly (hand drawn) line
135135
*/
136136
function handLine(x1, y1, x2, y2) {
137-
assert(_.all([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
137+
assert(_.every([x1,x2,y1,y2], _.isFinite), 'x1,x2,y1,y2 must be numeric');
138138
return 'M' + x1.toFixed(1) + ',' + y1.toFixed(1) + wobble(x1, y1, x2, y2);
139139
}
140140

@@ -198,7 +198,7 @@ _.extend(BaseTheme.prototype, {
198198
diagram.height += title.height;
199199
}
200200

201-
_.each(actors, function(a) {
201+
_.each(actors, _.bind(function(a) {
202202
var bb = this.textBBox(a.name, font);
203203
a.textBB = bb;
204204

@@ -209,7 +209,7 @@ _.extend(BaseTheme.prototype, {
209209
a.distances = [];
210210
a.paddingRight = 0;
211211
this.actorsHeight_ = Math.max(a.height, this.actorsHeight_);
212-
}, this);
212+
}, this));
213213

214214
function actorEnsureDistance(a, b, d) {
215215
assert(a < b, 'a must be less than or equal to b');
@@ -228,14 +228,13 @@ _.extend(BaseTheme.prototype, {
228228
}
229229
}
230230

231-
_.each(signals, function(s) {
231+
_.each(signals, _.bind(function(s) {
232232
// Indexes of the left and right actors involved
233233
var a;
234234
var b;
235235

236236
var bb = this.textBBox(s.message, font);
237237

238-
//var bb = t.attr("text", s.message).getBBox();
239238
s.textBB = bb;
240239
s.width = bb.width;
241240
s.height = bb.height;
@@ -293,7 +292,7 @@ _.extend(BaseTheme.prototype, {
293292

294293
actorEnsureDistance(a, b, s.width + extraWidth);
295294
this.signalsHeight_ += s.height;
296-
}, this);
295+
}, this));
297296

298297
// Re-jig the positions
299298
var actorsX = 0;
@@ -314,7 +313,7 @@ _.extend(BaseTheme.prototype, {
314313
});
315314

316315
actorsX = a.x + a.width + a.paddingRight;
317-
}, this);
316+
});
318317

319318
diagram.width = Math.max(actorsX, diagram.width);
320319

@@ -338,7 +337,7 @@ _.extend(BaseTheme.prototype, {
338337

339338
drawActors: function(offsetY) {
340339
var y = offsetY;
341-
_.each(this.diagram.actors, function(a) {
340+
_.each(this.diagram.actors, _.bind(function(a) {
342341
// Top box
343342
this.drawActor(a, y, this.actorsHeight_);
344343

@@ -350,7 +349,7 @@ _.extend(BaseTheme.prototype, {
350349
this.drawLine(
351350
aX, y + this.actorsHeight_ - ACTOR_MARGIN,
352351
aX, y + this.actorsHeight_ + ACTOR_MARGIN + this.signalsHeight_);
353-
}, this);
352+
}, this));
354353
},
355354

356355
drawActor: function(actor, offsetY, height) {
@@ -361,7 +360,7 @@ _.extend(BaseTheme.prototype, {
361360

362361
drawSignals: function(offsetY) {
363362
var y = offsetY;
364-
_.each(this.diagram.signals, function(s) {
363+
_.each(this.diagram.signals, _.bind(function(s) {
365364
// TODO Add debug mode, that draws padding/margin box
366365
if (s.type == 'Signal') {
367366
if (s.isSelf()) {
@@ -375,7 +374,7 @@ _.extend(BaseTheme.prototype, {
375374
}
376375

377376
y += s.height;
378-
}, this);
377+
}, this));
379378
},
380379

381380
drawSelfSignal: function(signal, offsetY) {

0 commit comments

Comments
 (0)