Cscott has uploaded a new change for review. https://gerrit.wikimedia.org/r/59673
Change subject: Whitespace fixes. ...................................................................... Whitespace fixes. Somehow commit 6d704298f8953950beb3c0aee81e3e9803e36149 managed to sneak in with 8-space tabs and space-indentation. Change-Id: Ida57cd6e80e77aa660eb1c9f083c5fee85f5b0af --- M js/lib/mediawiki.parser.environment.js 1 file changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid refs/changes/73/59673/1 diff --git a/js/lib/mediawiki.parser.environment.js b/js/lib/mediawiki.parser.environment.js index ce71dd7..3b698fe 100644 --- a/js/lib/mediawiki.parser.environment.js +++ b/js/lib/mediawiki.parser.environment.js @@ -151,37 +151,37 @@ * @param {String or Object} page source or metadata */ MWParserEnvironment.prototype.setPageSrcInfo = function ( src_or_metadata ) { - if (typeof(src_or_metadata)==='string' || src_or_metadata===null) { - this.page.meta = { revision: {} }; - this.page.src = src_or_metadata; - return; - } - // I'm chosing to initialize this.page.meta "the hard way" (rather than - // simply cloning the provided object) in part to document/enforce the - // expected structure and fields. - var metadata = src_or_metadata; - var m = this.page.meta; - if (!m) { m = this.page.meta = {}; } - m.title = metadata.title; - m.ns = metadata.ns; - m.id = metadata.id; - var r = m.revision; - if (!r) { r = m.revision = {}; } - if (metadata.revision) { - r.revid = metadata.revision.revid; - r.parentid = metadata.revision.parentid; - r.timestamp = metadata.revision.timestamp; - r.user = metadata.revision.user; - r.userid = metadata.revision.userid; - r.sha1 = metadata.revision.sha1; - r.size = metadata.revision.size; - r.comment = metadata.revision.comment; - r.contentmodel = metadata.revision.contentmodel; - r.contentformat = metadata.revision.contentformat; - if ('*' in metadata.revision) { - this.page.src = metadata.revision['*']; + if (typeof(src_or_metadata)==='string' || src_or_metadata===null) { + this.page.meta = { revision: {} }; + this.page.src = src_or_metadata; + return; } - } + // I'm chosing to initialize this.page.meta "the hard way" (rather than + // simply cloning the provided object) in part to document/enforce the + // expected structure and fields. + var metadata = src_or_metadata; + var m = this.page.meta; + if (!m) { m = this.page.meta = {}; } + m.title = metadata.title; + m.ns = metadata.ns; + m.id = metadata.id; + var r = m.revision; + if (!r) { r = m.revision = {}; } + if (metadata.revision) { + r.revid = metadata.revision.revid; + r.parentid = metadata.revision.parentid; + r.timestamp = metadata.revision.timestamp; + r.user = metadata.revision.user; + r.userid = metadata.revision.userid; + r.sha1 = metadata.revision.sha1; + r.size = metadata.revision.size; + r.comment = metadata.revision.comment; + r.contentmodel = metadata.revision.contentmodel; + r.contentformat = metadata.revision.contentformat; + if ('*' in metadata.revision) { + this.page.src = metadata.revision['*']; + } + } }; /** -- To view, visit https://gerrit.wikimedia.org/r/59673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida57cd6e80e77aa660eb1c9f083c5fee85f5b0af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Parsoid Gerrit-Branch: master Gerrit-Owner: Cscott <wikime...@cscott.net> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits