jenkins-bot has submitted this change and it was merged.
Change subject: Adds the capacity to zoom by mouse wheel
......................................................................
Adds the capacity to zoom by mouse wheel
Change-Id: Ia3e0cdf1e28dfb3a6153f32d707864e5e88a46c6
---
M ProofreadPage.php
A modules/jquery/jquery.mousewheel.js
M modules/jquery/jquery.prpZoom.js
3 files changed, 165 insertions(+), 13 deletions(-)
Approvals:
Tpt: Looks good to me, approved
Rtdwivedi: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/ProofreadPage.php b/ProofreadPage.php
index f32e9a1..2e62ef1 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -108,9 +108,12 @@
'remoteExtPath' => 'ProofreadPage/modules'
);
$wgResourceModules += array(
+ 'jquery.mousewheel' => $prpResourceTemplate + array(
+ 'scripts' => 'jquery/jquery.mousewheel.js'
+ ),
'jquery.prpZoom' => $prpResourceTemplate + array(
'scripts' => 'jquery/jquery.prpZoom.js',
- 'dependencies' => array( 'jquery.ui.widget',
'jquery.ui.draggable' )
+ 'dependencies' => array( 'jquery.ui.widget',
'jquery.ui.draggable', 'jquery.mousewheel' )
),
'ext.proofreadpage.base' => $prpResourceTemplate + array(
'styles' => 'ext.proofreadpage.base.css',
diff --git a/modules/jquery/jquery.mousewheel.js
b/modules/jquery/jquery.mousewheel.js
new file mode 100755
index 0000000..ad013e9
--- /dev/null
+++ b/modules/jquery/jquery.mousewheel.js
@@ -0,0 +1,129 @@
+/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
+ * Licensed under the MIT License.
+ *
+ * Version: 3.1.6
+ *
+ * Requires: jQuery 1.2.2+
+ */
+
+(function ($) {
+
+ var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll',
'MozMousePixelScroll'],
+ toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
+ ['wheel'] : ['mousewheel', 'DomMouseScroll',
'MozMousePixelScroll'],
+ slice = Array.prototype.slice,
+ nullLowestDeltaTimeout, lowestDelta;
+
+ if ( $.event.fixHooks ) {
+ for ( var i = toFix.length; i; ) {
+ $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
+ }
+ }
+
+ $.event.special.mousewheel = {
+ version: '3.1.6',
+
+ setup: function() {
+ if ( this.addEventListener ) {
+ for ( var i = toBind.length; i; ) {
+ this.addEventListener( toBind[--i], handler, false );
+ }
+ } else {
+ this.onmousewheel = handler;
+ }
+ },
+
+ teardown: function() {
+ if ( this.removeEventListener ) {
+ for ( var i = toBind.length; i; ) {
+ this.removeEventListener( toBind[--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,
+ deltaX = 0,
+ deltaY = 0,
+ absDelta = 0;
+ event = $.event.fix(orgEvent);
+ event.type = 'mousewheel';
+
+ // Old school scrollwheel delta
+ if ( 'detail' in orgEvent ) { deltaY = orgEvent.detail * -1;
}
+ if ( 'wheelDelta' in orgEvent ) { deltaY = orgEvent.wheelDelta;
}
+ if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;
}
+ if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1;
}
+
+ // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
+ if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS
) {
+ deltaX = deltaY * -1;
+ deltaY = 0;
+ }
+
+ // Set delta to be deltaY or deltaX if deltaY is 0 for backwards
compatabilitiy
+ delta = deltaY === 0 ? deltaX : deltaY;
+
+ // New school wheel delta (wheel event)
+ if ( 'deltaY' in orgEvent ) {
+ deltaY = orgEvent.deltaY * -1;
+ delta = deltaY;
+ }
+ if ( 'deltaX' in orgEvent ) {
+ deltaX = orgEvent.deltaX;
+ if ( deltaY === 0 ) { delta = deltaX * -1; }
+ }
+
+ // No change actually happened, no reason to go any further
+ if ( deltaY === 0 && deltaX === 0 ) { return; }
+
+ // Store lowest absolute delta to normalize the delta values
+ absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
+ if ( !lowestDelta || absDelta < lowestDelta ) {
+ lowestDelta = absDelta;
+ }
+
+ // Get a whole, normalized value for the deltas
+ delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta);
+ deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
+ deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
+
+ // Add information to the event object
+ event.deltaX = deltaX;
+ event.deltaY = deltaY;
+ event.deltaFactor = lowestDelta;
+
+ // Add event and delta to the front of the arguments
+ args.unshift(event, delta, deltaX, deltaY);
+
+ // Clearout lowestDelta after sometime to better
+ // handle multiple device types that give different
+ // a different lowestDelta
+ // Ex: trackpad = 3 and mouse wheel = 120
+ if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
+ nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
+
+ return ($.event.dispatch || $.event.handle).apply(this, args);
+ }
+
+ function nullLowestDelta() {
+ lowestDelta = null;
+ }
+
+})(jQuery);
diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index c01b71a..cbde94c 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -24,8 +24,8 @@
$.widget( 'mw.prpZoom', {
options: {
- zoomStep: 4,
- moveStep: 4,
+ zoomStep: 6,
+ moveStep: 6,
animationDuration: 200
},
@@ -90,6 +90,22 @@
} );
this.reset();
+
+ var element = this.element;
+ $.each( this._events, function( event, handler ) {
+ element.bind( event, handler );
+ } );
+ },
+
+ _events: {
+ //depends on jquery.mousewheel.js
+ 'mousewheel': function( event ) {
+ if( event.deltaY > 0 ) {
+ $( this ).prpZoom( 'zoomOut' );
+ } else if( event.deltaY < 0 ) {
+ $( this ).prpZoom( 'zoomIn' );
+ }
+ }
},
reset: function() {
@@ -102,20 +118,19 @@
},
zoomIn: function() {
- var position = this._getPosition();
- position.left -= this.zoomStep.width;
- position.top -= this.zoomStep.height;
- position.width += 2 * this.zoomStep.width;
- position.height += 2 * this.zoomStep.height;
- this._applyPosition( position );
+ this._zoom( 1 );
},
zoomOut: function() {
+ this._zoom( -1 );
+ },
+
+ _zoom: function( proportion ) {
var position = this._getPosition();
- position.left += this.zoomStep.width;
- position.top += this.zoomStep.height;
- position.width -= 2 * this.zoomStep.width;
- position.height -= 2 * this.zoomStep.height;
+ position.left -= proportion * this.zoomStep.width;
+ position.top -= proportion * this.zoomStep.height;
+ position.width += 2 * proportion * this.zoomStep.width;
+ position.height += 2 * proportion *
this.zoomStep.height;
this._applyPosition( position );
},
@@ -160,6 +175,11 @@
cursor: ''
} );
+ var element = this.element;
+ $.each( this._events, function( event, handler ) {
+ element.unbind( event, handler );
+ } );
+
$.Widget.prototype.destroy.call( this );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/99428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3e0cdf1e28dfb3a6153f32d707864e5e88a46c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <[email protected]>
Gerrit-Reviewer: Rtdwivedi <[email protected]>
Gerrit-Reviewer: Tpt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
