-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refs #2135 Few JS fixes for a cleaner UI/UX
- Loading branch information
Showing
5 changed files
with
111 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -86,7 +86,6 @@ | |
.jspArrow.jspDisabled | ||
{ | ||
cursor: default; | ||
background: #80808d; | ||
} | ||
|
||
.jspVerticalBar .jspArrow | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,84 +1,84 @@ | ||
/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net) | ||
* Licensed under the MIT License (LICENSE.txt). | ||
* | ||
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. | ||
* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. | ||
* Thanks to: Seamus Leahy for adding deltaX and deltaY | ||
* | ||
* Version: 3.0.6 | ||
* | ||
* Requires: 1.2.2+ | ||
*/ | ||
|
||
(function ($) { | ||
|
||
var types = ['DOMMouseScroll', 'mousewheel']; | ||
|
||
if ($.event.fixHooks) { | ||
for (var i = types.length; i;) { | ||
$.event.fixHooks[ types[--i] ] = $.event.mouseHooks; | ||
} | ||
} | ||
|
||
$.event.special.mousewheel = { | ||
setup: function () { | ||
if (this.addEventListener) { | ||
for (var i = types.length; i;) { | ||
this.addEventListener(types[--i], handler, false); | ||
} | ||
} else { | ||
this.onmousewheel = handler; | ||
} | ||
}, | ||
|
||
teardown: function () { | ||
if (this.removeEventListener) { | ||
for (var i = types.length; i;) { | ||
this.removeEventListener(types[--i], handler, false); | ||
} | ||
} else { | ||
this.onmousewheel = null; | ||
} | ||
} | ||
}; | ||
|
||
$.fn.extend({ | ||
mousewheel: function (fn) { | ||
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel"); | ||
}, | ||
|
||
unmousewheel: function (fn) { | ||
return this.unbind("mousewheel", fn); | ||
} | ||
}); | ||
|
||
|
||
function handler(event) { | ||
var orgEvent = event || window.event, args = [].slice.call(arguments, 1), delta = 0, returnValue = true, deltaX = 0, deltaY = 0; | ||
event = $.event.fix(orgEvent); | ||
event.type = "mousewheel"; | ||
|
||
// Old school scrollwheel delta | ||
if (orgEvent.wheelDelta) { delta = orgEvent.wheelDelta / 120; } | ||
if (orgEvent.detail) { delta = -orgEvent.detail / 3; } | ||
|
||
// New school multidimensional scroll (touchpads) deltas | ||
deltaY = delta; | ||
|
||
// Gecko | ||
if (orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS) { | ||
deltaY = 0; | ||
deltaX = -1 * delta; | ||
} | ||
|
||
// Webkit | ||
if (orgEvent.wheelDeltaY !== undefined) { deltaY = orgEvent.wheelDeltaY / 120; } | ||
if (orgEvent.wheelDeltaX !== undefined) { deltaX = -1 * orgEvent.wheelDeltaX / 120; } | ||
|
||
// Add event and delta to the front of the arguments | ||
args.unshift(event, delta, deltaX, deltaY); | ||
|
||
return ($.event.dispatch || $.event.handle).apply(this, args); | ||
} | ||
|
||
/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net) | ||
* Licensed under the MIT License (LICENSE.txt). | ||
* | ||
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. | ||
* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. | ||
* Thanks to: Seamus Leahy for adding deltaX and deltaY | ||
* | ||
* Version: 3.0.6 | ||
This comment has been minimized.
Sorry, something went wrong.
sgiehl
Member
|
||
* | ||
* Requires: 1.2.2+ | ||
*/ | ||
|
||
(function($) { | ||
|
||
var types = ['DOMMouseScroll', 'mousewheel']; | ||
|
||
if ($.event.fixHooks) { | ||
for ( var i=types.length; i; ) { | ||
$.event.fixHooks[ types[--i] ] = $.event.mouseHooks; | ||
} | ||
} | ||
|
||
$.event.special.mousewheel = { | ||
setup: function() { | ||
if ( this.addEventListener ) { | ||
for ( var i=types.length; i; ) { | ||
this.addEventListener( types[--i], handler, false ); | ||
} | ||
} else { | ||
this.onmousewheel = handler; | ||
} | ||
}, | ||
|
||
teardown: function() { | ||
if ( this.removeEventListener ) { | ||
for ( var i=types.length; i; ) { | ||
this.removeEventListener( types[--i], handler, false ); | ||
} | ||
} else { | ||
this.onmousewheel = null; | ||
} | ||
} | ||
}; | ||
|
||
$.fn.extend({ | ||
mousewheel: function(fn) { | ||
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel"); | ||
}, | ||
|
||
unmousewheel: function(fn) { | ||
return this.unbind("mousewheel", fn); | ||
} | ||
}); | ||
|
||
|
||
function handler(event) { | ||
var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0; | ||
event = $.event.fix(orgEvent); | ||
event.type = "mousewheel"; | ||
|
||
// Old school scrollwheel delta | ||
if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; } | ||
if ( orgEvent.detail ) { delta = -orgEvent.detail/3; } | ||
|
||
// New school multidimensional scroll (touchpads) deltas | ||
deltaY = delta; | ||
|
||
// Gecko | ||
if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) { | ||
deltaY = 0; | ||
deltaX = -1*delta; | ||
} | ||
|
||
// Webkit | ||
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; } | ||
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; } | ||
|
||
// Add event and delta to the front of the arguments | ||
args.unshift(event, delta, deltaX, deltaY); | ||
|
||
return ($.event.dispatch || $.event.handle).apply(this, args); | ||
} | ||
|
||
})(jQuery); |
did you forget to add that css file (and the mwheelIntent.js) to git?