r77137 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r77136‎ | r77137 | r77138 >
Date:09:01, 23 November 2010
Author:neilk
Status:deferred
Tags:
Comment:
conflict between window.mw and window.mediaWiki. Settling on mediaWiki, I think that is the new standard Trevor wants
Modified paths:
  • /trunk/extensions/UploadWizard/resources/combined.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/combined.min.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/dir.combined.css (modified) (history)
  • /trunk/extensions/UploadWizard/resources/dir.combined.min.css (modified) (history)
  • /trunk/extensions/UploadWizard/resources/language/mw.Language.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/language/mw.Parser.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.Api.edit.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.Api.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.ApiQueryImageInfo.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.Uri.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.Utilities.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.UtilitiesTime.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/resources/language/mw.Language.js
——@@ -792,7 +792,7 @@
793793 return addSeparatorsNF( num, '.', ',' );
794794 }
795795
796 -}) ( window.mw );
 796+}) ( window.mediaWiki );
797797
798798 // Set global gM shortcut:
799799 window[ 'gM' ] = mw.getMsg;
Index: trunk/extensions/UploadWizard/resources/language/mw.Parser.js
——@@ -320,4 +320,4 @@
321321 }
322322 };
323323
324 -}) ( window.mw );
 324+}) ( window.mediaWiki );
Index: trunk/extensions/UploadWizard/resources/dir.combined.css
——@@ -28,6 +28,7 @@
2929 #mwe-upwiz-steps li {
3030 color: #666666;
3131 font-size: 1.2em;
 32+ margin-right: -1px;
3233 }
3334
3435 #mwe-upwiz-steps li.head {
Index: trunk/extensions/UploadWizard/resources/mw.js
——@@ -1,5 +1,5 @@
22 // dependencies: []
33
4 -if ( typeof window.mw === 'undefined' ) {
5 - window.mw = {};
 4+if ( typeof window.mediaWiki === 'undefined' ) {
 5+ window.mediaWiki = {};
66 }
Index: trunk/extensions/UploadWizard/resources/mw.Api.js
——@@ -189,4 +189,4 @@
190190 'exists'
191191 ];
192192
193 -}) ( window.mw, jQuery );
 193+}) ( window.mediaWiki, jQuery );
Index: trunk/extensions/UploadWizard/resources/dir.combined.min.css
——@@ -1,6 +1,6 @@
22 form.mwe-upwiz-form{display:inline;}#upload-wizard{margin-top:18px;min-width:750px;
33 max-width:900px;
4 -}#mwe-upwiz-steps{background-color:white;background-image:none;border:solid 1px #a7d7f9;}#mwe-upwiz-steps li{color:#666666;font-size:1.2em;}#mwe-upwiz-steps li.head{color:#000000;}.mwe-upwiz-clearing{clear:left;width:100%;}#mwe-upwiz-content{padding:1em;}.mwe-upwiz-add-files-0,#mwe-upwiz-files{margin-top:3em;margin-bottom:3em;}.mwe-upwiz-add-files-0{text-align:center;}.mwe-upwiz-add-files-0 #mwe-upwiz-add-file{font-size:large;padding:1em;}
 4+}#mwe-upwiz-steps{background-color:white;background-image:none;border:solid 1px #a7d7f9;}#mwe-upwiz-steps li{color:#666666;font-size:1.2em;margin-right:-1px;}#mwe-upwiz-steps li.head{color:#000000;}.mwe-upwiz-clearing{clear:left;width:100%;}#mwe-upwiz-content{padding:1em;}.mwe-upwiz-add-files-0,#mwe-upwiz-files{margin-top:3em;margin-bottom:3em;}.mwe-upwiz-add-files-0{text-align:center;}.mwe-upwiz-add-files-0 #mwe-upwiz-add-file{font-size:large;padding:1em;}
55 #mwe-upwiz-add-file.hover{text-decoration:underline;}
66 #mwe-upwiz-add-file,.mwe-upwiz-more-options,#mwe-upwiz-upload-ctrl{outline:none;cursor:pointer;}
77 .mwe-upwiz-file-ctrl-container{position:absolute;overflow:hidden;}.mwe-upwiz-file-input,.mwe-upwiz-visible-file{cursor:pointer;}
Index: trunk/extensions/UploadWizard/resources/mw.Utilities.js
——@@ -59,4 +59,4 @@
6060 };
6161
6262
63 -} )( window.mw );
 63+} )( window.mediaWiki );
Index: trunk/extensions/UploadWizard/resources/mw.UtilitiesTime.js
——@@ -93,4 +93,4 @@
9494 return parseInt( hour * 3600 ) + parseInt( min * 60 ) + parseFloat( sec );
9595 }
9696
97 -} )( window.mw );
 97+} )( window.mediaWiki );
Index: trunk/extensions/UploadWizard/resources/mw.Api.edit.js
——@@ -98,4 +98,4 @@
9999
100100 } );
101101
102 -}) ( window.mw, jQuery );
 102+}) ( window.mediaWiki, jQuery );
Index: trunk/extensions/UploadWizard/resources/combined.js
——@@ -6432,8 +6432,8 @@
64336433 }})(jQuery);
64346434 // dependencies: []
64356435
6436 -if ( typeof window.mw === 'undefined' ) {
6437 - window.mw = {};
 6436+if ( typeof window.mediaWiki === 'undefined' ) {
 6437+ window.mediaWiki = {};
64386438 }
64396439 // dependencies: [ mw ]
64406440
——@@ -6573,7 +6573,7 @@
65746574 };
65756575
65766576
6577 -} )( window.mw );
 6577+} )( window.mediaWiki );
65786578 /**
65796579 * dependencies: [ mw ]
65806580 */
——@@ -6669,7 +6669,7 @@
66706670 return parseInt( hour * 3600 ) + parseInt( min * 60 ) + parseFloat( sec );
66716671 }
66726672
6673 -} )( window.mw );
 6673+} )( window.mediaWiki );
66746674 /**
66756675 * Library for simple URI parsing and manipulation. Requires jQuery.
66766676 *
——@@ -6921,7 +6921,7 @@
69226922 }
69236923 };
69246924
6925 -} )( window.mw, jQuery );
 6925+} )( window.mediaWiki, jQuery );
69266926 /* mw.Api objects represent the API of a particular MediaWiki server. */
69276927
69286928 // dependencies: [ mw ]
——@@ -7113,7 +7113,7 @@
71147114 'exists'
71157115 ];
71167116
7117 -}) ( window.mw, jQuery );
 7117+}) ( window.mediaWiki, jQuery );
71187118 // library to assist with edits
71197119
71207120 // dependencies: [ mw.Api, jQuery ]
——@@ -7214,7 +7214,7 @@
72157215
72167216 } );
72177217
7218 -}) ( window.mw, jQuery );
 7218+}) ( window.mediaWiki, jQuery );
72197219 /**
72207220 * Represents a "title", or some piece of content, tracked by MediaWiki.
72217221 * There are numerous ways of representing the title, so this bundles them all together so you
——@@ -8216,7 +8216,7 @@
82178217 return addSeparatorsNF( num, '.', ',' );
82188218 }
82198219
8220 -}) ( window.mw );
 8220+}) ( window.mediaWiki );
82218221
82228222 // Set global gM shortcut:
82238223 window[ 'gM' ] = mw.getMsg;
——@@ -8543,7 +8543,7 @@
85448544 }
85458545 };
85468546
8547 -}) ( window.mw );
 8547+}) ( window.mediaWiki );
85488548 mw.addMessages({
85498549 "mwe-upwiz-code-unknown": "Unknown language"
85508550 });
Index: trunk/extensions/UploadWizard/resources/mw.Uri.js
——@@ -249,4 +249,4 @@
250250 }
251251 };
252252
253 -} )( window.mw, jQuery );
 253+} )( window.mediaWiki, jQuery );
Index: trunk/extensions/UploadWizard/resources/mw.ApiQueryImageInfo.js
——@@ -74,6 +74,6 @@
7575
7676 } );
7777
78 -}) ( window.mw, jQuery );
 78+}) ( window.mediaWiki, jQuery );
7979
8080
Index: trunk/extensions/UploadWizard/resources/combined.min.js
——@@ -6432,8 +6432,8 @@
64336433 }})(jQuery);
64346434
64356435
6436 -if(typeof window.mw==='undefined'){
6437 -window.mw={};
 6436+if(typeof window.mediaWiki==='undefined'){
 6437+window.mediaWiki={};
64386438 }
64396439
64406440
——@@ -6573,7 +6573,7 @@
65746574 };
65756575
65766576
6577 -})(window.mw);
 6577+})(window.mediaWiki);
65786578
65796579
65806580
——@@ -6669,7 +6669,7 @@
66706670 return parseInt(hour*3600)+parseInt(min*60)+parseFloat(sec);
66716671 }
66726672
6673 -})(window.mw);
 6673+})(window.mediaWiki);
66746674
66756675
66766676
——@@ -6921,7 +6921,7 @@
69226922 }
69236923 };
69246924
6925 -})(window.mw,jQuery);
 6925+})(window.mediaWiki,jQuery);
69266926
69276927
69286928
——@@ -7113,7 +7113,7 @@
71147114 'exists'
71157115 ];
71167116
7117 -})(window.mw,jQuery);
 7117+})(window.mediaWiki,jQuery);
71187118
71197119
71207120
——@@ -7214,7 +7214,7 @@
72157215
72167216 });
72177217
7218 -})(window.mw,jQuery);
 7218+})(window.mediaWiki,jQuery);
72197219
72207220
72217221
——@@ -8216,7 +8216,7 @@
82178217 return addSeparatorsNF(num,'.',',');
82188218 }
82198219
8220 -})(window.mw);
 8220+})(window.mediaWiki);
82218221
82228222
82238223 window['gM']=mw.getMsg;
——@@ -8543,7 +8543,7 @@
85448544 }
85458545 };
85468546
8547 -})(window.mw);
 8547+})(window.mediaWiki);
85488548 mw.addMessages({
85498549 "mwe-upwiz-code-unknown":"Unknown language"
85508550 });

Status & tagging log