<!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>[2098] 2013/ahoereth/trunk: No more AJAX.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://gsoc.trac.wordpress.org/changeset/2098">2098</a></dd>
<dt>Author</dt> <dd>a.hoereth</dd>
<dt>Date</dt> <dd>2013-07-10 12:13:33 +0000 (Wed, 10 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>No more AJAX. Fixes <a href="http://gsoc.trac.wordpress.org/ticket/315">#315</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013ahoerethtrunkinceditorsphp">2013/ahoereth/trunk/inc/editors.php</a></li>
<li><a href="#2013ahoerethtrunkincmetaboxphp">2013/ahoereth/trunk/inc/metabox.php</a></li>
<li><a href="#2013ahoerethtrunkjseditorsjs">2013/ahoereth/trunk/js/editors.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#2013ahoerethtrunkincajaxphp">2013/ahoereth/trunk/inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013ahoerethtrunkincajaxphp"></a>
<div class="delfile"><h4>Deleted: 2013/ahoereth/trunk/inc/ajax.php (2097 => 2098)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/inc/ajax.php 2013-07-10 10:51:15 UTC (rev 2097)
+++ 2013/ahoereth/trunk/inc/ajax.php 2013-07-10 12:13:33 UTC (rev 2098)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-<?php
-/**
- * Handles AJAX requests.
- *
- * @since 0.2
- */
-class Code_Revisions_Ajax {
-
- /**
- * Key of the post meta field containing the file's meta data
- *
- * @var string
- */
- private $metakey;
-
- /**
- * Initializes all ajax actions.
- *
- * @since 0.2
- */
- public function __construct() {
- add_action( 'wp_ajax_code_revisions_list', array( &$this, 'revisions_list' ) );
-
- $this->metakey = '_' . str_replace( '-', '_', CODE_REVISIONS_NAME );
- }
-
- /**
- * Returns the revisions list.
- *
- * @since 0.2
- * @uses wp_send_json_error
- * @uses wp_send_json_success
- */
- public function revisions_list() {
- $id = $_POST['post_id'];
-
- // no data found for this file
- if ( ! $meta = get_post_meta($id, $this->metakey, true) )
- wp_send_json_error();
-
- extract( $meta );
-
- // bad nonce
- if ( ! check_ajax_referer( "edit-code_$file$package", 'nonce', false ) )
- wp_send_json_error();
-
- // return revisions list
- wp_send_json_success( $this->get_revisions_list( $id ) );
- }
-
- /**
- * wp_list_post_revisions directly echos it's results. We want to work
- * with it in JS and therefore need to buffer it. metabox.php furthermore adds
- * the layout around the revisions list so we get a metabox similar to the
- * originals on the post and page edit screens.
- *
- * NOTE: metabox.php requires $id to be set.
- *
- * @since 0.2
- * @uses code-revisions/inc/metabox.php
- *
- * @param int $id The id of the post to get the revisions list for
- * @return string Revisions list ready for printing.
- */
- function get_revisions_list( $id ) {
- ob_start();
-
- // requires $id to be set
- include_once( CODE_REVISIONS_DIR . 'inc/metabox.php' );
-
- return ob_get_clean();
- }
-}
</del></span></pre></div>
<a id="2013ahoerethtrunkinceditorsphp"></a>
<div class="modfile"><h4>Modified: 2013/ahoereth/trunk/inc/editors.php (2097 => 2098)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/inc/editors.php 2013-07-10 10:51:15 UTC (rev 2097)
+++ 2013/ahoereth/trunk/inc/editors.php 2013-07-10 12:13:33 UTC (rev 2098)
</span><span class="lines">@@ -86,10 +86,9 @@
</span><span class="cx"> );
</span><span class="cx"> wp_enqueue_script( 'code_revisions' );
</span><span class="cx">
</span><del>- extract( $this->meta );
</del><span class="cx"> wp_localize_script( 'code_revisions', '_code_revisions', array(
</span><del>- 'post_id' => $this->id,
- 'nonce' => wp_create_nonce( "edit-code_$file$package" ),
</del><ins>+ 'post_id' => $this->id,
+ 'revisions_list' => $this->get_revisions_list( $this->id ),
</ins><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> wp_register_style(
</span><span class="lines">@@ -263,4 +262,27 @@
</span><span class="cx"> $post = get_posts( $args );
</span><span class="cx"> return isset( $post[0] ) ? $post[0]->ID : 0;
</span><span class="cx"> }
</span><ins>+
+ /**
+ * wp_list_post_revisions directly echos it's results. We want to work
+ * with it in JS and therefore need to buffer it. metabox.php furthermore adds
+ * the layout around the revisions list so we get a metabox similar to the
+ * originals on the post and page edit screens.
+ *
+ * NOTE: metabox.php requires $id to be set.
+ *
+ * @since 0.2
+ * @uses code-revisions/inc/metabox.php
+ *
+ * @param int $id The id of the post to get the revisions list for
+ * @return string Revisions list ready for printing.
+ */
+ function get_revisions_list( $id ) {
+ ob_start();
+
+ // requires $id to be set
+ include_once( CODE_REVISIONS_DIR . 'inc/metabox.php' );
+
+ return ob_get_clean();
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="2013ahoerethtrunkincmetaboxphp"></a>
<div class="modfile"><h4>Modified: 2013/ahoereth/trunk/inc/metabox.php (2097 => 2098)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/inc/metabox.php 2013-07-10 10:51:15 UTC (rev 2097)
+++ 2013/ahoereth/trunk/inc/metabox.php 2013-07-10 12:13:33 UTC (rev 2098)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><span class="cx"> <?php
</span><del>-// structure with classes and ids taken from the code generated on post.php
</del><ins>+// Generall structure taken from the metabox code on post.php
</ins><span class="cx">
</span><span class="cx"> if ( empty( $id ) )
</span><span class="cx"> die( "For using the revisions list metabox template '$id' needs to be set:" . CODE_REVISIONS_DIR . 'inc/metabox.php' );
</span><span class="cx"> ?>
</span><span class="cx">
</span><ins>+<div class="metabox-holder">
</ins><span class="cx"> <div class="postbox" id="revisionsdiv">
</span><span class="cx"> <h3 class="hndle">
</span><span class="cx"> <span>
</span><span class="lines">@@ -15,4 +16,5 @@
</span><span class="cx"> <?php wp_list_post_revisions( $id, 'all' ); ?>
</span><span class="cx">
</span><span class="cx"> </div>
</span><del>- </div>
</del><span class="cx">\ No newline at end of file
</span><ins>+ </div>
+</div>
</ins></span></pre></div>
<a id="2013ahoerethtrunkjseditorsjs"></a>
<div class="modfile"><h4>Modified: 2013/ahoereth/trunk/js/editors.js (2097 => 2098)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/ahoereth/trunk/js/editors.js 2013-07-10 10:51:15 UTC (rev 2097)
+++ 2013/ahoereth/trunk/js/editors.js 2013-07-10 12:13:33 UTC (rev 2098)
</span><span class="lines">@@ -2,25 +2,14 @@
</span><span class="cx">
</span><span class="cx"> data = _code_revisions;
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><del>- * Get revisions list and add it below the editor if there are any revisions
</del><ins>+ * Insert revisions list below code editor
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.2
</span><span class="cx"> */
</span><span class="cx"> if ( 0 < data.post_id ) {
</span><del>- $.post( ajaxurl,
- {
- 'action' : 'code_revisions_list',
- 'post_id' : data.post_id,
- 'nonce' : data.nonce,
- },
- function(response) {
- if ( response.success ) {
- $('#template').append( $('<div/>', { class : 'metabox-holder' }).hide() );
- $('#template .metabox-holder').html( response.data ).slideDown( 'slow' );
- }
- }, "json"
- );
</del><ins>+ $('#template').append( data.revisions_list );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> });
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>