fix on options objects take only properties that matter

update [email protected]
tiberiuzuld · Apr 11, 2017 · c7b5d68 · c7b5d68
1 parent b903e76
commit c7b5d68
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 24 deletions.
diff --git a/dist/gridster.component.d.ts b/dist/gridster.component.d.ts
@@ -35,7 +35,7 @@ export declare class GridsterComponent implements OnInit, OnDestroy {
     calculateLayout(): void;
     addItem(item: GridsterItem): void;
     removeItem(item: GridsterItem): void;
-    checkCollision(item: GridsterItem): GridsterItem;
+    checkCollision(item: GridsterItem): GridsterItem | boolean;
     findItemWithItem(item: GridsterItem): GridsterItem;
     autoPositionItem(item: GridsterItem): void;
     pixelsToPosition(x: number, y: number, roundingMethod: Function): [number, number];

diff --git a/dist/gridster.component.js b/dist/gridster.component.js
diff --git a/dist/gridster.component.js.map b/dist/gridster.component.js.map
diff --git a/dist/gridsterConfig.interface.d.ts b/dist/gridsterConfig.interface.d.ts
@@ -26,6 +26,7 @@ export interface GridsterConfig {
     draggable?: Draggable;
     resizable?: Resizable;
     swap?: boolean;
+    [propName: string]: any;
 }
 export interface Draggable {
     enabled?: boolean;

diff --git a/dist/gridsterItem.component.js b/dist/gridsterItem.component.js
diff --git a/dist/gridsterItem.component.js.map b/dist/gridsterItem.component.js.map
diff --git a/dist/gridsterItem.interface.d.ts b/dist/gridsterItem.interface.d.ts
@@ -17,4 +17,5 @@ export interface GridsterItem {
     minItemCols?: number;
     drag?: GridsterDraggable;
     resize?: GridsterResizable;
+    [propName: string]: any;
 }
diff --git a/dist/gridsterUtils.service.d.ts b/dist/gridsterUtils.service.d.ts
@@ -1,4 +1,4 @@
 export declare class GridsterUtils {
-    static merge(obj1: any, obj2: any): any;
+    static merge(obj1: any, obj2: any, properties: any): any;
     static debounce(func: any, wait: any): () => void;
 }
diff --git a/dist/gridsterUtils.service.js b/dist/gridsterUtils.service.js
diff --git a/dist/gridsterUtils.service.js.map b/dist/gridsterUtils.service.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-gridster2",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "license": "MIT",
   "main": "dist/index.js",
   "jsnext:main": "dist/index.js",
@@ -83,7 +83,7 @@
     "ts-helpers": "1.1.2",
     "ts-node": "3.0.2",
     "tslib": "1.6.0",
-    "tslint": "5.0.0",
+    "tslint": "5.1.0",
     "typescript": "2.2.2",
     "zone.js": "0.8.5"
   }