Temp. fix handling of boolean options to allow strings

This commit is contained in:
root 2009-05-06 18:24:07 +02:00
parent 459822d4f6
commit da2de906e7
10 changed files with 13 additions and 19 deletions

View file

@ -8,7 +8,7 @@ Pixastic.Actions.blurfast = {
process : function(params) { process : function(params) {
var amount = parseFloat(params.options.amount)||0; var amount = parseFloat(params.options.amount)||0;
var clear = !!(params.options.clear); var clear = !!(params.options.clear && params.options.clear != "false");
amount = Math.max(0,Math.min(5,amount)); amount = Math.max(0,Math.min(5,amount));

View file

@ -10,7 +10,7 @@ Pixastic.Actions.brightness = {
var brightness = parseInt(params.options.brightness,10) || 0; var brightness = parseInt(params.options.brightness,10) || 0;
var contrast = parseFloat(params.options.contrast)||0; var contrast = parseFloat(params.options.contrast)||0;
var legacy = !!(params.options.legacy); var legacy = !!(params.options.legacy && params.options.legacy != "false");
if (legacy) { if (legacy) {
brightness = Math.min(150,Math.max(-150,brightness)); brightness = Math.min(150,Math.max(-150,brightness));

View file

@ -7,7 +7,7 @@
Pixastic.Actions.desaturate = { Pixastic.Actions.desaturate = {
process : function(params) { process : function(params) {
var useAverage = !!params.options.average; var useAverage = !!(params.options.average && params.options.average != "false");
if (Pixastic.Client.hasCanvasImageData()) { if (Pixastic.Client.hasCanvasImageData()) {
var data = Pixastic.prepareData(params); var data = Pixastic.prepareData(params);

View file

@ -7,20 +7,14 @@
Pixastic.Actions.edges = { Pixastic.Actions.edges = {
process : function(params) { process : function(params) {
var mono = !!(params.options.mono); var mono = !!(params.options.mono && params.options.mono != "false");
var invert = !!(params.options.invert && params.options.invert != "false");
var strength = 1.0;
//if (typeof params.options.strength != "undefined")
// strength = parseFloat(params.options.strength)||0;
var invert = !!(params.options.invert);
if (Pixastic.Client.hasCanvasImageData()) { if (Pixastic.Client.hasCanvasImageData()) {
var data = Pixastic.prepareData(params); var data = Pixastic.prepareData(params);
var dataCopy = Pixastic.prepareData(params, true) var dataCopy = Pixastic.prepareData(params, true)
var c = -strength/8; var c = -1/8;
var kernel = [ var kernel = [
[c, c, c], [c, c, c],
[c, 1, c], [c, 1, c],

View file

@ -10,7 +10,7 @@ Pixastic.Actions.emboss = {
var strength = parseFloat(params.options.strength)||1; var strength = parseFloat(params.options.strength)||1;
var greyLevel = typeof params.options.greyLevel != "undefined" ? parseInt(params.options.greyLevel) : 180; var greyLevel = typeof params.options.greyLevel != "undefined" ? parseInt(params.options.greyLevel) : 180;
var direction = params.options.direction||"topleft"; var direction = params.options.direction||"topleft";
var blend = !!params.options.blend; var blend = !!(params.options.blend && params.options.blend != "false");
var dirY = 0; var dirY = 0;
var dirX = 0; var dirX = 0;

View file

@ -7,8 +7,8 @@
Pixastic.Actions.histogram = { Pixastic.Actions.histogram = {
process : function(params) { process : function(params) {
var average = !!(params.options.average); var average = !!(params.options.average && params.options.average != "false");
var paint = !!(params.options.paint); var paint = !!(params.options.paint && params.options.paint != "false");
var color = params.options.color || "rgba(255,255,255,0.5)"; var color = params.options.color || "rgba(255,255,255,0.5)";
var values = []; var values = [];
if (typeof params.options.returnValue != "object") { if (typeof params.options.returnValue != "object") {

View file

@ -8,7 +8,7 @@ Pixastic.Actions.laplace = {
process : function(params) { process : function(params) {
var strength = 1.0; var strength = 1.0;
var invert = !!(params.options.invert); var invert = !!(params.options.invert && params.options.invert != "false");
var contrast = parseFloat(params.options.edgeStrength)||0; var contrast = parseFloat(params.options.edgeStrength)||0;
var greyLevel = parseInt(params.options.greyLevel)||0; var greyLevel = parseInt(params.options.greyLevel)||0;

View file

@ -16,7 +16,7 @@ Pixastic.Actions.noise = {
if (typeof params.options.strength != "undefined") if (typeof params.options.strength != "undefined")
strength = parseFloat(params.options.strength)||0; strength = parseFloat(params.options.strength)||0;
if (typeof params.options.mono != "undefined") if (typeof params.options.mono != "undefined")
mono = !!(params.options.mono); mono = !!(params.options.mono && params.options.mono != "false");
amount = Math.max(0,Math.min(1,amount)); amount = Math.max(0,Math.min(1,amount));
strength = Math.max(0,Math.min(1,strength)); strength = Math.max(0,Math.min(1,strength));

View file

@ -10,7 +10,7 @@ Pixastic.Actions.pointillize = {
var radius = Math.max(1,parseInt(params.options.radius,10)); var radius = Math.max(1,parseInt(params.options.radius,10));
var density = Math.min(5,Math.max(0,parseFloat(params.options.density)||0)); var density = Math.min(5,Math.max(0,parseFloat(params.options.density)||0));
var noise = Math.max(0,parseFloat(params.options.noise)||0); var noise = Math.max(0,parseFloat(params.options.noise)||0);
var transparent = !!params.options.transparent; var transparent = !!(params.options.transparent && params.options.transparent != "false");
if (Pixastic.Client.hasCanvasImageData()) { if (Pixastic.Client.hasCanvasImageData()) {
var rect = params.options.rect; var rect = params.options.rect;

View file

@ -7,7 +7,7 @@
Pixastic.Actions.solarize = { Pixastic.Actions.solarize = {
process : function(params) { process : function(params) {
var useAverage = !!params.options.average; var useAverage = !!(params.options.average && params.options.average != "false");
if (Pixastic.Client.hasCanvasImageData()) { if (Pixastic.Client.hasCanvasImageData()) {
var data = Pixastic.prepareData(params); var data = Pixastic.prepareData(params);