Merge branch 'master' of github.com:Craga89/qTip2

Conflicts: src/intro.js
qTip2 · Sep 2, 2012 · 3b2bc01 · 3b2bc01
2 parents 00288f5 + f4791d2
commit 3b2bc01
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/dist/basic/jquery.qtip.js b/dist/basic/jquery.qtip.js
@@ -6,7 +6,7 @@
 /*global window: false, jQuery: false, console: false, define: false */
 
 // Uses AMD or browser globals to create a jQuery plugin.
-(function(factory) {
+(function( factory, window, document, undefined ) {
 	"use strict";
 	if(typeof define === 'function' && define.amd) {
 		define(['jquery'], factory);
@@ -18,7 +18,7 @@
 (function($) {
 	/* This currently causes issues with Safari 6, so for it's disabled */
 	//"use strict"; // (Dis)able ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
-	
+
 	// Munge the primitives - Paul Irish tip
 	var TRUE = true,
 		FALSE = false,
@@ -1854,5 +1854,4 @@ QTIP.defaults = {
 };
 
 
-
-}));
+}), window, document, undefined );
diff --git a/dist/basic/jquery.qtip.min.js b/dist/basic/jquery.qtip.min.js
diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -6,7 +6,7 @@
 /*global window: false, jQuery: false, console: false, define: false */
 
 // Uses AMD or browser globals to create a jQuery plugin.
-(function(factory) {
+(function( factory, window, document, undefined ) {
 	"use strict";
 	if(typeof define === 'function' && define.amd) {
 		define(['jquery'], factory);
@@ -18,7 +18,7 @@
 (function($) {
 	/* This currently causes issues with Safari 6, so for it's disabled */
 	//"use strict"; // (Dis)able ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
-	
+
 	// Munge the primitives - Paul Irish tip
 	var TRUE = true,
 		FALSE = false,
@@ -3364,5 +3364,4 @@ PLUGINS.bgiframe = function(api)
 PLUGINS.bgiframe.initialize = 'render';
 
 
-
-}));
+}), window, document, undefined );
diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/src/intro.js b/src/intro.js
@@ -2,7 +2,7 @@
 /*global window: false, jQuery: false, console: false, define: false */
 
 // Uses AMD or browser globals to create a jQuery plugin.
-(function(factory) {
+(function( factory, window, document, undefined ) {
 	"use strict";
 	if(typeof define === 'function' && define.amd) {
 		define(['jquery'], factory);
@@ -14,7 +14,7 @@
 (function($) {
 	/* This currently causes issues with Safari 6, so for it's disabled */
 	//"use strict"; // (Dis)able ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
-	
+
 	// Munge the primitives - Paul Irish tip
 	var TRUE = true,
 		FALSE = false,

diff --git a/src/outro.js b/src/outro.js
@@ -1,2 +1 @@
-
-}));
+}), window, document, undefined );