Merge pull request #8 from RichardVanDerMeer/master

websanova · websanova · commit f095db6f5756 · 2012-12-04T06:13:46.000-08:00
Added check for 'this.settings.image'
diff --git a/wScratchPad.js b/wScratchPad.js
@@ -203,7 +203,10 @@
 			{
 				if(this.settings.overlay != 'none')
 				{
-					this.drawImage(this.settings.image);
+					if(this.settings.image)
+					{
+						this.drawImage(this.settings.image);
+					}
 					this.ctx.globalCompositeOperation = this.settings.overlay;
 				}
 				else
@@ -231,7 +234,10 @@
 
 		setBgImage: function()
 		{
-			this.sp.css({backgroundImage: 'url('+this.settings.image+')'});
+			if(this.settings.image)
+			{
+				this.sp.css({backgroundImage: 'url('+this.settings.image+')'});
+			}
 		},
 
 		drawImage: function(imagePath)

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,10 @@`
`203`	`203`	`{`
`204`	`204`	`if(this.settings.overlay != 'none')`
`205`	`205`	`{`
`206`		`- this.drawImage(this.settings.image);`
	`206`	`+ if(this.settings.image)`
	`207`	`+ {`
	`208`	`+ this.drawImage(this.settings.image);`
	`209`	`+ }`
`207`	`210`	`this.ctx.globalCompositeOperation = this.settings.overlay;`
`208`	`211`	`}`
`209`	`212`	`else`
`@@ -231,7 +234,10 @@`
`231`	`234`
`232`	`235`	`setBgImage: function()`
`233`	`236`	`{`
`234`		`- this.sp.css({backgroundImage: 'url('+this.settings.image+')'});`
	`237`	`+ if(this.settings.image)`
	`238`	`+ {`
	`239`	`+ this.sp.css({backgroundImage: 'url('+this.settings.image+')'});`
	`240`	`+ }`
`235`	`241`	`},`
`236`	`242`
`237`	`243`	`drawImage: function(imagePath)`