jenkins-bot has submitted this change and it was merged. Change subject: Added zoom buttons to the toolbar. ......................................................................
Added zoom buttons to the toolbar. Change-Id: I26d017b1f4556efb83eeb1aa924e1b7e72118dfe --- M modules/ext.proofreadpage.base/ext.proofreadpage.base.css M modules/ext.proofreadpage.page/ext.proofreadpage.page.js A modules/ext.proofreadpage.page/images/Button_pan_down.png A modules/ext.proofreadpage.page/images/Button_pan_left.png A modules/ext.proofreadpage.page/images/Button_pan_right.png A modules/ext.proofreadpage.page/images/Button_pan_up.png M modules/jquery.panZoom/jquery.panZoom.js 7 files changed, 131 insertions(+), 18 deletions(-) Approvals: Tpt: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.proofreadpage.base/ext.proofreadpage.base.css b/modules/ext.proofreadpage.base/ext.proofreadpage.base.css index cf8d9ff..bcb455b 100644 --- a/modules/ext.proofreadpage.base/ext.proofreadpage.base.css +++ b/modules/ext.proofreadpage.base/ext.proofreadpage.base.css @@ -26,12 +26,14 @@ width: 50%; vertical-align: top; overflow: hidden; + position: absolute; } .prp-page-content { display: table-cell; width: 50%; padding-right: 0.5em; vertical-align: top; + position: relative; } #prp-page-qualityheader { width: 100%; diff --git a/modules/ext.proofreadpage.page/ext.proofreadpage.page.js b/modules/ext.proofreadpage.page/ext.proofreadpage.page.js index c3a3d32..756dec8 100644 --- a/modules/ext.proofreadpage.page/ext.proofreadpage.page.js +++ b/modules/ext.proofreadpage.page/ext.proofreadpage.page.js @@ -26,10 +26,137 @@ } ); } ( jQuery, mediaWiki ) ); +function initPanZoom() { + $('.prp-page-image img').panZoom({ + 'debug' : false + }); +} + function prStartup() { jQuery( function() { - prInitTabs(); - } ); + prAddButtons(); + initPanZoom(); + }); +} + +function prAddButtons() { + + if( !proofreadPageIsEdit ) { + return; + } + var tools = { + 'section': 'proofreadpage-tools', + 'groups': { + 'zoom': { + 'label': mw.msg( 'proofreadpage-group-zoom' ), + 'tools': { + 'zoom-in': { + label: mw.msg( 'proofreadpage-button-zoom-in-label' ), + type: 'button', + icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/modules/ext.proofreadpage.page/images/Button_zoom_in.png', + action: { + type: 'callback', + execute: function() { + $( '.prp-page-image img' ).panZoom('zoomIn'); + } + } + }, + 'zoom-out': { + label: mw.msg( 'proofreadpage-button-zoom-out-label' ), + type: 'button', + icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/modules/ext.proofreadpage.page/images/Button_zoom_out.png', + action: { + type: 'callback', + execute: function() { + $( '.prp-page-image img' ).panZoom('zoomOut'); + } + } + }, + 'reset-zoom': { + label: mw.msg( 'proofreadpage-button-reset-zoom-label' ), + type: 'button', + icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/modules/ext.proofreadpage.page/images/Button_examine.png', + action: { + type: 'callback', + execute: function() { + $( '.prp-page-image img' ).panZoom('fit'); + } + } + }, + 'pan-up': { + label: mw.msg( 'proofreadpage-button-pan-up-label' ), + type: 'button', + icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/modules/ext.proofreadpage.page/images/Button_pan_up.png', + action: { + type: 'callback', + execute: function() { + $( '.prp-page-image img' ).panZoom('panUp'); + } + } + }, + 'pan-down': { + label: mw.msg( 'proofreadpage-button-pan-down-label' ), + type: 'button', + icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/modules/ext.proofreadpage.page/images/Button_pan_down.png', + action: { + type: 'callback', + execute: function() { + $( '.prp-page-image img' ).panZoom('panDown'); + } + } + }, + 'pan-left': { + label: mw.msg( 'proofreadpage-button-pan-left-label' ), + type: 'button', + icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/modules/ext.proofreadpage.page/images/Button_pan_left.png', + action: { + type: 'callback', + execute: function() { + $( '.prp-page-image img' ).panZoom('panLeft'); + } + } + }, + 'pan-right': { + label: mw.msg( 'proofreadpage-button-pan-right-label' ), + type: 'button', + icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/modules/ext.proofreadpage.page/images/Button_pan_right.png', + action: { + type: 'callback', + execute: function() { + $( '.prp-page-image img' ).panZoom('panRight'); + } + } + } + } + }, + } + }; + + var $edit = $( '#wpTextbox1' ); + if( mw.user.options.get('usebetatoolbar') ) { + mw.loader.using( 'ext.wikiEditor.toolbar', function() { + $edit.wikiEditor( 'addToToolbar', { + 'sections': { + 'proofreadpage-tools': { + 'type': 'toolbar', + 'label': mw.msg( 'proofreadpage-section-tools' ) + } + } + } ) + .wikiEditor( 'addToToolbar', tools); + }); + } else { + $.each( tools.groups, function( group, list ) { + $.each( list.tools, function( id, def ) { + mw.toolbar.addButton( { + imageFile: def.icon, + imageId: 'mw-editbutton-' + id, + speedTip: def.label + } ); + $( '#mw-editbutton-' + id ).click( def.action.execute ); + } ); + } ); + } } if ( mw.user.options.get( 'usebetatoolbar' ) && jQuery.inArray( 'ext.wikiEditor.toolbar', mw.loader.getModuleNames() ) > -1 ) { diff --git a/modules/ext.proofreadpage.page/images/Button_pan_down.png b/modules/ext.proofreadpage.page/images/Button_pan_down.png new file mode 100644 index 0000000..2c4e279 --- /dev/null +++ b/modules/ext.proofreadpage.page/images/Button_pan_down.png Binary files differ diff --git a/modules/ext.proofreadpage.page/images/Button_pan_left.png b/modules/ext.proofreadpage.page/images/Button_pan_left.png new file mode 100644 index 0000000..5dc6967 --- /dev/null +++ b/modules/ext.proofreadpage.page/images/Button_pan_left.png Binary files differ diff --git a/modules/ext.proofreadpage.page/images/Button_pan_right.png b/modules/ext.proofreadpage.page/images/Button_pan_right.png new file mode 100644 index 0000000..b1a1819 --- /dev/null +++ b/modules/ext.proofreadpage.page/images/Button_pan_right.png Binary files differ diff --git a/modules/ext.proofreadpage.page/images/Button_pan_up.png b/modules/ext.proofreadpage.page/images/Button_pan_up.png new file mode 100644 index 0000000..1ebb193 --- /dev/null +++ b/modules/ext.proofreadpage.page/images/Button_pan_up.png Binary files differ diff --git a/modules/jquery.panZoom/jquery.panZoom.js b/modules/jquery.panZoom/jquery.panZoom.js index 4f7ebb4..ee69628 100644 --- a/modules/jquery.panZoom/jquery.panZoom.js +++ b/modules/jquery.panZoom/jquery.panZoom.js @@ -482,19 +482,3 @@ } })( jQuery ); - -function initPanZoom() { - $('.prp-page-image img').panZoom({ - 'zoomIn' : $('#zoomin'), - 'zoomOut' : $('#zoomout'), - 'panUp' : $('#panup'), - 'panDown' : $('#pandown'), - 'panLeft' : $('#panleft'), - 'panRight' : $('#panright'), - 'debug' : true - }); -} - -( function( $, mw ) { - initPanZoom(); -} ( jQuery, mediaWiki ) ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/85205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26d017b1f4556efb83eeb1aa924e1b7e72118dfe Gerrit-PatchSet: 8 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: pagePagesRefactoring Gerrit-Owner: Rtdwivedi <ellydwivedi2...@gmail.com> Gerrit-Reviewer: Tpt <thoma...@hotmail.fr> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits