r92314 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r92313‎ | r92314 | r92315 >
Date:21:46, 15 July 2011
Author:brion
Status:ok
Tags:
Comment:
Followup to r92311: fix ProofreadPath to use wgExtensionAssetsPath; removed a stray console debug line
Modified paths:
  • /trunk/extensions/ProofreadPage/ProofreadPage_body.php (modified) (history)
  • /trunk/extensions/ProofreadPage/proofread.js (modified) (history)

Diff [purge]

Index: trunk/extensions/ProofreadPage/ProofreadPage_body.php
@@ -33,7 +33,7 @@
3434 * Constructor
3535 */
3636 function __construct() {
37 - global $wgHooks, $wgScriptPath;
 37+ global $wgHooks, $wgExtensionAssetsPath;
3838 $wgHooks['ParserFirstCallInit'][] = array( $this, 'parserFirstCallInit' );
3939 $wgHooks['BeforePageDisplay'][] = array( &$this, 'beforePageDisplay' );
4040 $wgHooks['GetLinkColours'][] = array( &$this, 'getLinkColoursHook' );
@@ -53,7 +53,7 @@
5454 $this->index_namespace = preg_quote( wfMsgForContent( 'proofreadpage_index_namespace' ), '/' );
5555
5656 /* Navigation icons */
57 - $path = $wgScriptPath . '/extensions/ProofreadPage';
 57+ $path = $wgExtensionAssetsPath . '/ProofreadPage';
5858 $this->prev_icon = Html::element( 'img', array( 'src' => $path . '/leftarrow.png',
5959 'alt' => wfMsg( 'proofreadpage_prevpage' ),
6060 'width' => 15, 'height' => 15 ) );
Index: trunk/extensions/ProofreadPage/proofread.js
@@ -776,7 +776,7 @@
777777 'zoom-in': {
778778 label: mw.msg( 'proofreadpage-button-zoom-in-label' ),
779779 type: 'button',
780 - icon: mw.config.get( 'wgScriptPath' ) + '/extensions/ProofreadPage/Button_zoom_in.png',
 780+ icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/Button_zoom_in.png',
781781 action: {
782782 type: 'callback',
783783 execute: function() {
@@ -789,7 +789,7 @@
790790 'zoom-out': {
791791 label: mw.msg( 'proofreadpage-button-zoom-out-label' ),
792792 type: 'button',
793 - icon: mw.config.get( 'wgScriptPath' ) + '/extensions/ProofreadPage/Button_zoom_out.png',
 793+ icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/Button_zoom_out.png',
794794 action: {
795795 type: 'callback',
796796 execute: function() {
@@ -802,7 +802,7 @@
803803 'reset-zoom': {
804804 label: mw.msg( 'proofreadpage-button-reset-zoom-label' ),
805805 type: 'button',
806 - icon: mw.config.get( 'wgScriptPath' ) + '/extensions/ProofreadPage/Button_examine.png',
 806+ icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/Button_examine.png',
807807 action: {
808808 type: 'callback',
809809 execute: function() {
@@ -818,7 +818,7 @@
819819 'toggle-visibility': {
820820 label: mw.msg( 'proofreadpage-button-toggle-visibility-label' ),
821821 type: 'button',
822 - icon: mw.config.get( 'wgScriptPath' ) + '/extensions/ProofreadPage/button_category_plus.png',
 822+ icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/button_category_plus.png',
823823 action: {
824824 type: 'callback',
825825 execute: function() {
@@ -829,7 +829,7 @@
830830 'toggle-layout': {
831831 label: mw.msg( 'proofreadpage-button-toggle-layout-label' ),
832832 type: 'button',
833 - icon: mw.config.get( 'wgScriptPath' ) + '/extensions/ProofreadPage/Button_multicol.png',
 833+ icon: mw.config.get( 'wgExtensionAssetsPath' ) + '/ProofreadPage/Button_multicol.png',
834834 action: {
835835 type: 'callback',
836836 execute: function() {
@@ -844,7 +844,6 @@
845845
846846 var $edit = $( '#wpTextbox1' );
847847 if( typeof $edit.wikiEditor == 'function' ) {
848 - console.log('hey hey');
849848 setTimeout(function() {
850849 $edit.wikiEditor( 'addToToolbar', {
851850 'sections': {

Follow-up revisions

RevisionCommit summaryAuthorDate
r92319MFT r92311, r92314: fix ProofreadPage toolbar with WikiEditor. Bug 28574.brion22:01, 15 July 2011
r92321MFT r92311, r92314: fix ProofreadPage toolbar with WikiEditor. Bug 28574.brion22:03, 15 July 2011
r92323MFT r92311, r92314: fix ProofreadPage toolbar with WikiEditor. Bug 28574.brion22:06, 15 July 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r92311* (bug 28574) ProofreadPage toolbar additions now compatible with WikiEditor ...brion21:42, 15 July 2011

Status & tagging log