lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2026-01-18 19:51:21 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

resolved some more merge issues

Browse Source
This commit is contained in:
Eric Rowell
2013-08-11 22:02:49 -07:00
parent a4172088f1
commit 355c80088f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/filters/ColorPack.js
View File

@@ -90,7 +90,7 @@
shift_hue(imageData, this.getFilterHueShiftDeg() % 360 );
};
Kinetic.Node.addFilterGetterSetter(Kinetic.Image, 'filterHueShiftDeg', 0);
Kinetic.Factory.addFilterGetterSetter(Kinetic.Image, 'filterHueShiftDeg', 0);
/**
* get hue shift amount. The shift amount is a number between 0 and 360.
* @name getFilterBrightness
@@ -132,7 +132,7 @@
shift_hue(imageData,hue);
};
Kinetic.Node.addFilterGetterSetter(Kinetic.Image, 'filterColorizeColor', [255,0,0] );
Kinetic.Factory.addFilterGetterSetter(Kinetic.Image, 'filterColorizeColor', [255,0,0] );
/**
* Gets the colorizing color.
* @name getFilterColorizeColor

2
src/filters/ConvolvePack.js
View File

@@ -134,7 +134,7 @@
return kernel;
};
Kinetic.Node.addFilterGetterSetter(Kinetic.Image, 'filterAmount', 50);
Kinetic.Factory.addFilterGetterSetter(Kinetic.Image, 'filterAmount', 50);
/**
* get the current filter amount
* @name getFilterAmount

2
tests/html/filterTests.html
View File

@@ -6,7 +6,7 @@
</style>
<link rel="stylesheet" type="text/css"href="../base.css">
<script src="../../dist/kinetic-v0.0.0.js"></script>
<script src="../../dist/kinetic-dev.js"></script>
<script src="../assets/dataUrls.js"></script>
<script src="../js/Test.js"></script>
<script src="../js/filterTests.js"></script>