Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-14 03:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1323 from Kienz/issue-1257

Browse source 
Initialize "Noise" and "Brightness" filter with 0 instead of 100
This commit is contained in:
Juriy Zaytsev 2014-05-12 20:50:49 +02:00
commit 91c32d89a7
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/filters/brightness_filter.class.js
View file

@ -32,11 +32,11 @@
* Constructor
* @memberOf fabric.Image.filters.Brightness.prototype
* @param {Object} [options] Options object
* @param {Number} [options.brightness=100] Value to brighten the image up (0..255)
* @param {Number} [options.brightness=0] Value to brighten the image up (0..255)
*/
initialize: function(options) {
options = options || { };
this.brightness = options.brightness || 100;
this.brightness = options.brightness || 0;
},
/**

4
src/filters/noise_filter.class.js
View file

@ -32,11 +32,11 @@
* Constructor
* @memberOf fabric.Image.filters.Noise.prototype
* @param {Object} [options] Options object
* @param {Number} [options.noise=100] Noise value
* @param {Number} [options.noise=0] Noise value
*/
initialize: function(options) {
options = options || { };
this.noise = options.noise || 100;
this.noise = options.noise || 0;
},
/**

24
test/unit/image_filters.js
View file

@ -92,7 +92,7 @@
var filter = new fabric.Image.filters.Brightness();
equal(filter.type, 'Brightness');
equal(filter.brightness, 100);
equal(filter.brightness, 0);
var filter2 = new fabric.Image.filters.Brightness({brightness: 30});
equal(filter2.brightness, 30);
@ -108,6 +108,11 @@
ok(typeof filter.toObject == 'function');
var object = filter.toObject();
equal(JSON.stringify(object), '{"type":"Brightness","brightness":0}');
filter.brightness = 100;
object = filter.toObject();
equal(JSON.stringify(object), '{"type":"Brightness","brightness":100}');
});
@ -116,6 +121,11 @@
ok(typeof filter.toJSON == 'function');
var json = filter.toJSON();
equal(JSON.stringify(json), '{"type":"Brightness","brightness":0}');
filter.brightness = 100;
json = filter.toJSON();
equal(JSON.stringify(json), '{"type":"Brightness","brightness":100}');
});
@ -330,7 +340,7 @@
var filter = new fabric.Image.filters.Noise();
equal(filter.type, 'Noise');
equal(filter.noise, 100);
equal(filter.noise, 0);
var filter2 = new fabric.Image.filters.Noise({noise: 200});
equal(filter2.noise, 200);
@ -346,6 +356,11 @@
ok(typeof filter.toObject == 'function');
var object = filter.toObject();
equal(JSON.stringify(object), '{"type":"Noise","noise":0}');
filter.noise = 100;
object = filter.toObject();
equal(JSON.stringify(object), '{"type":"Noise","noise":100}');
});
@ -354,6 +369,11 @@
ok(typeof filter.toJSON == 'function');
var json = filter.toJSON();
equal(JSON.stringify(json), '{"type":"Noise","noise":0}');
filter.noise = 100;
json = filter.toJSON();
equal(JSON.stringify(json), '{"type":"Noise","noise":100}');
});