Skip to content
This repository has been archived by the owner on Jun 14, 2020. It is now read-only.

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Craga89 committed Feb 11, 2013
2 parents 68e636f + ff7ae53 commit cb6ec62
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions dist/jquery.qtip.css
@@ -1,12 +1,12 @@
/*!
* qTip2 - Pretty powerful tooltips - v2.0.1-13-
* qTip2 - Pretty powerful tooltips - v2.0.1-14-
* http://qtip2.com
*
* Copyright (c) 2013 Craig Michael Thompson
* Released under the MIT, GPL licenses
* http://jquery.org/license
*
* Date: Mon Feb 11 2013 11:27 GMT+0000
* Date: Mon Feb 11 2013 11:28 GMT+0000
* Plugins: svg ajax tips modal viewport imagemap ie6
* Styles: basic css3
*/
Expand Down
8 changes: 4 additions & 4 deletions dist/jquery.qtip.js
@@ -1,12 +1,12 @@
/*!
* qTip2 - Pretty powerful tooltips - v2.0.1-13-
* qTip2 - Pretty powerful tooltips - v2.0.1-14-
* http://qtip2.com
*
* Copyright (c) 2013 Craig Michael Thompson
* Released under the MIT, GPL licenses
* http://jquery.org/license
*
* Date: Mon Feb 11 2013 11:27 GMT+0000
* Date: Mon Feb 11 2013 11:28 GMT+0000
* Plugins: svg ajax tips modal viewport imagemap ie6
* Styles: basic css3
*/
Expand Down Expand Up @@ -1762,7 +1762,7 @@ if(!$.ui) {
}

// Set global qTip properties
QTIP.version = '2.0.1-13-';
QTIP.version = '2.0.1-14-';
QTIP.nextid = 0;
QTIP.inactiveEvents = 'click dblclick mousedown mouseup mousemove mouseleave mouseenter'.split(' ');
QTIP.zindex = 15000;
Expand Down Expand Up @@ -2670,7 +2670,7 @@ TIP.sanitize = function(options)
if(style && 'tip' in style) {
opts = options.style.tip;
if(typeof opts !== 'object'){ options.style.tip = { corner: opts }; }
if(!(/string|boolean/i).test(typeof opts['corner'])) { opts['corner'] = TRUE; }
if(!(/string|boolean/i).test(typeof opts.corner)) { opts.corner = TRUE; }
if(typeof opts.width !== 'number'){ delete opts.width; }
if(typeof opts.height !== 'number'){ delete opts.height; }
if(typeof opts.border !== 'number' && opts.border !== TRUE){ delete opts.border; }
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.qtip.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cb6ec62

Please sign in to comment.