r78070 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r78069‎ | r78070 | r78071 >
Date:15:27, 8 December 2010
Author:catrope
Status:deferred
Tags:
Comment:
Recombine resources for r77816
Modified paths:
  • /trunk/extensions/UploadWizard/resources/combined.js (modified) (history)
  • /trunk/extensions/UploadWizard/resources/combined.min.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/resources/combined.js
@@ -11775,7 +11775,7 @@
1177611776
1177711777 wikiText += "=={{int:filedesc}}==\n";
1177811778
11779 - wikiText += '{{Information\n' + info + '}}\n';
 11779+ wikiText += '{{Information\n' + info + '}}\n\n';
1178011780
1178111781 // add a location template if possible
1178211782
@@ -11783,14 +11783,14 @@
1178411784 var otherInfoWikiText = $j( _this.otherInformationInput ).val().trim();
1178511785 if ( ! mw.isEmpty( otherInfoWikiText ) ) {
1178611786 wikiText += "=={{int:otherinfo}}==\n";
11787 - wikiText += otherInfoWikiText;
 11787+ wikiText += otherInfoWikiText + "\n\n";
1178811788 }
1178911789
1179011790 wikiText += "=={{int:license-header}}==\n";
1179111791
1179211792 // in the other implementations, category text follows immediately after license text. This helps
1179311793 // group categories together, maybe?
11794 - wikiText += deed.getLicenseWikiText() + _this.div.find( '.categoryInput' ).get(0).getWikiText();
 11794+ wikiText += deed.getLicenseWikiText() + _this.div.find( '.categoryInput' ).get(0).getWikiText() + "\n\n";
1179511795
1179611796
1179711797 return wikiText;
Index: trunk/extensions/UploadWizard/resources/combined.min.js
@@ -11775,7 +11775,7 @@
1177611776
1177711777 wikiText+="=={{int:filedesc}}==\n";
1177811778
11779 -wikiText+='{{Information\n'+info+'}}\n';
 11779+wikiText+='{{Information\n'+info+'}}\n\n';
1178011780
1178111781
1178211782
@@ -11783,14 +11783,14 @@
1178411784 var otherInfoWikiText=$j(_this.otherInformationInput).val().trim();
1178511785 if(!mw.isEmpty(otherInfoWikiText)){
1178611786 wikiText+="=={{int:otherinfo}}==\n";
11787 -wikiText+=otherInfoWikiText;
 11787+wikiText+=otherInfoWikiText+"\n\n";
1178811788 }
1178911789
1179011790 wikiText+="=={{int:license-header}}==\n";
1179111791
1179211792
1179311793
11794 -wikiText+=deed.getLicenseWikiText()+_this.div.find('.categoryInput').get(0).getWikiText();
 11794+wikiText+=deed.getLicenseWikiText()+_this.div.find('.categoryInput').get(0).getWikiText()+"\n\n";
1179511795
1179611796
1179711797 return wikiText;

Follow-up revisions

RevisionCommit summaryAuthorDate
r780961.17: Merge recent fixes tagged on CodeReview, except for problematic revisio...catrope21:17, 8 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77816Revert r77504 per CR. ...raymond17:47, 5 December 2010

Status & tagging log