commit/galaxy-central: jgoecks: Remove tipsy because it has been replaced by bootstrap tooltips.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d966d09f77d9/ Changeset: d966d09f77d9 User: jgoecks Date: 2013-10-16 19:03:47 Summary: Remove tipsy because it has been replaced by bootstrap tooltips. Affected #: 4 files diff -r 2d78abc47928918a14f56711657696724cd9af72 -r d966d09f77d9a3fed4401eb1e5e64d17a57d684e static/scripts/galaxy.base.js --- a/static/scripts/galaxy.base.js +++ b/static/scripts/galaxy.base.js @@ -666,11 +666,6 @@ }); // Tooltips - // if ( $.fn.tipsy ) { - // // FIXME: tipsy gravity cannot be updated, so need classes that specify N/S gravity and - // // initialize each separately. - // $(".tooltip").tipsy( { gravity: 's' } ); - // } if ( $.fn.tooltip ) { // Put tooltips below items in panel header so that they do not overlap masthead. $(".unified-panel-header [title]").tooltip( { placement: 'bottom' } ); diff -r 2d78abc47928918a14f56711657696724cd9af72 -r d966d09f77d9a3fed4401eb1e5e64d17a57d684e static/scripts/libs/jquery/jquery.tipsy.js --- a/static/scripts/libs/jquery/jquery.tipsy.js +++ /dev/null @@ -1,172 +0,0 @@ -/* NOTE: MODIFIED FROM ORIGINAL! */ - -(function($) { - function fixTitle($ele) { - if ($ele.attr('title') || typeof($ele.attr('original-title')) != 'string') { - $ele.attr('original-title', $ele.attr('title') || '').removeAttr('title'); - } - } - - $.fn.tipsy = function(options) { - - options = $.extend({}, $.fn.tipsy.defaults, options); - - return this.each(function() { - - fixTitle($(this)); - var opts = $.fn.tipsy.elementOptions(this, options); - var timeout = null; - - $(this).hover(function() { - var self = this; - timeout = setTimeout(function() { - $.data(self, 'cancel.tipsy', true); - - var tip = $.data(self, 'active.tipsy'); - if (!tip) { - tip = $('<div class="tipsy"><div class="tipsy-inner"/></div>'); - tip.css({position: 'absolute', zIndex: 100000}); - $.data(self, 'active.tipsy', tip); - } - - fixTitle($(self)); - - var title; - if (typeof opts.title == 'string') { - title = $(self).attr(opts.title == 'title' ? 'original-title' : opts.title); - } else if (typeof opts.title == 'function') { - title = opts.title.call(self); - } - - tip.find('.tipsy-inner')[opts.html ? 'html' : 'text'](title || opts.fallback); - - - var pos = $.extend({}, $(self).offset(), {width: self.offsetWidth, height: self.offsetHeight}); - tip.get(0).className = 'tipsy'; // reset classname in case of dynamic gravity - tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).appendTo(document.body); - - tip.css( { width: tip.width() + 1, height: tip.height() } ); - - var actualWidth = tip[0].offsetWidth, actualHeight = tip[0].offsetHeight; - var gravity = (typeof opts.gravity == 'function') ? opts.gravity.call(self) : opts.gravity; - - var top, left; - switch (gravity.charAt(0)) { - case 'n': - top = pos.top + pos.height; - left = pos.left + pos.width / 2 - actualWidth / 2; - tip.addClass('tipsy-north'); - break; - case 's': - top = pos.top - actualHeight; - left = pos.left + pos.width / 2 - actualWidth / 2; - tip.addClass('tipsy-south'); - break; - case 'e': - top = pos.top + pos.height / 2 - actualHeight / 2; - left = pos.left - actualWidth; - tip.addClass('tipsy-east'); - break; - case 'w': - top = pos.top + pos.height / 2 - actualHeight / 2; - left = pos.left + pos.width; - tip.addClass('tipsy-west'); - break; - } - // Shift if off screen - var w = $(window); - - // If off the top of the screen, flip - if ( top < w.scrollTop() && gravity.charAt( 0 ) == 's' ) { - top = pos.top + pos.height; - gravity = 'north'; - tip.removeClass('tipsy-south').addClass('tipsy-north'); - } - - // If off bottom, just shift for now - top = Math.min( top, w.scrollTop() + w.height() - tip.outerHeight() ); - - - // Shift left or right - var left_shift = 0; - if ( left < w.scrollLeft() ) { - left_shift = left - w.scrollLeft(); - } - var t = w.scrollLeft() + w.width() - tip.outerWidth(); - if ( left > t ) { - left_shift = left - t; - } - - left -= left_shift; - - tip.css( { left: left, top: top } ); - - // Shift background to center over element (not implemented for east/west) - switch (gravity.charAt(0)) { - case 'n': - tip.css( 'background-position', - ( 250 - tip.outerWidth() / 2 ) + left_shift + "px top" ); - break; - case 's': - tip.css( 'background-position', - ( 250 - tip.outerWidth() / 2 ) + left_shift + "px bottom" ); - break; - case 'e': - break; - case 'w': - break; - } - - if (opts.fade) { - tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: opts.opacity}); - } else { - tip.css({visibility: 'visible', opacity: opts.opacity}); - } - }, opts.delayIn); - - }, function() { - $.data(this, 'cancel.tipsy', false); - var self = this; - clearTimeout(timeout); - setTimeout(function() { - if ($.data(this, 'cancel.tipsy')) { return; } - var tip = $.data(self, 'active.tipsy'); - if (opts.fade) { - tip.stop().fadeOut(function() { $(this).remove(); }); - } else if (tip) { - tip.remove(); - } - }, opts.delayOut); - - }); - - }); - - }; - - // Overwrite this method to provide options on a per-element basis. - // For example, you could store the gravity in a 'tipsy-gravity' attribute: - // return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' }); - // (remember - do not modify 'options' in place!) - $.fn.tipsy.elementOptions = function(ele, options) { - return $.metadata ? $.extend({}, options, $(ele).metadata()) : options; - }; - - $.fn.tipsy.defaults = { - delayIn: 0, - delayOut: 100, - fade: false, - fallback: '', - gravity: 'n', - html: false, - opacity: 0.8, - title: 'title' - }; - - $.fn.tipsy.autoNS = function() { - return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n'; - }; - - $.fn.tipsy.autoWE = function() { - return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w'; - }; - -})(jQuery); diff -r 2d78abc47928918a14f56711657696724cd9af72 -r d966d09f77d9a3fed4401eb1e5e64d17a57d684e static/scripts/packed/libs/jquery/jquery.tipsy.js --- a/static/scripts/packed/libs/jquery/jquery.tipsy.js +++ /dev/null @@ -1,1 +0,0 @@ -(function(b){function a(c){if(c.attr("title")||typeof(c.attr("original-title"))!="string"){c.attr("original-title",c.attr("title")||"").removeAttr("title")}}b.fn.tipsy=function(c){c=b.extend({},b.fn.tipsy.defaults,c);return this.each(function(){a(b(this));var d=b.fn.tipsy.elementOptions(this,c);var e=null;b(this).hover(function(){var f=this;e=setTimeout(function(){b.data(f,"cancel.tipsy",true);var o=b.data(f,"active.tipsy");if(!o){o=b('<div class="tipsy"><div class="tipsy-inner"/></div>');o.css({position:"absolute",zIndex:100000});b.data(f,"active.tipsy",o)}a(b(f));var m;if(typeof d.title=="string"){m=b(f).attr(d.title=="title"?"original-title":d.title)}else{if(typeof d.title=="function"){m=d.title.call(f)}}o.find(".tipsy-inner")[d.html?"html":"text"](m||d.fallback);var k=b.extend({},b(f).offset(),{width:f.offsetWidth,height:f.offsetHeight});o.get(0).className="tipsy";o.remove().css({top:0,left:0,visibility:"hidden",display:"block"}).appendTo(document.body);o.css({width:o.width()+1,height:o.height()});var h=o[0].offsetWidth,j=o[0].offsetHeight;var q=(typeof d.gravity=="function")?d.gravity.call(f):d.gravity;var l,i;switch(q.charAt(0)){case"n":l=k.top+k.height;i=k.left+k.width/2-h/2;o.addClass("tipsy-north");break;case"s":l=k.top-j;i=k.left+k.width/2-h/2;o.addClass("tipsy-south");break;case"e":l=k.top+k.height/2-j/2;i=k.left-h;o.addClass("tipsy-east");break;case"w":l=k.top+k.height/2-j/2;i=k.left+k.width;o.addClass("tipsy-west");break}var n=b(window);if(l<n.scrollTop()&&q.charAt(0)=="s"){l=k.top+k.height;q="north";o.removeClass("tipsy-south").addClass("tipsy-north")}l=Math.min(l,n.scrollTop()+n.height()-o.outerHeight());var g=0;if(i<n.scrollLeft()){g=i-n.scrollLeft()}var p=n.scrollLeft()+n.width()-o.outerWidth();if(i>p){g=i-p}i-=g;o.css({left:i,top:l});switch(q.charAt(0)){case"n":o.css("background-position",-(250-o.outerWidth()/2)+g+"px top");break;case"s":o.css("background-position",-(250-o.outerWidth()/2)+g+"px bottom");break;case"e":break;case"w":break}if(d.fade){o.stop().css({opacity:0,display:"block",visibility:"visible"}).animate({opacity:d.opacity})}else{o.css({visibility:"visible",opacity:d.opacity})}},d.delayIn)},function(){b.data(this,"cancel.tipsy",false);var f=this;clearTimeout(e);setTimeout(function(){if(b.data(this,"cancel.tipsy")){return}var g=b.data(f,"active.tipsy");if(d.fade){g.stop().fadeOut(function(){b(this).remove()})}else{if(g){g.remove()}}},d.delayOut)})})};b.fn.tipsy.elementOptions=function(d,c){return b.metadata?b.extend({},c,b(d).metadata()):c};b.fn.tipsy.defaults={delayIn:0,delayOut:100,fade:false,fallback:"",gravity:"n",html:false,opacity:0.8,title:"title"};b.fn.tipsy.autoNS=function(){return b(this).offset().top>(b(document).scrollTop()+b(window).height()/2)?"s":"n"};b.fn.tipsy.autoWE=function(){return b(this).offset().left>(b(document).scrollLeft()+b(window).width()/2)?"e":"w"}})(jQuery); \ No newline at end of file diff -r 2d78abc47928918a14f56711657696724cd9af72 -r d966d09f77d9a3fed4401eb1e5e64d17a57d684e static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -292,7 +292,7 @@ title: "Remove", css_class: "remove-icon", on_click_fn: function(drawable) { - // Tipsy for remove icon must be deleted when drawable is deleted. + // Tooltip for remove icon must be deleted when drawable is deleted. $(".tooltip").remove(); drawable.remove(); } @@ -642,7 +642,7 @@ title: "Filters", css_class: "filters-icon", on_click_fn: function(group) { - // TODO: update tipsy text. + // TODO: update Tooltip text. if (group.filters_manager.visible()) { // Hiding filters. group.filters_manager.clear_filters(); @@ -2409,7 +2409,7 @@ title: "Filters", css_class: "filters-icon", on_click_fn: function(drawable) { - // TODO: update tipsy text. + // TODO: update Tooltip text. if (drawable.filters_manager.visible()) { drawable.filters_manager.clear_filters(); } @@ -2425,7 +2425,7 @@ title: "Tool", css_class: "hammer", on_click_fn: function(track) { - // TODO: update tipsy text. + // TODO: update Tooltip text. track.tool.toggle(); Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply＠bitbucket.org