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

Commit 69c6b9d

Browse files
Resolve conflicts
2 parents b416f14 + 5c64886 commit 69c6b9d

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"prettier": "1.17.0",
7373
"react-test-renderer": "16.8.6",
7474
"redux-mock-store": "1.5.3",
75-
"storybook-addon-styled-component-theme": "1.2.1",
75+
"storybook-addon-styled-component-theme": "1.2.3",
7676
"surge": "0.20.4",
7777
"wait-on": "3.2.0",
7878
"webpack": "4.30.0",

‎src/static/patterns/behavioral_observer.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ var fees = {
4040
}
4141
};
4242
43-
var proft = {
43+
var profit = {
4444
update: function(product) {
4545
product.price = product.price * 2;
4646
}
4747
};
4848
49-
module.exports = [Product, fees, proft];`,
49+
module.exports = [Product, fees, profit];`,
5050
codeES6: `class Product {
5151
constructor() {
5252
this.price = 0;
@@ -83,13 +83,13 @@ class fees {
8383
}
8484
}
8585
86-
class proft {
86+
class profit {
8787
update(product) {
8888
product.price = product.price * 2;
8989
}
9090
}
9191
92-
export { Product, fees, proft };`
92+
export { Product, fees, profit };`
9393
};
9494

9595
export default OBSERVER;

‎src/static/patterns/behavioral_template.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const TEMPLATE = {
77
Template Method lets subclasses redefine certain steps of an algorithm without changing the algorithm's structure.`,
88
when: `you have to define steps of the algorithm once and let subclasses to implement its behaviour`,
99
codeES5: `function Tax() {}
10-
1110
Tax.prototype.calc = function(value) {
1211
if (value >= 1000) value = this.overThousand(value);
1312
@@ -19,16 +18,16 @@ Tax.prototype.complementaryFee = function(value) {
1918
};
2019
2120
function Tax1() {}
22-
Tax1.prototype = Object.create(Tax.prototype);
21+
Tax1.prototype = Object.create(Tax.prototype);
2322
24-
Tax1.prototype.overThousand = function(value) {
23+
Tax1.prototype.overThousand = function(value) {
2524
return value * 1.1;
2625
};
2726
2827
function Tax2() {}
29-
Tax2.prototype = Object.create(Tax.prototype);
28+
Tax2.prototype = Object.create(Tax.prototype);
3029
31-
Tax2.prototype.overThousand = function(value) {
30+
Tax2.prototype.overThousand = function(value) {
3231
return value * 1.2;
3332
};
3433

‎src/static/patterns/creational_abstractFactory.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ function pilotDroidPattern() {
2020
}
2121
2222
function B1() {}
23-
B1.prototype.info = function() {
23+
B1.prototype.info = function() {
2424
return 'B1, Battle Droid';
2525
};
2626
2727
function Rx24() {}
28-
Rx24.prototype.info = function() {
28+
Rx24.prototype.info = function() {
2929
return 'Rx24, Pilot Droid';
3030
};
3131

‎src/static/patterns/structural_flyweight.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = colorCreator;`,
2929
}
3030
3131
class colorCreator {
32-
constructor(name) {
32+
constructor() {
3333
this.colors = {};
3434
}
3535

‎yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11323,10 +11323,10 @@ stealthy-require@^1.1.1:
1132311323
resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
1132411324
integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
1132511325

11326-
storybook-addon-styled-component-theme@1.2.1:
11327-
version "1.2.1"
11328-
resolved "https://registry.yarnpkg.com/storybook-addon-styled-component-theme/-/storybook-addon-styled-component-theme-1.2.1.tgz#f21ae416db31b40882cb9c29e4b6240cbb2e3b63"
11329-
integrity sha512-oL3UlKG9fWwZ8AS+bPWp3u4ubeNnygTwojmnZLbZpSA55+PEhadS/X3Fgcuf2/rCIq907KFVAu49mjLMRp26Rg==
11326+
storybook-addon-styled-component-theme@1.2.3:
11327+
version "1.2.3"
11328+
resolved "https://registry.yarnpkg.com/storybook-addon-styled-component-theme/-/storybook-addon-styled-component-theme-1.2.3.tgz#c99625642e07fc7e4965f73c695791b3d81ed969"
11329+
integrity sha512-/XrG8VFBpYjyydeYszvbZIsl87SSRmDPKt1zD/uoaHASedUK8rzCBU3MsAGtUi6FvyXCeISj9wsoWnu4FyMS0w==
1133011330
dependencies:
1133111331
immutable "^3.8.2"
1133211332
recompose "^0.27.1"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /