From 9470bc5fe21e484dc467d461666b1e0a591a0c6d Mon Sep 17 00:00:00 2001 From: Anton Lavrenov Date: Fri, 6 May 2016 14:10:50 +0700 Subject: [PATCH] cleanup --- gulpfile.js | 14 +++++----- resources/konva.d.ts => konva.d.ts | 0 package.json | 23 ++++++++-------- src/{plugins => shapes}/Arrow.js | 0 src/{plugins => shapes}/Label.js | 0 src/{plugins => shapes}/Path.js | 0 src/{plugins => shapes}/RegularPolygon.js | 0 src/{plugins => shapes}/Star.js | 0 src/{plugins => shapes}/TextPath.js | 0 test/runner.html | 27 +++++++++---------- test/unit/Node-test.js | 1 - test/unit/{plugins => shapes}/Arrow-test.js | 0 test/unit/{plugins => shapes}/Label-test.js | 0 test/unit/{plugins => shapes}/Path-test.js | 0 .../RegularPolygon-test.js | 0 test/unit/{plugins => shapes}/Star-test.js | 0 .../unit/{plugins => shapes}/TextPath-test.js | 0 17 files changed, 30 insertions(+), 35 deletions(-) rename resources/konva.d.ts => konva.d.ts (100%) rename src/{plugins => shapes}/Arrow.js (100%) rename src/{plugins => shapes}/Label.js (100%) rename src/{plugins => shapes}/Path.js (100%) rename src/{plugins => shapes}/RegularPolygon.js (100%) rename src/{plugins => shapes}/Star.js (100%) rename src/{plugins => shapes}/TextPath.js (100%) rename test/unit/{plugins => shapes}/Arrow-test.js (100%) rename test/unit/{plugins => shapes}/Label-test.js (100%) rename test/unit/{plugins => shapes}/Path-test.js (100%) rename test/unit/{plugins => shapes}/RegularPolygon-test.js (100%) rename test/unit/{plugins => shapes}/Star-test.js (100%) rename test/unit/{plugins => shapes}/TextPath-test.js (100%) diff --git a/gulpfile.js b/gulpfile.js index ae0604d5..d97213a2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -70,14 +70,12 @@ var sourceFiles = [ 'src/shapes/Text.js', 'src/shapes/Line.js', 'src/shapes/Sprite.js', - - // plugins - 'src/plugins/Path.js', - 'src/plugins/TextPath.js', - 'src/plugins/RegularPolygon.js', - 'src/plugins/Star.js', - 'src/plugins/Label.js', - 'src/plugins/Arrow.js' + 'src/shapes/Path.js', + 'src/shapes/TextPath.js', + 'src/shapes/RegularPolygon.js', + 'src/shapes/Star.js', + 'src/shapes/Label.js', + 'src/shapes/Arrow.js' ]; function build() { diff --git a/resources/konva.d.ts b/konva.d.ts similarity index 100% rename from resources/konva.d.ts rename to konva.d.ts diff --git a/package.json b/package.json index 6d664827..68e970b6 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,15 @@ "name": "konva", "version": "0.12.4", "author": "Anton Lavrenov", + "files": [ + "./konva.d.ts", + "./src", + "konva.js", + "konva.min.js", + "README.md" + ], + "main": "konva.js", + "typings": "./konva.d.ts", "scripts": { "start": "gulp", "full-build": "gulp lint test build", @@ -11,9 +20,9 @@ "chai": "3.5.0", "gulp": "^3.9.0", "gulp-concat": "^2.6.0", - "gulp-connect": "^3.0.0", + "gulp-connect": "^4.0.0", "gulp-eslint": "^2.0.0", - "gulp-jscpd": "0.0.6", + "gulp-jscpd": "0.0.7", "gulp-jsdoc": "^0.1.4", "gulp-mocha-phantomjs": "^0.11.0", "gulp-rename": "^1.2.2", @@ -37,17 +46,9 @@ }, "homepage": "http://konvajs.github.io/", "readmeFilename": "README.md", - "main": "konva.js", "repository": { "type": "git", "url": "git://github.com/konvajs/konva.git" }, - "license": "MIT", - "testling": { - "html": "test/runner.html", - "harness": "mocha-tdd", - "browsers": [ - "ie/latest" - ] - } + "license": "MIT" } diff --git a/src/plugins/Arrow.js b/src/shapes/Arrow.js similarity index 100% rename from src/plugins/Arrow.js rename to src/shapes/Arrow.js diff --git a/src/plugins/Label.js b/src/shapes/Label.js similarity index 100% rename from src/plugins/Label.js rename to src/shapes/Label.js diff --git a/src/plugins/Path.js b/src/shapes/Path.js similarity index 100% rename from src/plugins/Path.js rename to src/shapes/Path.js diff --git a/src/plugins/RegularPolygon.js b/src/shapes/RegularPolygon.js similarity index 100% rename from src/plugins/RegularPolygon.js rename to src/shapes/RegularPolygon.js diff --git a/src/plugins/Star.js b/src/shapes/Star.js similarity index 100% rename from src/plugins/Star.js rename to src/shapes/Star.js diff --git a/src/plugins/TextPath.js b/src/shapes/TextPath.js similarity index 100% rename from src/plugins/TextPath.js rename to src/shapes/TextPath.js diff --git a/test/runner.html b/test/runner.html index 6dff4eb1..94b37c46 100644 --- a/test/runner.html +++ b/test/runner.html @@ -86,14 +86,12 @@ - - - - - - - - + + + + + + @@ -136,19 +134,18 @@ + + + + + + - - - - - - - diff --git a/test/unit/Node-test.js b/test/unit/Node-test.js index 38e18c09..6d094dd5 100644 --- a/test/unit/Node-test.js +++ b/test/unit/Node-test.js @@ -1964,7 +1964,6 @@ suite('Node', function() { var fired = false; layer.on('click', 'Circle', function(e) { - console.log(e); assert.equal(this, circle); assert.equal(e.currentTarget, circle); fired = true; diff --git a/test/unit/plugins/Arrow-test.js b/test/unit/shapes/Arrow-test.js similarity index 100% rename from test/unit/plugins/Arrow-test.js rename to test/unit/shapes/Arrow-test.js diff --git a/test/unit/plugins/Label-test.js b/test/unit/shapes/Label-test.js similarity index 100% rename from test/unit/plugins/Label-test.js rename to test/unit/shapes/Label-test.js diff --git a/test/unit/plugins/Path-test.js b/test/unit/shapes/Path-test.js similarity index 100% rename from test/unit/plugins/Path-test.js rename to test/unit/shapes/Path-test.js diff --git a/test/unit/plugins/RegularPolygon-test.js b/test/unit/shapes/RegularPolygon-test.js similarity index 100% rename from test/unit/plugins/RegularPolygon-test.js rename to test/unit/shapes/RegularPolygon-test.js diff --git a/test/unit/plugins/Star-test.js b/test/unit/shapes/Star-test.js similarity index 100% rename from test/unit/plugins/Star-test.js rename to test/unit/shapes/Star-test.js diff --git a/test/unit/plugins/TextPath-test.js b/test/unit/shapes/TextPath-test.js similarity index 100% rename from test/unit/plugins/TextPath-test.js rename to test/unit/shapes/TextPath-test.js