Skip to content

Commit d375898

Browse files
authored
Merge pull request #20 from e-oj/master
merge dev
2 parents 011cc9d + dd11b1c commit d375898

File tree

8 files changed

+29
-11
lines changed

8 files changed

+29
-11
lines changed

dist/magic-grid.cjs.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
* @param config - configuration object
1212
*/
1313
var checkParams = function (config) {
14+
var DEFAULT_GUTTER = 25;
15+
1416
if (!config) {
1517
throw new Error("No config object has been provided.");
1618
}
@@ -19,6 +21,10 @@ var checkParams = function (config) {
1921
config.useTransform = true;
2022
}
2123

24+
if(typeof config.gutter !== "number"){
25+
config.gutter = DEFAULT_GUTTER;
26+
}
27+
2228
if (!config.container) { error("container"); }
2329
if (!config.items && !config.static) { error("items or static"); }
2430
};
@@ -76,7 +82,7 @@ var MagicGrid = function MagicGrid (config) {
7682
this.items = this.container.children;
7783
this.static = config.static || false;
7884
this.size = config.items;
79-
this.gutter = config.gutter || 25;
85+
this.gutter = config.gutter;
8086
this.maxColumns = config.maxColumns || false;
8187
this.useMin = config.useMin || false;
8288
this.useTransform = config.useTransform;

dist/magic-grid.esm.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
* @param config - configuration object
1010
*/
1111
var checkParams = function (config) {
12+
var DEFAULT_GUTTER = 25;
13+
1214
if (!config) {
1315
throw new Error("No config object has been provided.");
1416
}
@@ -17,6 +19,10 @@ var checkParams = function (config) {
1719
config.useTransform = true;
1820
}
1921

22+
if(typeof config.gutter !== "number"){
23+
config.gutter = DEFAULT_GUTTER;
24+
}
25+
2026
if (!config.container) { error("container"); }
2127
if (!config.items && !config.static) { error("items or static"); }
2228
};
@@ -74,7 +80,7 @@ var MagicGrid = function MagicGrid (config) {
7480
this.items = this.container.children;
7581
this.static = config.static || false;
7682
this.size = config.items;
77-
this.gutter = config.gutter || 25;
83+
this.gutter = config.gutter;
7884
this.maxColumns = config.maxColumns || false;
7985
this.useMin = config.useMin || false;
8086
this.useTransform = config.useTransform;

dist/magic-grid.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
* configuration object of the MagicGrid constructor
99
*/
1010
export interface MagicGridProps{
11-
containerClass?: string;
12-
container?: string | HTMLElement;
11+
container: string | HTMLElement;
1312
static?: boolean;
1413
items?: number;
1514
gutter?: number;
16-
maxColumns: number,
17-
useMin: boolean,
18-
animate: boolean,
15+
maxColumns?: number;
16+
useMin?: boolean;
17+
useTransform?: boolean;
18+
animate?: boolean;
1919
}
2020

2121
export default MagicGrid;

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "magic-grid",
3-
"version": "3.2.0",
3+
"version": "3.2.3",
44
"description": "Super lightweight javascript library for dynamic grid layouts.",
55
"main": "dist/magic-grid.cjs.js",
66
"module": "dist/magic-grid.esm.js",

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MagicGrid {
3434
this.items = this.container.children;
3535
this.static = config.static || false;
3636
this.size = config.items;
37-
this.gutter = config.gutter || 25;
37+
this.gutter = config.gutter;
3838
this.maxColumns = config.maxColumns || false;
3939
this.useMin = config.useMin || false;
4040
this.useTransform = config.useTransform;

src/utils.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
* @param config - configuration object
1010
*/
1111
const checkParams = config => {
12+
const DEFAULT_GUTTER = 25;
13+
1214
if (!config) {
1315
throw new Error("No config object has been provided.");
1416
}
@@ -17,6 +19,10 @@ const checkParams = config => {
1719
config.useTransform = true;
1820
}
1921

22+
if(typeof config.gutter !== "number"){
23+
config.gutter = DEFAULT_GUTTER;
24+
}
25+
2026
if (!config.container) error("container");
2127
if (!config.items && !config.static) error("items or static");
2228
};

0 commit comments

Comments
 (0)