Changeset 16439

Timestamp:

11/17/2010 06:48:27 PM (14 years ago)

Author:

ryan

Message:

Pinking shears

Location:

trunk/wp-includes/js/tinymce

Files:

• plugins/wplink/editor_plugin.dev.js (modified) (1 diff)
• plugins/wplink/js/wplink.dev.js (modified) (14 diffs)
• wp-mce-link-includes.php (modified) (4 diffs)

trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js

@@ -27 +27 @@
                 cmd : 'WP_Link'
             });
-            
+
             ed.addShortcut('alt+shift+a', ed.getLang('advanced.link_desc'), 'WP_Link');
 

trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js

@@ -1 @@
-(function($){   
+(function($){
     var inputs = {}, results = {}, ed,
     wpLink = {
@@ -16 +16 @@
             // Init shared vars
             ed = tinyMCEPopup.editor;
-            
-            
+
+
             // URL
             inputs.url = $('#url-field');
@@ -30 +30 @@
             results.search.data('river', wpLink.riverDefaults() );
             results.recent.data('river', wpLink.riverDefaults() );
-            
+
             // Bind event handlers
             $('#wp-update').click( wpLink.update );
@@ -47 +47 @@
                     inputs.openInNewTab.attr('checked','checked');
             }
-            
+
             // Focus the URL field
             inputs.url.focus();
         },
-        
+
         update : function() {
             var el,
@@ -61 +61 @@
                 }, e, b,
                 defaultContent = attrs.title ? attrs.title : attrs.href;
-            
+
             tinyMCEPopup.restoreSelection();
             e = ed.dom.getParent(ed.selection.getNode(), 'A');
-            
+
             // If the values are empty...
             if ( ! attrs.href ) {
@@ -82 +82 @@
                 }
             }
-            
+
             tinyMCEPopup.execCommand("mceBeginUndoLevel");
 
             if (e == null) {
                 ed.getDoc().execCommand("unlink", false, null);
-                
+
                 // If no selection exists, create a new link from scratch.
                 if ( ed.selection.isCollapsed() ) {
@@ -118 +118 @@
             tinyMCEPopup.close();
         },
-        
+
         selectInternalLink : function() {
             var t = $(this);
@@ -128 +128 @@
             inputs.title.val( t.children('.item-title').text() );
         },
-        
+
         maybeLoadRiver : function() {
             var t = $(this),
@@ -134 +134 @@
                 river = t.data('river'),
                 bottom = t.scrollTop() + t.height();
-            
+
             if ( bottom != ul.height() || river.active || river.allLoaded )
                 return;
-            
+
             setTimeout(function() {
                 var newTop = t.scrollTop(),
                     newBottom = newTop + t.height(),
                     waiting = t.find('.river-waiting');
-                
+
                 if ( bottom != newBottom || newBottom != ul.height() || river.active || river.allLoaded )
                     return;
-                
+
                 river.active = true;
                 waiting.show();
@@ -164 +164 @@
             var t = $(this), waiting,
                 title = t.val();
-            
+
             if ( title.length > 2 ) {
                 results.recent.hide();
                 results.search.show();
-                
+
                 // Don't search if the keypress didn't change the title.
                 if ( wpLink.lastSearch == title )
                     return;
-                
+
                 wpLink.lastSearch = title;
                 waiting = t.siblings('img.waiting').show();
-                
+
                 results.search.data('river', wpLink.riverDefaults() );
                 results.search.scrollTop(0);
@@ -184 +184 @@
             }
         },
-        
+
         linkAJAX : function( $panel, params, callback, opts ) {
             var response;
             opts = opts || {};
-            
+
             if ( ! $panel.hasClass('query-results') )
                 $panel = $panel.parents('.query-results');
-            
+
             if ( ! $panel.length )
                 return;
-            
+
             response = wpLink.delayedCallback( function( results ) {
                 wpLink.processAJAXResponse( $panel, results, callback, opts );
             }, opts.delay );
-            
+
             $.post( ajaxurl, $.extend({
                 action : 'wp-link-ajax'
             }, params ), response, "json" );
         },
-        
+
         processAJAXResponse: function( $panel, results, callback, opts ) {
             var list = '';
-            
+
             if ( !results ) {
                 if ( !opts.append ) {
@@ -221 +221 @@
                 });
             }
-            
+
             // Set results
             $panel.children('ul')[ opts.append ? 'append' : 'html' ]( list );
-            
+
             // Run callback
             if ( callback )
                 callback( results );
         },
-        
+
         delayedCallback : function( func, delay ) {
             var timeoutTriggered, funcTriggered, funcArgs, funcContext;
-            
+
             if ( ! delay )
                 return func;
-            
+
             setTimeout( function() {
                 if ( funcTriggered )
@@ -242 +242 @@
                 timeoutTriggered = true;
             }, delay);
-            
+
             return function() {
                 if ( timeoutTriggered )
@@ -253 +253 @@
         }
     }
-    
+
     $(document).ready( wpLink.init );
 })(jQuery);

trunk/wp-includes/js/tinymce/wp-mce-link-includes.php

@@ -4 +4 @@
     $pts = get_post_types( array( 'publicly_queryable' => true ), 'objects' );
     $pt_names = array_keys( $pts );
-    
+
     $query = array(
         'post_type' => $pt_names,
@@ -29 +29 @@
     if ( ! $get_posts->post_count )
         return false;
-    
+
     // Build results.
     $results = array();
@@ -37 +37 @@
         else
             $info = $pts[ $post->post_type ]->labels->singular_name;
-        
+
         $results[] = array(
             'ID' => $post->ID,
@@ -59 +59 @@
     if ( ! isset( $results ) )
         die( '0' );
-    
+
     echo json_encode( $results );
     echo "\n";