<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24019] trunk/wp-admin: Revisions: Clean up JavaScript variable names, see #23901.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24019">24019</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2013-04-17 19:34:21 +0000 (Wed, 17 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revisions: Clean up JavaScript variable names, see <a href="http://core.trac.wordpress.org/ticket/23901">#23901</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsscolorsclassiccss">trunk/wp-admin/css/colors-classic.css</a></li>
<li><a href="#trunkwpadmincsscolorsfreshcss">trunk/wp-admin/css/colors-fresh.css</a></li>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminjsrevisionsjs">trunk/wp-admin/js/revisions.js</a></li>
<li><a href="#trunkwpadminrevisionphp">trunk/wp-admin/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsscolorsclassiccss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.css (24018 => 24019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.css 2013-04-17 18:58:38 UTC (rev 24018)
+++ trunk/wp-admin/css/colors-classic.css 2013-04-17 19:34:21 UTC (rev 24019)
</span><span class="lines">@@ -1483,14 +1483,14 @@
</span><span class="cx"> color: #0080aa;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.loading-true {
</del><ins>+.revision-tick.completed-false {
</ins><span class="cx"> background-color: #9999cc;
</span><span class="cx"> background: url(../images/wpspin_light.gif) no-repeat;
</span><span class="cx"> background-position: middle;
</span><span class="cx"> background-size: 1px 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.loading-false {
</del><ins>+.revision-tick.completed-true {
</ins><span class="cx"> background-color: #aaa;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmincsscolorsfreshcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-fresh.css (24018 => 24019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-fresh.css 2013-04-17 18:58:38 UTC (rev 24018)
+++ trunk/wp-admin/css/colors-fresh.css 2013-04-17 19:34:21 UTC (rev 24019)
</span><span class="lines">@@ -1377,14 +1377,14 @@
</span><span class="cx"> background-color: #f7f7f7;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.loading-true {
</del><ins>+.revision-tick.completed-false {
</ins><span class="cx"> background-color: #9999cc;
</span><span class="cx"> background: url(../images/wpspin_light.gif) no-repeat;
</span><span class="cx"> background-position: middle;
</span><span class="cx"> background-size: 1px 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.revision-tick.loading-false {
</del><ins>+.revision-tick.completed-true {
</ins><span class="cx"> background-color: #aaa;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (24018 => 24019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2013-04-17 18:58:38 UTC (rev 24018)
+++ trunk/wp-admin/includes/ajax-actions.php 2013-04-17 19:34:21 UTC (rev 24019)
</span><span class="lines">@@ -2164,8 +2164,8 @@
</span><span class="cx">
</span><span class="cx"> $all_the_revisions = array (
</span><span class="cx"> 'diff' => $content,
</span><del>- 'lines_deleted' => $lines_deleted,
- 'lines_added' => $lines_added
</del><ins>+ 'linesDeleted' => $lines_deleted,
+ 'linesAdded' => $lines_added
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> echo json_encode( $all_the_revisions );
</span><span class="lines">@@ -2273,14 +2273,13 @@
</span><span class="cx">
</span><span class="cx"> if ( ( $compare_two_mode || -1 !== $previous_revision_id ) ) {
</span><span class="cx"> $all_the_revisions[] = array (
</span><del>- 'ID' => $revision->ID,
- 'titleTo' => $revision_date_author,
- 'titleFrom' => $revision_from_date_author,
- 'titleTooltip' => $revision_date_author_short,
- 'restoreLink' => urldecode( $restore_link ),
- 'revision_toload' => true,
- 'previous_revision_id' => $previous_revision_id,
- 'is_current_revision' => $is_current_revision,
</del><ins>+ 'ID' => $revision->ID,
+ 'titleTo' => $revision_date_author,
+ 'titleFrom' => $revision_from_date_author,
+ 'titleTooltip' => $revision_date_author_short,
+ 'restoreLink' => urldecode( $restore_link ),
+ 'previousID' => $previous_revision_id,
+ 'isCurrent' => $is_current_revision,
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx"> $previous_revision_id = $revision->ID;
</span></span></pre></div>
<a id="trunkwpadminjsrevisionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions.js (24018 => 24019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions.js 2013-04-17 18:58:38 UTC (rev 24018)
+++ trunk/wp-admin/js/revisions.js 2013-04-17 19:34:21 UTC (rev 24019)
</span><span class="lines">@@ -59,9 +59,9 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- reloadToLoadRevisions: function( models, reverse_direction ) {
</del><ins>+ loadDiffs: function( models ) {
</ins><span class="cx"> var self = this,
</span><del>- revisionsToLoad = models.where( { revision_toload: true } ),
</del><ins>+ revisionsToLoad = models.where( { completed: false } ),
</ins><span class="cx"> delay = 0;
</span><span class="cx">
</span><span class="cx"> // match slider to passed revision_id
</span><span class="lines">@@ -77,29 +77,29 @@
</span><span class="cx"> add: false,
</span><span class="cx"> remove: false,
</span><span class="cx"> success: function( model ) {
</span><del>- model.set( 'revision_toload', 'false' );
</del><ins>+ model.set( 'completed', true );
</ins><span class="cx">
</span><span class="cx"> // stop spinner when all models are loaded
</span><del>- if ( 0 === models.where( { revision_toload: true } ).length )
</del><ins>+ if ( 0 === models.where( { completed: false } ).length )
</ins><span class="cx"> self.stopModelLoadingSpinner();
</span><span class="cx">
</span><span class="cx"> self.tickmarkView.render();
</span><span class="cx">
</span><del>- var total_changes = model.get( 'lines_added' ) + model.get( 'lines_deleted'),
- scope_of_changes = 'vsmall';
</del><ins>+ var totalChanges = model.get( 'linesAdded' ) + model.get( 'linesDeleted' ),
+ scopeOfChanges = 'vsmall';
</ins><span class="cx">
</span><span class="cx"> // Note: hard coded scope of changes
</span><span class="cx"> // TODO change to dynamic based on range of values
</span><del>- if ( total_changes > 1 && total_changes <= 3 ) {
- scope_of_changes = 'small';
- } else if( total_changes > 3 && total_changes <= 5 ) {
- scope_of_changes = 'med';
- } else if( total_changes > 5 && total_changes <= 10 ) {
- scope_of_changes = 'large';
- } else if( total_changes > 10 ) {
- scope_of_changes = 'vlarge';
</del><ins>+ if ( totalChanges > 1 && totalChanges <= 3 ) {
+ scopeOfChanges = 'small';
+ } else if ( totalChanges > 3 && totalChanges <= 5 ) {
+ scopeOfChanges = 'med';
+ } else if ( totalChanges > 5 && totalChanges <= 10 ) {
+ scopeOfChanges = 'large';
+ } else if ( totalChanges > 10 ) {
+ scopeOfChanges = 'vlarge';
</ins><span class="cx"> }
</span><del>- model.set( 'scope_of_changes', scope_of_changes );
</del><ins>+ model.set( 'scopeOfChanges', scopeOfChanges );
</ins><span class="cx"> if ( 0 !== self.rightDiff &&
</span><span class="cx"> model.get( 'ID' ) === self.revisions.at( self.rightDiff - 1 ).get( 'ID' ) ) {
</span><span class="cx"> // reload if current model refreshed
</span><span class="lines">@@ -149,19 +149,19 @@
</span><span class="cx"> reloadModelSingle: function() {
</span><span class="cx"> var self = this;
</span><span class="cx">
</span><del>- // TODO: Only updates the query args yet
</del><ins>+ self.startRightModelLoading();
+
</ins><span class="cx"> self.revisions.reload({
</span><ins>+ options: {
</ins><span class="cx"> 'showAutosaves': self.autosaves,
</span><span class="cx"> 'showSplitView': self.showSplitView
</span><del>- });
</del><ins>+ },
</ins><span class="cx">
</span><del>- self.startRightModelLoading();
- self.revisions.fetch({ // reload revision data
</del><span class="cx"> success: function() {
</span><span class="cx"> var revisionCount = self.revisions.length;
</span><span class="cx"> self.revisionView.model = self.revisions;
</span><span class="cx"> self.revisionView.render();
</span><del>- self.reloadToLoadRevisions( self.revisions );
</del><ins>+ self.loadDiffs( self.revisions );
</ins><span class="cx"> self.tickmarkView.model = self.revisions;
</span><span class="cx"> self.tickmarkView.render();
</span><span class="cx"> self.slider.refresh({
</span><span class="lines">@@ -173,7 +173,6 @@
</span><span class="cx"> error: function() {
</span><span class="cx"> self.stopRightModelLoading();
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -191,7 +190,7 @@
</span><span class="cx"> self.leftHandleRevisions.fetch({
</span><span class="cx"> success: function(){
</span><span class="cx"> self.stopLeftModelLoading();
</span><del>- self.reloadToLoadRevisions( self.leftHandleRevisions );
</del><ins>+ self.loadDiffs( self.leftHandleRevisions );
</ins><span class="cx"> self.tickmarkView.model = self.leftHandleRevisions;
</span><span class="cx"> self.slider.refresh({
</span><span class="cx"> 'max': self.revisions.length
</span><span class="lines">@@ -222,7 +221,7 @@
</span><span class="cx"> self.rightHandleRevisions.fetch({
</span><span class="cx"> success: function(){
</span><span class="cx"> self.stopRightModelLoading();
</span><del>- self.reloadToLoadRevisions( self.rightHandleRevisions );
</del><ins>+ self.loadDiffs( self.rightHandleRevisions );
</ins><span class="cx"> self.tickmarkView.model = self.rightHandleRevisions;
</span><span class="cx"> self.slider.refresh({
</span><span class="cx"> 'max': self.revisions.length,
</span><span class="lines">@@ -250,7 +249,7 @@
</span><span class="cx"> });
</span><span class="cx"> this.revisionView.render();
</span><span class="cx">
</span><del>- this.reloadToLoadRevisions( this.revisions );
</del><ins>+ this.loadDiffs( this.revisions );
</ins><span class="cx">
</span><span class="cx"> this.revisionsInteractions = new revisions.view.Interact({
</span><span class="cx"> model: this.revisions
</span><span class="lines">@@ -262,7 +261,6 @@
</span><span class="cx"> });
</span><span class="cx"> this.tickmarkView.render();
</span><span class="cx"> this.tickmarkView.resetTicks();
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -449,10 +447,10 @@
</span><span class="cx"> model: Revision,
</span><span class="cx">
</span><span class="cx"> resetTicks: function() {
</span><del>- var sliderMax = Diff.slider.option( 'max' );
</del><ins>+ var sliderMax = Diff.slider.option( 'max' );
</ins><span class="cx"> var sliderWidth = Diff.slider.width();
</span><del>- var adjustMax = Diff.singleRevision ? 0 : 1;
- var tickWidth = Math.floor( sliderWidth / ( sliderMax - adjustMax ) );
</del><ins>+ var adjustMax = Diff.singleRevision ? 0 : 1;
+ var tickWidth = Math.floor( sliderWidth / ( sliderMax - adjustMax ) );
</ins><span class="cx">
</span><span class="cx"> // TODO: adjust right margins for wider ticks so they stay centered on handle stop point
</span><span class="cx">
</span><span class="lines">@@ -473,9 +471,6 @@
</span><span class="cx"> $(this).css( 'margin-right', tickWidth - 1 + 'px'); // space the ticks out using right margin
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if( ! Diff.singleRevision ) {
- $( '.revision-tick' ).first().remove(); // TODO - remove the check
- }
</del><span class="cx"> $( '.revision-tick' ).last().css( 'margin-right', '0' ); // last tick gets no right margin
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -633,7 +628,7 @@
</span><span class="cx"> this.toggleCompareTwoCheckbox();
</span><span class="cx">
</span><span class="cx"> // hide the restore button when on the last sport/current post data
</span><del>- $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'is_current_revision' ) );
</del><ins>+ $( '#restore-revision' ).toggle( ! Diff.revisions.at( Diff.rightDiff - 1 ).get( 'isCurrent' ) );
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -686,8 +681,7 @@
</span><span class="cx"> */
</span><span class="cx"> Revision = revisions.model.Revision = Backbone.Model.extend({
</span><span class="cx"> idAttribute: 'ID',
</span><del>- urlRoot: ajaxurl + '?action=revisions-data' +
- '&show_autosaves=true&show_split_view=true&nonce=' + revisions.model.settings.nonce,
</del><ins>+
</ins><span class="cx"> defaults: {
</span><span class="cx"> ID: 0,
</span><span class="cx"> titleTo: '',
</span><span class="lines">@@ -695,19 +689,23 @@
</span><span class="cx"> titleFrom: '',
</span><span class="cx"> diff: '<div class="diff-loading"><div class="spinner"></div></div>',
</span><span class="cx"> restoreLink: '',
</span><del>- revision_toload: false,
- lines_added: 0,
- lines_deleted: 0,
- scope_of_changes: 'none',
- previous_revision_id: 0,
- is_current_revision: false
</del><ins>+ completed: false,
+ linesAdded: 0,
+ linesDeleted: 0,
+ scopeOfChanges: 'none',
+ previousID: 0,
+ isCurrent: false
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> url: function() {
</span><span class="cx"> if ( Diff.singleRevision ) {
</span><del>- return this.urlRoot +
</del><ins>+ return ajaxurl +
+ '?action=revisions-data' +
+ '&show_autosaves=true' +
+ '&show_split_view=true' +
+ '&nonce=' + revisions.model.settings.nonce +
</ins><span class="cx"> '&single_revision_id=' + this.id +
</span><del>- '&compare_to=' + this.get( 'previous_revision_id' ) +
</del><ins>+ '&compare_to=' + this.get( 'previousID' ) +
</ins><span class="cx"> '&post_id=' + revisions.model.settings.post_id;
</span><span class="cx"> } else {
</span><span class="cx"> return this.collection.url() + '&single_revision_id=' + this.id;
</span><span class="lines">@@ -721,7 +719,6 @@
</span><span class="cx"> */
</span><span class="cx"> Revisions = revisions.Revisions = Backbone.Collection.extend({
</span><span class="cx"> model: Revision,
</span><del>- urlRoot: ajaxurl + '?action=revisions-data',
</del><span class="cx">
</span><span class="cx"> initialize: function( models, options ) {
</span><span class="cx"> this.options = _.defaults( options || {}, {
</span><span class="lines">@@ -736,7 +733,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> url: function() {
</span><del>- return this.urlRoot +
</del><ins>+ return ajaxurl +
+ '?action=revisions-data' +
</ins><span class="cx"> '&compare_to=' + this.options.compareTo +
</span><span class="cx"> '&post_id=' + this.options.post_id +
</span><span class="cx"> '&show_autosaves=' + this.options.showAutosaves +
</span><span class="lines">@@ -747,10 +745,12 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> reload: function( options ) {
</span><del>- this.options = _.defaults( options || {}, this.options );
</del><ins>+ this.options = _.defaults( options.options || {}, this.options );
</ins><span class="cx">
</span><del>- // TODO
- //this.fetch();
</del><ins>+ this.fetch({
+ success: options.success || null,
+ error: options.error || null
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } );
</span></span></pre></div>
<a id="trunkwpadminrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/revision.php (24018 => 24019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/revision.php 2013-04-17 18:58:38 UTC (rev 24018)
+++ trunk/wp-admin/revision.php 2013-04-17 19:34:21 UTC (rev 24019)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script id="tmpl-revision-ticks" type="text/html">
</span><del>- <div class="revision-tick loading-{{{ data.revision_toload }}} scope-of-changes-{{{ data.scope_of_changes }}}"></div>
</del><ins>+ <div class="revision-tick completed-{{{ data.completed }}} scope-of-changes-{{{ data.scopeOfChanges }}}"></div>
</ins><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> require_once( './admin-footer.php' );
</span></span></pre>
</div>
</div>
</body>
</html>