Permalink
Browse files

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

Conflicts:
	src/intro.js
  • Loading branch information...
Craga89 committed Sep 2, 2012
2 parents 00288f5 + f4791d2 commit 3b2bc0180132d7b664aaed55b976d4075f893eb7
Showing with 11 additions and 14 deletions.
  1. +3 −4 dist/basic/jquery.qtip.js
  2. +1 −1 dist/basic/jquery.qtip.min.js
  3. +3 −4 dist/jquery.qtip.js
  4. +1 −1 dist/jquery.qtip.min.js
  5. +2 −2 src/intro.js
  6. +1 −2 src/outro.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 );

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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 );
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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,
View
@@ -1,2 +1 @@
-
-}));
+}), window, document, undefined );

0 comments on commit 3b2bc01

Please sign in to comment.