Merge lp:~malept/qtip/xhtml-mode-fixes into lp:qtip/2.0

Proposed by Mark Lee
Status: Merged
Merged at revision: 166
Proposed branch: lp:~malept/qtip/xhtml-mode-fixes
Merge into: lp:qtip/2.0
Diff against target: None lines
To merge this branch: bzr merge lp:~malept/qtip/xhtml-mode-fixes
Reviewer Review Type Date Requested Status
Craig Thompson Pending
Review via email: mp+11937@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mark Lee (malept) wrote :

See my comment in bug 412342.

Tested in Gecko 1.8.x (AKA Firefox 2.x) and Safari 4. Not tested in Firefox 3 and later because their Accept: HTTP request header prefers text/html over application/xhtml+xml.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jquery.qtip.border.js'
2--- jquery.qtip.border.js 2009-09-13 16:47:26 +0000
3+++ jquery.qtip.border.js 2009-09-16 23:25:09 +0000
4@@ -63,7 +63,7 @@
5 // Create between corners elements
6 betweenWidth = self.getDimensions().width - (Math.max(width, radius) * 2);
7 betweenCorners = '<div class="qtip-betweenCorners" style="height:'+radius+'px; width:'+betweenWidth+'px; ' +
8- 'overflow:hidden; background-color:'+color+'; line-height:0.1px; font-size:1px;">';
9+ 'overflow:hidden; background-color:'+color+'; line-height:0.1px; font-size:1px;"/>';
10
11 // Create top border container
12 borderTop = '<div class="qtip-borderTop" dir="ltr" style="height:'+radius+'px; ' +
13@@ -135,4 +135,4 @@
14
15 return borders;
16 };
17-})(jQuery);
18\ No newline at end of file
19+})(jQuery);
20
21=== modified file 'jquery.qtip.js'
22--- jquery.qtip.js 2009-09-15 20:12:35 +0000
23+++ jquery.qtip.js 2009-09-16 23:21:18 +0000
24@@ -636,7 +636,7 @@
25
26 // Create initial tooltip elements
27 self.elements.tooltip = '<div qtip="'+self.id+'" ' +
28- ' class="qtip '+(self.options.style.classes.tooltip || self.options.style)+'"' +
29+ ' class="qtip '+(self.options.style.classes.tooltip || self.options.style)+'" ' +
30 ' style="display:none; -moz-border-radius:0; -webkit-border-radius:0; border-radius:0;' +
31 ' position:'+self.options.position.type+';">' +
32 ' <div class="qtip-wrapper" style="position:relative; overflow:hidden; text-align:left;">' +
33@@ -1706,4 +1706,4 @@
34 $.fn.qtip.styles.css.classes = $.fn.qtip.styles.defaults.classes;
35 $.fn.qtip.styles.css.classes.tooltip = 'qtip-css';
36
37-})(jQuery);
38\ No newline at end of file
39+})(jQuery);

Subscribers

People subscribed via source and target branches