Navigation Menu

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

Commit

Permalink
Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Craga89
Craga89 committed Nov 15, 2012
2 parents 75f1250 + 263aa53 commit 988d4ba
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 61 deletions.
31 changes: 18 additions & 13 deletions dist/basic/jquery.qtip.css
View file
Expand Up @@ -14,6 +14,8 @@

font-size: 10.5px;
line-height: 12px;

direction: ltr;
}

.qtip-content{
Expand All @@ -27,7 +29,6 @@

.qtip-titlebar{
position: relative;
min-height: 14px;
padding: 5px 35px 5px 10px;
overflow: hidden;

Expand All @@ -37,28 +38,32 @@

.qtip-titlebar + .qtip-content{ border-top-width: 0 !important; }

/* Default close button class */
.qtip-titlebar .qtip-close{
position: absolute;
right: 4px;
top: 50%;
margin-top: -9px;
/* Default close button class */
.qtip-close{
position: absolute;
right: -9px; top: -9px;

cursor: pointer;
outline: medium none;

cursor: pointer;
outline: medium none;
border-width: 1px;
border-style: solid;
border-color: transparent;
}

border-width: 1px;
border-style: solid;
border-color: transparent;
.qtip-titlebar .qtip-close{
right: 4px; top: 50%;
margin-top: -9px;
}

* html .qtip-titlebar .qtip-close{ top: 16px; } /* IE fix */

.qtip-titlebar .ui-icon,
.qtip-icon .ui-icon{
display: block;
text-indent: -1000em;
direction: ltr;
vertical-align: middle;
}

.qtip-icon, .qtip-icon .ui-icon{
Expand Down
11 changes: 5 additions & 6 deletions dist/basic/jquery.qtip.js
View file
Expand Up @@ -226,7 +226,7 @@ function QTip(target, options, id, attr)
}

// Create button and setup attributes
elements.button.appendTo(elements.titlebar)
elements.button.appendTo(elements.titlebar || tooltip)
.attr('role', 'button')
.click(function(event) {
if(!tooltip.hasClass(disabledClass)) { self.hide(event); }
Expand Down Expand Up @@ -268,8 +268,7 @@ function QTip(target, options, id, attr)

function updateButton(button)
{
var elem = elements.button,
title = elements.title;
var elem = elements.button;

// Make sure tooltip is rendered and if not, return
if(!self.rendered) { return FALSE; }
Expand All @@ -278,9 +277,6 @@ function QTip(target, options, id, attr)
elem.remove();
}
else {
if(!title) {
createTitle();
}
createButton();
}
}
Expand Down Expand Up @@ -782,6 +778,9 @@ function QTip(target, options, id, attr)
if(!$.isFunction(title)) { updateTitle(title, FALSE); }
}

// Create button
else { createButton(); }

// Set proper rendered flag and update content if not a callback function (called in toggle)
if(!$.isFunction(text)) { updateContent(text, FALSE); }
self.rendered = TRUE;
Expand Down
2 changes: 1 addition & 1 deletion dist/basic/jquery.qtip.min.css
View file

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

2 changes: 1 addition & 1 deletion dist/basic/jquery.qtip.min.js
View file

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions dist/jquery.qtip.css
View file
Expand Up @@ -14,6 +14,8 @@

font-size: 10.5px;
line-height: 12px;

direction: ltr;
}

.qtip-content{
Expand All @@ -27,7 +29,6 @@

.qtip-titlebar{
position: relative;
min-height: 14px;
padding: 5px 35px 5px 10px;
overflow: hidden;

Expand All @@ -37,28 +38,32 @@

.qtip-titlebar + .qtip-content{ border-top-width: 0 !important; }

/* Default close button class */
.qtip-titlebar .qtip-close{
position: absolute;
right: 4px;
top: 50%;
margin-top: -9px;
/* Default close button class */
.qtip-close{
position: absolute;
right: -9px; top: -9px;

cursor: pointer;
outline: medium none;
cursor: pointer;
outline: medium none;

border-width: 1px;
border-style: solid;
border-color: transparent;
border-width: 1px;
border-style: solid;
border-color: transparent;
}

.qtip-titlebar .qtip-close{
right: 4px; top: 50%;
margin-top: -9px;
}

* html .qtip-titlebar .qtip-close{ top: 16px; } /* IE fix */

.qtip-titlebar .ui-icon,
.qtip-icon .ui-icon{
display: block;
text-indent: -1000em;
direction: ltr;
vertical-align: middle;
}

.qtip-icon, .qtip-icon .ui-icon{
Expand Down
11 changes: 5 additions & 6 deletions dist/jquery.qtip.js
View file
Expand Up @@ -226,7 +226,7 @@ function QTip(target, options, id, attr)
}

// Create button and setup attributes
elements.button.appendTo(elements.titlebar)
elements.button.appendTo(elements.titlebar || tooltip)
.attr('role', 'button')
.click(function(event) {
if(!tooltip.hasClass(disabledClass)) { self.hide(event); }
Expand Down Expand Up @@ -268,8 +268,7 @@ function QTip(target, options, id, attr)

function updateButton(button)
{
var elem = elements.button,
title = elements.title;
var elem = elements.button;

// Make sure tooltip is rendered and if not, return
if(!self.rendered) { return FALSE; }
Expand All @@ -278,9 +277,6 @@ function QTip(target, options, id, attr)
elem.remove();
}
else {
if(!title) {
createTitle();
}
createButton();
}
}
Expand Down Expand Up @@ -782,6 +778,9 @@ function QTip(target, options, id, attr)
if(!$.isFunction(title)) { updateTitle(title, FALSE); }
}

// Create button
else { createButton(); }

// Set proper rendered flag and update content if not a callback function (called in toggle)
if(!$.isFunction(text)) { updateContent(text, FALSE); }
self.rendered = TRUE;
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.qtip.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.qtip.min.js
View file

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions src/core.css
View file
Expand Up @@ -10,6 +10,8 @@

font-size: 10.5px;
line-height: 12px;

direction: ltr;
}

.qtip-content{
Expand All @@ -23,7 +25,6 @@

.qtip-titlebar{
position: relative;
min-height: 14px;
padding: 5px 35px 5px 10px;
overflow: hidden;

Expand All @@ -33,28 +34,32 @@

.qtip-titlebar + .qtip-content{ border-top-width: 0 !important; }

/* Default close button class */
.qtip-titlebar .qtip-close{
position: absolute;
right: 4px;
top: 50%;
margin-top: -9px;
/* Default close button class */
.qtip-close{
position: absolute;
right: -9px; top: -9px;

cursor: pointer;
outline: medium none;

cursor: pointer;
outline: medium none;
border-width: 1px;
border-style: solid;
border-color: transparent;
}

border-width: 1px;
border-style: solid;
border-color: transparent;
.qtip-titlebar .qtip-close{
right: 4px; top: 50%;
margin-top: -9px;
}

* html .qtip-titlebar .qtip-close{ top: 16px; } /* IE fix */

.qtip-titlebar .ui-icon,
.qtip-icon .ui-icon{
display: block;
text-indent: -1000em;
direction: ltr;
vertical-align: middle;
}

.qtip-icon, .qtip-icon .ui-icon{
Expand Down
11 changes: 5 additions & 6 deletions src/core.js
View file
Expand Up @@ -171,7 +171,7 @@ function QTip(target, options, id, attr)
}

// Create button and setup attributes
elements.button.appendTo(elements.titlebar)
elements.button.appendTo(elements.titlebar || tooltip)
.attr('role', 'button')
.click(function(event) {
if(!tooltip.hasClass(disabledClass)) { self.hide(event); }
Expand Down Expand Up @@ -213,8 +213,7 @@ function QTip(target, options, id, attr)

function updateButton(button)
{
var elem = elements.button,
title = elements.title;
var elem = elements.button;

// Make sure tooltip is rendered and if not, return
if(!self.rendered) { return FALSE; }
Expand All @@ -223,9 +222,6 @@ function QTip(target, options, id, attr)
elem.remove();
}
else {
if(!title) {
createTitle();
}
createButton();
}
}
Expand Down Expand Up @@ -727,6 +723,9 @@ function QTip(target, options, id, attr)
if(!$.isFunction(title)) { updateTitle(title, FALSE); }
}

// Create button
else { createButton(); }

// Set proper rendered flag and update content if not a callback function (called in toggle)
if(!$.isFunction(text)) { updateContent(text, FALSE); }
self.rendered = TRUE;
Expand Down

0 comments on commit 988d4ba

Please sign in to comment.