|
33 | 33 | var presto = /Opera\//.test(navigator.userAgent); |
34 | 34 | var safari = /Apple Computer/.test(navigator.vendor); |
35 | 35 | var khtml = /KHTML\//.test(navigator.userAgent); |
36 | | - var mac_geLion = /Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent); |
37 | 36 | var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent); |
38 | 37 | var phantom = /PhantomJS/.test(navigator.userAgent); |
39 | 38 |
|
|
437 | 436 | d.gutterFiller.style.width = d.gutters.offsetWidth + "px"; |
438 | 437 | } else d.gutterFiller.style.display = ""; |
439 | 438 |
|
440 | | - if (mac_geLion && scrollbarWidth(d.measure) === 0) { |
441 | | - d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px"; |
442 | | - var barMouseDown = function(e) { |
443 | | - if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH) |
444 | | - operation(cm, onMouseDown)(e); |
445 | | - }; |
446 | | - on(d.scrollbarV, "mousedown", barMouseDown); |
447 | | - on(d.scrollbarH, "mousedown", barMouseDown); |
| 439 | + if (!cm.state.checkedOverlayScrollbar && measure.clientHeight > 0) { |
| 440 | + if (scrollbarWidth(d.measure) === 0) { |
| 441 | + var w = mac && !mac_geMountainLion ? "12px" : "18px"; |
| 442 | + d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = w; |
| 443 | + var barMouseDown = function(e) { |
| 444 | + if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH) |
| 445 | + operation(cm, onMouseDown)(e); |
| 446 | + }; |
| 447 | + on(d.scrollbarV, "mousedown", barMouseDown); |
| 448 | + on(d.scrollbarH, "mousedown", barMouseDown); |
| 449 | + } |
| 450 | + cm.state.checkedOverlayScrollbar = true; |
448 | 451 | } |
449 | 452 | } |
450 | 453 |
|
|
0 commit comments