<!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>[BuddyPress][12941] trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js: Nouveau: only handle Messages supported views with the Backbone router</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12941">12941</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12941","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-01 11:58:20 +0000 (Sat, 01 May 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Nouveau: only handle Messages supported views with the Backbone router
When an unsupported view is generated by a plugin (eg: adding a new Messages Component sub nav item), it is skipped by the Backbone router and the link attached to it is loaded the traditional way on click. If the current screen has been added by a plugin, the sub nav click handler also leaves the event loads the page traditionally.
Props Venutius
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8430">#8430</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaujsbuddypressmessagesjs">trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaujsbuddypressmessagesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js 2021-04-29 21:26:14 UTC (rev 12940)
+++ trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js 2021-05-01 11:58:20 UTC (rev 12941)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global wp, BP_Nouveau, _, Backbone, tinymce, tinyMCE */
</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint devel: true */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* @version 3.1.0 */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* @since 3.0.0 */
+/* @version 8.0.0 */
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px"> window.bp = window.bp || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,10 +52,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Then listen to nav click and load the appropriate view.
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#subnav a' ).on( 'click', function( event ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var view_id = $( event.target ).prop( 'id' ),
+ supportedView = [ 'inbox', 'starred', 'sentbox', 'compose' ];
+
+ if ( -1 === _.indexOf( supportedView, view_id ) || 'unsupported' === self.box ) {
+ return event;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var view_id = $( event.target ).prop( 'id' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Remove the editor to be sure it will be added dynamically later.
</span><span class="cx" style="display: block; padding: 0 10px"> self.removeTinyMCE();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,11 +608,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> errors.push( 'send_to' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> usernames = usernames.map( function( username ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- username = $.trim( username );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ username = username.trim();
</ins><span class="cx" style="display: block; padding: 0 10px"> return username;
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! usernames || ! $.isArray( usernames ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! usernames || ! _.isArray( usernames ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> errors.push( 'send_to' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1382,12 +1388,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.Router = Backbone.Router.extend( {
</span><span class="cx" style="display: block; padding: 0 10px"> routes: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'compose/' : 'composeMessage',
- 'view/:id/': 'viewMessage',
- 'sentbox/' : 'sentboxView',
- 'starred/' : 'starredView',
- 'inbox/' : 'inboxView',
- '' : 'inboxView'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'compose/' : 'composeMessage',
+ 'view/:id/' : 'viewMessage',
+ 'sentbox/' : 'sentboxView',
+ 'starred/' : 'starredView',
+ 'inbox/' : 'inboxView',
+ '' : 'inboxView',
+ '*unSupported': 'unSupported'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> composeMessage: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1420,6 +1427,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.threadsView();
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unSupported: function() {
+ bp.Nouveau.Messages.box = 'unsupported';
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> inboxView: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.box = 'inbox';
</span><span class="cx" style="display: block; padding: 0 10px"> bp.Nouveau.Messages.threadsView();
</span></span></pre>
</div>
</div>
</body>
</html>