Skip to content

Commit 75e2803

Browse files
committed
removing tooltip for multiple line selection
fixes #1658
1 parent 89fea41 commit 75e2803

File tree

2 files changed

+4
-48
lines changed

2 files changed

+4
-48
lines changed

src/org/opensolaris/opengrok/web/Scripts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public String toHtml() {
125125
SCRIPTS.put("jquery-tablesorter", new FileScript("js/jquery-tablesorter-2.26.6.min.js", 12));
126126
SCRIPTS.put("tablesorter-parsers", new FileScript("js/tablesorter-parsers-0.0.1.js", 13));
127127
SCRIPTS.put("searchable-option-list", new FileScript("js/searchable-option-list-2.0.3.min.js", 14));
128-
SCRIPTS.put("utils", new FileScript("js/utils-0.0.10.js", 15));
128+
SCRIPTS.put("utils", new FileScript("js/utils-0.0.11.js", 15));
129129
SCRIPTS.put("repos", new FileScript("js/repos-0.0.1.js", 20));
130130
SCRIPTS.put("diff", new FileScript("js/diff-0.0.1.js", 20));
131131
}

web/js/utils-0.0.10.js renamed to web/js/utils-0.0.11.js

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
})(window, window.jQuery);
165165

166166
(function(window, $) {
167-
168167
var hash = function () {
169168
var inner = {
170169
self: this,
@@ -176,11 +175,9 @@
176175
clickSelector: '{parent} a.l, {parent} a.hl',
177176
parent: 'div#src',
178177
autoScroll: true,
179-
autoScrollDuration: 500,
180-
tooltip: true
178+
autoScrollDuration: 500
181179
},
182180
options: {},
183-
$tooltip: null,
184181
bindClickHandler: function() {
185182
$(inner.format(inner.options.clickSelector, {parent: inner.options.parent})).click (function (e){
186183
if(e.shiftKey) {
@@ -293,60 +290,19 @@
293290
}
294291
}
295292
},
296-
tooltip: function() {
297-
if(!inner.options.tooltip)
298-
return
299-
300-
inner.$tooltip = inner.$tooltip ?
301-
inner.$tooltip :
302-
$("<div>Did you know? You can select a range of lines<br /> by clicking on the other while holding shift key.</div>")
303-
.appendTo($("body"))
304-
.hide()
305-
.addClass("tooltip")
306-
.addClass("diff_navigation_style")
307-
308-
309-
$(inner.format(inner.options.clickSelector, {parent: inner.options.parent}))
310-
.click(function(e) {
311-
if(!inner.options.tooltip)
312-
return
313-
// show box
314-
var $el = $(this)
315-
setTimeout(function () {
316-
inner.$tooltip
317-
.show()
318-
.stop()
319-
.fadeIn()
320-
.fadeOut( 5000 )
321-
.offset({
322-
top: $el.offset().top + 20,
323-
left: $el.offset().left + $el.width() + 5
324-
});
325-
}, 300);
326-
inner.options.tooltip = false;
327-
})
328-
}
329293
} // inner
330294

331295
this.init = function (options) {
332-
if ( inner.initialized ) {
296+
if (inner.initialized) {
333297
return this;
334298
}
335-
336299
inner.options = $.extend(inner.defaults, options, {})
337-
300+
338301
$(window).on("hashchange", inner.reload)
339-
340302
inner.reload()
341-
342-
inner.tooltip()
343-
344303
inner.bindClickHandler()
345-
346304
inner.scroll()
347-
348305
inner.initialized = true
349-
350306
return this;
351307
}
352308
}

0 commit comments

Comments
 (0)