<!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][9098] trunk/src/bp-activity/js/mentions.js: Mentions: backport upstream JS for contentEditable/TinyMCE support fixes.</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" 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/9098">9098</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/9098","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-29 00:36:12 +0000 (Wed, 29 Oct 2014)</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'>Mentions: backport upstream JS for contentEditable/TinyMCE support fixes.
See <a href="http://buddypress.trac.wordpress.org/ticket/5969">#5969</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityjsmentionsjs">trunk/src/bp-activity/js/mentions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityjsmentionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/js/mentions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/js/mentions.js 2014-10-29 00:36:09 UTC (rev 9097)
+++ trunk/src/bp-activity/js/mentions.js 2014-10-29 00:36:12 UTC (rev 9098)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,20 +76,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (2.1.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> before_reposition: function( offset ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $view = $( '#atwho-ground-' + this.id + ' .atwho-view' ),
- caret = this.$inputor.caret( 'offset', { iframe: $( '#content_ifr' )[0] } ).left,
- move;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // get the iframe, if any, already applied with atwho
+ var caret,
+ line,
+ iframeOffset,
+ move,
+ $view = $( '#atwho-ground-' + this.id + ' .atwho-view' ),
+ $body = $( 'body' ),
+ atwhoDataValue = this.$inputor.data( 'atwho' );
</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 the caret is past horizontal half, then flip it, yo.
- if ( caret > ( $( 'body' ).width() / 2 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'undefined' !== atwhoDataValue && 'undefined' !== atwhoDataValue.iframe && null !== atwhoDataValue.iframe ) {
+ caret = this.$inputor.caret( 'offset', { iframe: atwhoDataValue.iframe } );
+ // Caret.js no longer calculates iframe caret position from the window (it's now just within the iframe).
+ // We need to get the iframe offset from the window and merge that into our object.
+ iframeOffset = $( atwhoDataValue.iframe ).offset();
+ if ( 'undefined' !== iframeOffset ) {
+ caret.left += iframeOffset.left;
+ caret.top += iframeOffset.top;
+ }
+ } else {
+ caret = this.$inputor.caret( 'offset' );
+ }
+
+ // If the caret is past horizontal half, then flip it, yo
+ if ( caret.left > ( $body.width() / 2 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $view.addClass( 'right' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- move = caret - offset.left - this.view.$el.width();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ move = caret.left - offset.left - this.view.$el.width();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $view.removeClass( 'right' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- move = caret - offset.left + 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ move = caret.left - offset.left + 1;
</ins><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">- offset.top += 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we're on a small screen, scroll to caret
+ if ( $body.width() <= 400 ) {
+ $( document ).scrollTop( caret.top - 6 );
+ }
+
+ // New position is under the caret (never above) and positioned to follow
+ // Dynamic sizing based on the input area (remove 'px' from end)
+ line = parseInt( this.$inputor.css( 'line-height' ).substr( 0, this.$inputor.css( 'line-height' ).length - 2 ), 10 );
+ if ( !line || line < 5 ) { // sanity check, and catch no line-height
+ line = 19;
+ }
+
+ offset.top = caret.top + line;
</ins><span class="cx" style="display: block; padding: 0 10px"> offset.left += move;
</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">@@ -103,8 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (2.1.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> inserting_wrapper: function( $inputor, content, suffix ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var new_suffix = ( suffix === '' ) ? suffix : suffix || ' ';
- return '' + content + new_suffix;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return '' + content + suffix;
</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></pre>
</div>
</div>
</body>
</html>