<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16927] trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js:
Pink trailing whites</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16927">16927</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-14 19:38:38 +0000 (Tue, 14 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pink trailing whites</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswplinkjswplinkdevjs">trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswplinkjswplinkdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js (16926 => 16927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2010-12-14 19:37:04 UTC (rev 16926)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2010-12-14 19:38:38 UTC (rev 16927)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">
</span><span class="cx"> (function($){
</span><span class="cx"> var inputs = {}, rivers = {}, ed, River, Query;
</span><del>-
</del><ins>+
</ins><span class="cx"> wpLink = {
</span><span class="cx"> timeToTriggerRiver: 150,
</span><span class="cx"> minRiverAJAXDuration: 200,
</span><span class="lines">@@ -32,22 +32,22 @@
</span><span class="cx"> e.preventDefault();
</span><span class="cx"> });
</span><span class="cx"> $('#wp-link-cancel').click( wpLink.cancel );
</span><del>-
</del><ins>+
</ins><span class="cx"> rivers.elements.bind('river-select', wpLink.updateFields );
</span><del>-
</del><ins>+
</ins><span class="cx"> inputs.search.keyup( wpLink.searchInternalLinks );
</span><del>-
</del><ins>+
</ins><span class="cx"> inputs.dialog.bind('wpdialogrefresh', wpLink.refresh);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> refresh : function() {
</span><span class="cx"> var e;
</span><span class="cx"> ed = tinyMCEPopup.editor;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Refresh rivers (clear links, check visibility)
</span><span class="cx"> rivers.search.refresh();
</span><span class="cx"> rivers.recent.refresh();
</span><del>-
</del><ins>+
</ins><span class="cx"> tinyMCEPopup.restoreSelection();
</span><span class="cx">
</span><span class="cx"> // If link exists, select proper values.
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> if ( ! rivers.recent.ul.children().length )
</span><span class="cx"> rivers.recent.ajax();
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> cancel : function() {
</span><span class="cx"> tinyMCEPopup.close();
</span><span class="cx"> },
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> ed.dom.setAttribs(e, attrs);
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Sometimes WebKit lets a user create a link where
</span><span class="cx"> // they shouldn't be able to. In this case, CreateLink
</span><span class="cx"> // injects "#mce_temp_url#" into their content. Fix it.
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> rivers.recent.show();
</span><span class="cx"> }
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> next : function() {
</span><span class="cx"> rivers.search.next();
</span><span class="cx"> rivers.recent.next();
</span><span class="lines">@@ -186,10 +186,10 @@
</span><span class="cx"> rivers.search.prev();
</span><span class="cx"> rivers.recent.prev();
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> keydown : function( event ) {
</span><span class="cx"> var fn, key = $.ui.keyCode;
</span><del>-
</del><ins>+
</ins><span class="cx"> switch( event.which ) {
</span><span class="cx"> case key.UP:
</span><span class="cx"> fn = 'prev';
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> },
</span><span class="cx"> keyup: function( event ) {
</span><span class="cx"> var key = $.ui.keyCode;
</span><del>-
</del><ins>+
</ins><span class="cx"> switch( event.which ) {
</span><span class="cx"> case key.ESCAPE:
</span><span class="cx"> wpLink.cancel();
</span><span class="lines">@@ -244,20 +244,20 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> River = function( element, search ) {
</span><span class="cx"> var self = this;
</span><span class="cx"> this.element = element;
</span><span class="cx"> this.ul = element.children('ul');
</span><span class="cx"> this.waiting = element.find('.river-waiting');
</span><del>-
</del><ins>+
</ins><span class="cx"> this.change( search );
</span><span class="cx"> this.refresh();
</span><del>-
</del><ins>+
</ins><span class="cx"> element.scroll( function(){ self.maybeLoad(); });
</span><span class="cx"> element.delegate('li', 'click', function(e){ self.select( $(this), e ); });
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> $.extend( River.prototype, {
</span><span class="cx"> refresh: function() {
</span><span class="cx"> this.deselect();
</span><span class="lines">@@ -277,10 +277,10 @@
</span><span class="cx"> // Selects a list item and triggers the river-select event.
</span><span class="cx"> select: function( li, event ) {
</span><span class="cx"> var liHeight, elHeight, liTop, elTop;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( li.hasClass('unselectable') || li == this.selected )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> this.deselect();
</span><span class="cx"> this.selected = li.addClass('selected');
</span><span class="cx"> // Make sure the element is visible
</span><span class="lines">@@ -288,12 +288,12 @@
</span><span class="cx"> elHeight = this.element.height();
</span><span class="cx"> liTop = li.position().top;
</span><span class="cx"> elTop = this.element.scrollTop();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( liTop < 0 ) // Make first visible element
</span><span class="cx"> this.element.scrollTop( elTop + liTop );
</span><span class="cx"> else if ( liTop + liHeight > elHeight ) // Make last visible element
</span><span class="cx"> this.element.scrollTop( elTop + liTop - elHeight + liHeight );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Trigger the river-select event
</span><span class="cx"> this.element.trigger('river-select', [ li, event, this ]);
</span><span class="cx"> },
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> prev: function() {
</span><span class="cx"> if ( ! this.visible )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> var to;
</span><span class="cx"> if ( this.selected ) {
</span><span class="cx"> to = this.selected.prev('li');
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> next: function() {
</span><span class="cx"> if ( ! this.visible )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> var to = this.selected ? this.selected.next('li') : $('li:not(.unselectable):first', this.element);
</span><span class="cx"> if ( to.length )
</span><span class="cx"> this.select( to );
</span><span class="lines">@@ -329,13 +329,13 @@
</span><span class="cx"> if ( callback )
</span><span class="cx"> callback( results, params );
</span><span class="cx"> }, delay );
</span><del>-
</del><ins>+
</ins><span class="cx"> this.query.ajax( response );
</span><span class="cx"> },
</span><span class="cx"> change: function( search ) {
</span><span class="cx"> if ( this.query && this._search == search )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> this._search = search;
</span><span class="cx"> this.query = new Query( search );
</span><span class="cx"> this.element.scrollTop(0);
</span><span class="lines">@@ -387,14 +387,14 @@
</span><span class="cx"> }, wpLink.timeToTriggerRiver );
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> Query = function( search ) {
</span><span class="cx"> this.page = 1;
</span><span class="cx"> this.allLoaded = false;
</span><span class="cx"> this.querying = false;
</span><span class="cx"> this.search = search;
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> $.extend( Query.prototype, {
</span><span class="cx"> ready: function() {
</span><span class="cx"> return !( this.querying || this.allLoaded );
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> query.search = this.search;
</span><span class="cx">
</span><span class="cx"> this.querying = true;
</span><del>-
</del><ins>+
</ins><span class="cx"> $.post( ajaxurl, query, function(r) {
</span><span class="cx"> self.page++;
</span><span class="cx"> self.querying = false;
</span></span></pre>
</div>
</div>
</body>
</html>