Merge branch 'master' of https://github.com/jovination/konva into jovination-master

Conflicts:
	src/Stage.js
	test/unit/Node-test.js
	test/unit/Shape-test.js
	test/unit/plugins/Path-test.js
This commit is contained in:
lavrton
2015-01-27 15:13:43 +07:00
130 changed files with 5754 additions and 5718 deletions

View File

@@ -4,9 +4,9 @@ suite('Rect', function(){
test('add rect to stage', function(){
var stage = addStage();
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var rect = new Kinetic.Rect({
var rect = new Konva.Rect({
x: 100,
y: 50,
width: 100,
@@ -34,9 +34,9 @@ suite('Rect', function(){
test('add rect with shadow, corner radius, and opacity', function(){
var stage = addStage();
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var rect = new Kinetic.Rect({
var rect = new Konva.Rect({
x: 100,
y: 50,
width: 100,
@@ -68,8 +68,8 @@ suite('Rect', function(){
// ======================================================
test('draw rect', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var rect = new Kinetic.Rect({
var layer = new Konva.Layer();
var rect = new Konva.Rect({
x: 200,
y: 90,
width: 100,
@@ -94,8 +94,8 @@ suite('Rect', function(){
// ======================================================
test('add fill stroke rect', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var rect = new Kinetic.Rect({
var layer = new Konva.Layer();
var rect = new Konva.Rect({
x: 200,
y: 100,
width: 100,
@@ -124,8 +124,8 @@ suite('Rect', function(){
// ======================================================
test('add stroke rect', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var rect = new Kinetic.Rect({
var layer = new Konva.Layer();
var rect = new Konva.Rect({
x: 200,
y: 100,
width: 100,
@@ -151,8 +151,8 @@ suite('Rect', function(){
// ======================================================
test('use default stroke width (stroke width should be 2)', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var rect = new Kinetic.Rect({
var layer = new Konva.Layer();
var rect = new Konva.Rect({
x: 200,
y: 100,
width: 100,
@@ -176,8 +176,8 @@ suite('Rect', function(){
// ======================================================
test('limit corner radius', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var rect = new Kinetic.Rect({
var layer = new Konva.Layer();
var rect = new Konva.Rect({
x: 50,
y: 50,
width: 100,