Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ksachdeva/angular2-swing
Browse files Browse the repository at this point in the history
  • Loading branch information
Sparkomatic committed Apr 20, 2017
2 parents af3996c + e23709c commit 87752bc
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 43 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
npm-debug.log
typings
aot
dist
.idea/
66 changes: 34 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
{
"name": "angular2-swing",
"version": "0.10.0",
"description": "Angular 2 Component for Swing (Tinder style cards)",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"scripts": {
"build-app": "./node_modules/.bin/ngc",
"clean": "rm -rf ./dist && rm -rf ./aot",
"build": "npm run clean && npm run build-app"
},
"repository": {
"type": "git",
"url": "git+https://github.com/ksachdeva/angular2-swing.git"
},
"author": "Kapil Sachdeva <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/ksachdeva/angular2-swing/issues"
},
"homepage": "https://github.com/ksachdeva/angular2-swing#readme",
"dependencies": {
"swing": "^4.3.0"
},
"devDependencies": {
"@angular/common": "^2.0.2",
"@angular/core": "^2.0.2",
"angular-cli": "^1.0.0-beta.17",
"core-js": "^2.4.1",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.6.23"
}
"name": "angular2-swing",
"version": "0.11.0",
"description": "Angular 2 Component for Swing (Tinder style cards)",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"scripts": {
"build-app": "./node_modules/.bin/ngc",
"clean": "rm -rf ./dist && rm -rf ./aot",
"build": "npm run clean && npm run build-app"
},
"repository": {
"type": "git",
"url": "git+https://github.com/ksachdeva/angular2-swing.git"
},
"author": "Kapil Sachdeva <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/ksachdeva/angular2-swing/issues"
},
"homepage": "https://github.com/ksachdeva/angular2-swing#readme",
"dependencies": {
"swing": "^4.3.0"
},
"devDependencies": {
"@angular/common": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/cli": "1.0.0",
"@angular/compiler-cli": "^4.0.0",
"core-js": "^2.4.1",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.12",
"zone.js": "^0.8.4"
}
}
1 change: 0 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
export { SwingStackComponent } from './swing-stack-component';
export { SwingCardComponent } from './swing-card-component';
export {
ThrowDirection,
ThrowEvent,
DragEvent,
ThrowEventName,
Expand Down
2 changes: 1 addition & 1 deletion src/swing-stack-component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ declare var require: any;
import {Component, Input, ContentChildren, QueryList,
AfterContentInit, EventEmitter } from '@angular/core';

import { ThrowDirection, ThrowEvent, DragEvent, Stack, Card, StackConfig} from './swing';
import { Direction, ThrowEvent, DragEvent, Stack, Card, StackConfig } from './swing';
import {SwingCardComponent} from './swing-card-component';

const Swing = require('swing');
Expand Down
11 changes: 2 additions & 9 deletions src/swing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
declare var require: any;
const Swing = require('swing');

export enum ThrowDirection {
LEFT = -1,
RIGHT = 1,
UP = 2,
DOWN = 3
}

export interface ThrowEvent {
/**
* The element being dragged.
Expand All @@ -21,7 +14,7 @@ export interface ThrowEvent {
* The direction in which the element is being dragged: Card.DIRECTION_LEFT
* or Card.DIRECTION_RIGHT
*/
throwDirection: ThrowDirection;
throwDirection: Direction;
}

export interface DragEvent {
Expand All @@ -37,7 +30,7 @@ export interface DragEvent {
/**
* Only available when the event is dragmove
*/
throwDirection?: ThrowDirection;
throwDirection?: Direction;
/**
* Only available when the event is dragmove
*/
Expand Down

0 comments on commit 87752bc

Please sign in to comment.