<!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>[7262] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types: WordCamp Post Types: Provide shareable link for favorited sessions.</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://meta.trac.wordpress.org/changeset/7262">7262</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7262","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-06-01 17:35:03 +0000 (Fri, 01 Jun 2018)</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'>WordCamp Post Types: Provide shareable link for favorited sessions.
Props egmanekki.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2733">#2733</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypescssshortcodescss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesjsfavouritesessionsjs">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/js/favourite-sessions.js</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypescssshortcodescss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css 2018-06-01 17:34:59 UTC (rev 7261)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/shortcodes.css 2018-06-01 17:35:03 UTC (rev 7262)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> position: fixed;
</span><span class="cx" style="display: block; padding: 0 10px"> bottom: 50px;
</span><span class="cx" style="display: block; padding: 0 10px"> right: 100px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 200px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 350px;
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #dcdcdc;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 12px;
</span><span class="cx" style="display: block; padding: 0 10px"> z-index: 9999;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesjsfavouritesessionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/js/favourite-sessions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/js/favourite-sessions.js 2018-06-01 17:34:59 UTC (rev 7261)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/js/favourite-sessions.js 2018-06-01 17:35:03 UTC (rev 7262)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery( document ).ready( function ( $ ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var favSessionsUrlSlug = 'fav-sessions=';
+
+ function getUrlParams() {
+ var url = decodeURIComponent( window.location.search ),
+ urlParams = {};
+
+ url.replace( /[?&]+([^=&]+)=([^&]*)/gi, function( str, key, value ) {
+ urlParams[ key ] = value;
+ } );
+
+ return urlParams;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> var FavSessions = {
</span><span class="cx" style="display: block; padding: 0 10px"> favSessKey: 'favourite_sessions',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ useLocalStorage: 'local_storage',
+ useUrlSessions: 'URL',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get: function () {
- var favSessions = JSON.parse( localStorage.getItem( this.favSessKey ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get: function() {
+ if ( this.primarySource == this.useLocalStorage ) {
+ var favSessions = JSON.parse( localStorage.getItem( this.favSessKey ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! favSessions ) {
- favSessions = {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! favSessions ) {
+ favSessions = {};
+ }
+ } else {
+ favSessions = this.favSessionsFromUrl();
</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"> return favSessions;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +32,10 @@
</span><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"> toggleSession: function ( sessionId ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.primarySource !== this.useLocalStorage ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> var favSessions = this.get();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( favSessions.hasOwnProperty( sessionId ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,8 +46,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> localStorage.setItem( this.favSessKey, JSON.stringify( favSessions ) );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ getSessionsForLink: function() {
+ var favSessions = this.get();
+
+ return Object.keys( favSessions ).join();
+ },
+
+ favSessionsFromUrl: function() {
+ var urlParams = getUrlParams(),
+ urlSlugPosition = favSessionsUrlSlug.slice( 0, favSessionsUrlSlug.length - 1 ),
+ favSessionIds = urlParams[ urlSlugPosition ].split( ',' ),
+ favSessions = {};
+
+ for ( var i = 0; i < favSessionIds.length; i++ ) {
+ favSessions[ favSessionIds[ i ] ] = true;
+ }
+
+ return favSessions;
+ },
+
+ updateBasedOnLink: function() {
+ favSessions = this.favSessionsFromUrl();
+
+ localStorage.setItem( this.favSessKey, JSON.stringify( favSessions ) );
+
+ return this.get();
+ },
</ins><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">+ // Use local storage for session source for fetching & target for saving by default.
+ FavSessions.primarySource = FavSessions.useLocalStorage;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function switchCellAppearance( sessionId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // (Un)highlight schedule table cell in case a session is (un)marked as favourite.
</span><span class="cx" style="display: block; padding: 0 10px"> var sessionSelector = '[data-session-id=\'' + sessionId + '\']';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,10 +102,35 @@
</span><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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function updateShareLink() {
+ var favSessionIds = FavSessions.getSessionsForLink(),
+ urlParams = getUrlParams(),
+ baseURL = window.location.href,
+ paramsPosition = baseURL.indexOf( '?' ),
+ urlSlugPosition = favSessionsUrlSlug.slice( 0, favSessionsUrlSlug.length - 1 );
+
+ if ( -1 !== paramsPosition ) {
+ baseURL = baseURL.slice( 0, paramsPosition );
+ }
+
+ urlParams[ urlSlugPosition ] = favSessionIds;
+
+ // Don't include empty URL parameter.
+ if ( '' === favSessionIds ) {
+ delete urlParams[ urlSlugPosition ];
+ }
+
+ var favSessionsLink = baseURL + '?' + $.param( urlParams );
+
+ $( '#fav-sessions-link' ).text( favSessionsLink );
+ $( '#fav-sessions-link' ).prop( 'href', favSessionsLink );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function switchSessionFavourite( sessionId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> FavSessions.toggleSession( sessionId );
</span><span class="cx" style="display: block; padding: 0 10px"> switchCellAppearance( sessionId );
</span><span class="cx" style="display: block; padding: 0 10px"> switchEmailFavButton();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateShareLink();
</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"> function initFavouriteSessions() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,6 +140,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">+ /*
+ * The user has already saved some sessions in local storage, but is now
+ * loading a shared link. We need to determine whether they intend to overwrite
+ * their saved sessions with those in the link, or if they just want to view
+ * the link's sessions and then discard them, so that their saved sessions remain
+ * in tact.
+ */
+ var currentUrl = window.location.href;
+
+ if ( currentUrl.indexOf( favSessionsUrlSlug ) > -1 ) {
+ var overwrite = confirm( favSessionsPhpObject.i18n.overwriteFavSessions );
+
+ if ( true === overwrite ) {
+ FavSessions.primarySource = FavSessions.useLocalStorage;
+ favSessions = FavSessions.updateBasedOnLink( currentUrl );
+
+ $( '.fav-session-button' ).attr( 'title', '' );
+ $( '.fav-session-button' ).fadeTo( 0, 1 );
+ } else {
+ FavSessions.primarySource = FavSessions.useUrlSessions;
+ favSessions = FavSessions.get();
+
+ /*
+ * Deactivate interaction with favourite session buttons,
+ * since the use chose to not overwrite their saved sessions.
+ */
+ $( '.fav-session-button' ).attr( 'title', favSessionsPhpObject.i18n.buttonDisabledNote );
+ $( '.fav-session-button' ).fadeTo( 0, 0.5 );
+ $( '.fav-session-button' ).css( 'color', '#e7e7e7' );
+ }
+ }
+
+ if ( {} === favSessions ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Highlight favourite sessions in table.
</span><span class="cx" style="display: block; padding: 0 10px"> var sessionIds = Object.keys( favSessions );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,6 +188,7 @@
</span><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"> switchEmailFavButton();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateShareLink();
</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"> function hideSpinnerShowResult( message ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,10 +233,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.fav-session-button' ).click( function ( event ) {
</span><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 elem = $( this );
- var sessionId = elem.parent().parent().data( 'session-id' );
- switchSessionFavourite( sessionId );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( FavSessions.primarySource == FavSessions.useLocalStorage ) {
+ var elem = $( this ),
+ sessionId = elem.parent().parent().data( 'session-id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switchSessionFavourite( sessionId );
+ } else {
+ alert( favSessionsPhpObject.i18n.buttonDisabledAlert );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2018-06-01 17:34:59 UTC (rev 7261)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2018-06-01 17:35:03 UTC (rev 7262)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -731,6 +731,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'reqTimeOut' => esc_html__( 'Sorry, the email request timed out.', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'otherError' => esc_html__( 'Sorry, the email request failed.', 'wordcamporg' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'overwriteFavSessions' => esc_html__( 'You already have some sessions saved. Would you like to overwrite those with the shared sessions that you are viewing?', 'wordcamporg' ),
+ 'buttonDisabledAlert' => esc_html__( 'Interaction with favorite sessions disabled in share sessions view. Please click on schedule menu link to pick sessions.', 'wordcamporg' ),
+ 'buttonDisabledNote' => esc_html__( 'Button disabled.', 'wordcamporg' ),
</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"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,6 +767,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="fav-session-tablinks" id="fav-session-btn-link">
+ <?php esc_html_e( 'Link', 'wordcamporg' ); ?>
+ </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="fav-session-tablinks" id="fav-session-btn-print">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Print', 'wordcamporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,6 +793,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="fav-session-tab-link" class="fav-session-share-tabcontent">
+ <?php esc_html_e( 'Shareable link:', 'wordcamporg' ); ?><br />
+ <a id="fav-sessions-link" href=""></a>
+ </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="fav-session-tab-print" class="fav-session-share-tabcontent">
</span><span class="cx" style="display: block; padding: 0 10px"> <button id="fav-session-print">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Print favorite sessions', 'wordcamporg' ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>