tips plugin nows saves canvas context on first create so FF2 doesn't …

…bork on first restore() call
qTip2 · Dec 6, 2010 · d7c6526 · d7c6526
1 parent 544e395
commit d7c6526
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/dist/jquery.qtip.css b/dist/jquery.qtip.css
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Mon Dec 6 02:15:36 2010 +0000
+* Date: Mon Dec 6 03:13:27 2010 +0000
 */
 
 .ui-tooltip-accessible{

diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Mon Dec 6 02:15:36 2010 +0000
+* Date: Mon Dec 6 03:13:27 2010 +0000
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1945,7 +1945,8 @@ function Tip(qTip, command)
 			switch(method)
 			{
 				case 'canvas':
-					elems.tip.append('<canvas height="'+height+'" width="'+width+'" />');
+					// save() as soon as we create the canvas element so FF2 doesn't bork on our first restore()!
+					$('<canvas height="'+height+'" width="'+width+'" />').appendTo(elems.tip)[0].getContext('2d').save(); 
 				break;
 
 				case 'vml':
@@ -2009,7 +2010,7 @@ function Tip(qTip, command)
 				case 'canvas':
 					// Grab canvas context and clear it
 					context = inner.get(0).getContext('2d');
-					context.restore();
+					if(context.restore) { context.restore(); }
 					context.clearRect(0,0,3000,3000);
 
 					// Grab tip coordinates

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/dist/jquery.qtip.pack.js b/dist/jquery.qtip.pack.js
diff --git a/src/tips.js b/src/tips.js
@@ -254,7 +254,8 @@ function Tip(qTip, command)
 			switch(method)
 			{
 				case 'canvas':
-					elems.tip.append('<canvas height="'+height+'" width="'+width+'" />');
+					// save() as soon as we create the canvas element so FF2 doesn't bork on our first restore()!
+					$('<canvas height="'+height+'" width="'+width+'" />').appendTo(elems.tip)[0].getContext('2d').save(); 
 				break;
 
 				case 'vml':
@@ -318,7 +319,7 @@ function Tip(qTip, command)
 				case 'canvas':
 					// Grab canvas context and clear it
 					context = inner.get(0).getContext('2d');
-					context.restore();
+					if(context.restore) { context.restore(); }
 					context.clearRect(0,0,3000,3000);
 
 					// Grab tip coordinates