diff --git a/src/filters/brightness_filter.class.js b/src/filters/brightness_filter.class.js index 914e3dca..93e2dcea 100644 --- a/src/filters/brightness_filter.class.js +++ b/src/filters/brightness_filter.class.js @@ -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; }, /** diff --git a/src/filters/noise_filter.class.js b/src/filters/noise_filter.class.js index 05354524..3fd6e9b6 100644 --- a/src/filters/noise_filter.class.js +++ b/src/filters/noise_filter.class.js @@ -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; }, /** diff --git a/test/unit/image_filters.js b/test/unit/image_filters.js index 019bfb86..9a87afc6 100644 --- a/test/unit/image_filters.js +++ b/test/unit/image_filters.js @@ -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}'); });