Make WordPress Core

Changeset 18969


Ignore:
Timestamp:
10/14/2011 03:33:46 AM (12 years ago)
Author:
koopersmith
Message:

Simplify pointer API with smarter positioning. see #18693.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/template.php

    r18937 r18969  
    16511651        wp_enqueue_style( 'wp-pointer' );
    16521652        wp_enqueue_script( 'wp-pointer' );
    1653         wp_enqueue_script( 'utils' );
    16541653    }
    16551654}
     
    16651664//<![CDATA[
    16661665jQuery(document).ready( function($) {
    1667     $('#wpadminbar').pointer({
     1666    $('#wp-admin-bar-help').pointer({
    16681667        content: '<?php echo $pointer_content; ?>',
    1669         position: {
    1670             my: 'left top',
    1671             at: 'center bottom',
    1672             offset: '-25 0'
    1673         },
     1668        position: 'top',
    16741669        close: function() {
    16751670            $.post( ajaxurl, {
  • trunk/wp-includes/css/wp-pointer.css

    r18707 r18969  
    1 .wp-pointer-content{padding:0 10px;background:white;border:1px solid #aaa;-moz-box-shadow:0 0 16px rgba(0,0,0,0.1);-webkit-box-shadow:0 0 16px rgba(0,0,0,0.1);box-shadow:0 0 16px rgba(0,0,0,0.1);}.wp-pointer-buttons{padding:0 0 10px 0;overflow:auto;}.wp-pointer-buttons a{float:right;display:inline-block;}.wp-pointer-arrow,.wp-pointer-arrow-inner{position:absolute;width:0;height:0;}.wp-pointer-arrow{z-index:10;}.wp-pointer-arrow-inner{z-index:20;}.wp-pointer-left{margin-left:10px;}.wp-pointer-right{margin-left:-10px;}.wp-pointer-top{margin-top:10px;}.wp-pointer-bottom{margin-top:-10px;}.wp-pointer-left .wp-pointer-arrow,.wp-pointer-right .wp-pointer-arrow,.wp-pointer-top .wp-pointer-arrow,.wp-pointer-bottom .wp-pointer-arrow{border:solid 10px transparent;}.wp-pointer-left .wp-pointer-arrow{border-right-color:#aaa;border-left-width:0;right:100%;top:0;}.wp-pointer-right .wp-pointer-arrow{border-left-color:#aaa;border-right-width:0;left:100%;top:0;}.wp-pointer-top .wp-pointer-arrow{border-bottom-color:#aaa;border-top-width:0;left:0;bottom:100%;}.wp-pointer-bottom .wp-pointer-arrow{border-top-color:#aaa;border-bottom-width:0;left:0;top:100%;}.wp-pointer-left .wp-pointer-arrow-inner,.wp-pointer-right .wp-pointer-arrow-inner,.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer-bottom .wp-pointer-arrow-inner{border:solid 9px transparent;}.wp-pointer-left .wp-pointer-arrow-inner{border-right-color:#fff;border-left-width:0;top:-9px;left:2px;}.wp-pointer-right .wp-pointer-arrow-inner{border-left-color:#fff;border-right-width:0;top:-9px;right:2px;}.wp-pointer-top .wp-pointer-arrow-inner{border-bottom-color:#fff;border-top-width:0;top:2px;left:-9px;}.wp-pointer-bottom .wp-pointer-arrow-inner{border-top-color:#fff;border-bottom-width:0;bottom:2px;left:-9px;}
     1.wp-pointer-content{padding:0 10px;background:white;border:1px solid #aaa;-moz-box-shadow:0 0 16px rgba(0,0,0,0.1);-webkit-box-shadow:0 0 16px rgba(0,0,0,0.1);box-shadow:0 0 16px rgba(0,0,0,0.1);}.wp-pointer-buttons{padding:0 0 10px 0;overflow:auto;}.wp-pointer-buttons a{float:right;display:inline-block;}.wp-pointer-arrow,.wp-pointer-arrow-inner{position:absolute;width:0;height:0;}.wp-pointer-arrow{z-index:10;}.wp-pointer-arrow-inner{z-index:20;}.wp-pointer-left{margin-left:10px;}.wp-pointer-right{margin-left:-10px;}.wp-pointer-top{margin-top:10px;}.wp-pointer-bottom{margin-top:-10px;}.wp-pointer-left .wp-pointer-arrow,.wp-pointer-right .wp-pointer-arrow,.wp-pointer-top .wp-pointer-arrow,.wp-pointer-bottom .wp-pointer-arrow{border:solid 10px transparent;}.wp-pointer-left .wp-pointer-arrow{border-right-color:#aaa;border-left-width:0;}.wp-pointer-right .wp-pointer-arrow{border-left-color:#aaa;border-right-width:0;}.wp-pointer-top .wp-pointer-arrow{border-bottom-color:#aaa;border-top-width:0;}.wp-pointer-bottom .wp-pointer-arrow{border-top-color:#aaa;border-bottom-width:0;}.wp-pointer-left .wp-pointer-arrow-inner,.wp-pointer-right .wp-pointer-arrow-inner,.wp-pointer-top .wp-pointer-arrow-inner,.wp-pointer-bottom .wp-pointer-arrow-inner{border:solid 9px transparent;}.wp-pointer-left .wp-pointer-arrow-inner{border-right-color:#fff;border-left-width:0;top:-9px;left:2px;}.wp-pointer-right .wp-pointer-arrow-inner{border-left-color:#fff;border-right-width:0;top:-9px;right:2px;}.wp-pointer-top .wp-pointer-arrow-inner{border-bottom-color:#fff;border-top-width:0;top:2px;left:-9px;}.wp-pointer-bottom .wp-pointer-arrow-inner{border-top-color:#fff;border-bottom-width:0;bottom:2px;left:-9px;}
  • trunk/wp-includes/css/wp-pointer.dev.css

    r18707 r18969  
    5252    border-right-color: #aaa;
    5353    border-left-width: 0;
    54     right: 100%;
    55     top: 0;
    5654}
    5755.wp-pointer-right .wp-pointer-arrow {
    5856    border-left-color: #aaa;
    5957    border-right-width: 0;
    60     left: 100%;
    61     top: 0;
    6258}
    6359.wp-pointer-top .wp-pointer-arrow {
    6460    border-bottom-color: #aaa;
    6561    border-top-width: 0;
    66     left: 0;
    67     bottom: 100%;
    6862}
    6963.wp-pointer-bottom .wp-pointer-arrow {
    7064    border-top-color: #aaa;
    7165    border-bottom-width: 0;
    72     left: 0;
    73     top: 100%;
    7466}
    7567
  • trunk/wp-includes/js/wp-pointer.dev.js

    r18707 r18969  
    2020                });
    2121            },
    22             arrow: 'auto',
    23             position: {
    24                 my: "left center",
    25                 at: "right center"
    26             },
    27             arrow: {
    28                 edge:  'top',
    29                 align: 'left',
    30                 offset: 20
    31             },
     22            position: 'top',
    3223            show: function( event, t ) {
    3324                t.pointer.show();
     
    152143
    153144        reposition: function() {
     145            var position;
     146
    154147            if ( this.options.disabled )
    155148                return;
     149
     150            position = this._processPosition( this.options.position );
    156151
    157152            // Reposition pointer.
     
    162157            }).show().position($.extend({
    163158                of: this.element
    164             }, this.options.position )); // the object comes before this.options.position so the user can override position.of.
     159            }, position )); // the object comes before this.options.position so the user can override position.of.
    165160
    166161            this.repoint();
     
    169164        repoint: function() {
    170165            var o = this.options,
    171                 position = {
    172                     my: 'center',
    173                     of: this.pointer
    174                 },
    175                 clear;
     166                position,
     167                at;
    176168
    177169            if ( o.disabled )
    178170                return;
     171
     172            // Generate arrow position from the box position.
     173            position = $.extend( this._processPosition( o.position ), {
     174                of: this.pointer,
     175                offset: ''
     176            });
     177
     178            // Swap at and my; we're positioning the arrow relative to the box.
     179            at = position.at + '';
     180            position.at = position.my;
     181            position.my = at;
     182
     183            // Don't align the arrows exactly with the edge.
     184            if ( position.align != 'center' ) {
     185                position.offset = ( position.align == 'top' || position.align == 'left' ) ? 15 : -15;
     186                if ( position.align == 'top' || position.align == 'bottom' )
     187                    position.offset = '0 ' + position.offset;
     188                else
     189                    position.offset = position.offset + ' 0';
     190            }
    179191
    180192            // Remove arrow classes.
    181193            this.pointer[0].className = this.pointer[0].className.replace( /wp-pointer-[^\s'"]*/, '' );
    182194
    183             if ( o.arrow.edge == 'top' || o.arrow.edge == 'bottom' ) {
    184                 position.at = o.arrow.align + ' ' + o.arrow.edge;
    185                 position.offset = o.arrow.offset + ' 0';
    186                 clear = 'top';
     195            // Add arrow class.
     196            this.pointer.addClass( 'wp-pointer-' + position.edge );
     197
     198            // Reposition arrow.
     199            this.arrow.position( position );
     200        },
     201
     202        _processPosition: function( position ) {
     203            var opposite = {
     204                    top: 'bottom',
     205                    bottom: 'top',
     206                    left: 'right',
     207                    right: 'left'
     208                },
     209                result;
     210
     211            // If the position object is a string, it is shorthand for position.edge.
     212            if ( typeof position == 'string' ) {
     213                result = {
     214                    edge: position + ''
     215                };
    187216            } else {
    188                 position.at = o.arrow.edge + ' ' + o.arrow.align;
    189                 position.offset = '0 ' + o.arrow.offset;
    190                 clear = 'left';
    191             }
    192 
    193             // Reposition arrow.
    194             this.arrow.position( position ).css( clear, '' );
    195             // Add arrow class.
    196             this.pointer.addClass( 'wp-pointer-' + o.arrow.edge );
    197         },
    198 
     217                result = $.extend( {}, position );
     218            }
     219
     220            if ( ! result.edge )
     221                return result;
     222
     223            if ( result.edge == 'top' || result.edge == 'bottom' ) {
     224                result.align = result.align || 'left';
     225
     226                result.at = result.at || result.align + ' ' + opposite[ result.edge ];
     227                result.my = result.my || result.align + ' ' + result.edge;
     228            } else {
     229                result.align = result.align || 'top';
     230
     231                result.at = result.at || opposite[ result.edge ] + ' ' + result.align;
     232                result.my = result.my || result.edge + ' ' + result.align;
     233            }
     234
     235            return result;
     236        },
    199237
    200238        open: function( event ) {
  • trunk/wp-includes/js/wp-pointer.js

    r18707 r18969  
    1 (function(c){var a=0,b=9999;c.widget("wp.pointer",{options:{pointerClass:"wp-pointer",content:function(f,e,d){return c(this).text()},buttons:function(f,e){var g=(wpPointerL10n)?wpPointerL10n.close:"Close",d=c('<a class="button-secondary">'+g+"</div>");return d.bind("click.pointer",function(){e.element.pointer("close")})},arrow:"auto",position:{my:"left center",at:"right center"},arrow:{edge:"top",align:"left",offset:20},show:function(e,d){d.pointer.show();d.opened()},hide:function(e,d){d.pointer.hide();d.closed()},document:document},_create:function(){var e,d;this.content=c('<div class="wp-pointer-content"></div>');this.arrow=c('<div class="wp-pointer-arrow"><div class="wp-pointer-arrow-inner"></div></div>');d=this.element.parents().add(this.element);e="absolute";if(d.filter(function(){return"fixed"===c(this).css("position")}).length){e="fixed"}this.pointer=c("<div />").append(this.content).append(this.arrow).attr("id","wp-pointer-"+a++).addClass(this.options.pointerClass).css("position",e).hide().appendTo(this.options.document.body)},_setOption:function(d,f){var g=this.options,e=this.pointer;if(d==="document"&&f!==g.document){e.detach().appendTo(f.body)}else{if(d==="pointerClass"){e.removeClass(g.pointerClass).addClass(f)}}c.Widget.prototype._setOption.apply(this,arguments);if(d==="position"){this.reposition()}else{if(d==="content"&&this.active){this.update()}}},destroy:function(){this.pointer.remove();c.Widget.prototype.destroy.call(this)},widget:function(){return this.pointer},update:function(g){var e=this,h=this.options,d=c.Deferred(),f;if(h.disabled){return}d.done(function(i){e._update(g,i)});if(typeof h.content==="string"){f=h.content}else{f=h.content.call(this.element[0],d.resolve,g,this._handoff())}if(f){d.resolve(f)}return d.promise()},_update:function(f,e){var d,g=this.options;if(!e){return}this.pointer.stop();this.content.html(e);d=g.buttons.call(this.element[0],f,this._handoff());if(d){d.wrap('<div class="wp-pointer-buttons" />').parent().appendTo(this.content)}this.reposition()},reposition:function(){if(this.options.disabled){return}this.pointer.css({top:0,left:0,zIndex:b++}).show().position(c.extend({of:this.element},this.options.position));this.repoint()},repoint:function(){var f=this.options,e={my:"center",of:this.pointer},d;if(f.disabled){return}this.pointer[0].className=this.pointer[0].className.replace(/wp-pointer-[^\s'"]*/,"");if(f.arrow.edge=="top"||f.arrow.edge=="bottom"){e.at=f.arrow.align+" "+f.arrow.edge;e.offset=f.arrow.offset+" 0";d="top"}else{e.at=f.arrow.edge+" "+f.arrow.align;e.offset="0 "+f.arrow.offset;d="left"}this.arrow.position(e).css(d,"");this.pointer.addClass("wp-pointer-"+f.arrow.edge)},open:function(e){var d=this,f=this.options;if(this.active||f.disabled){return}this.update().done(function(){d._open(e)})},_open:function(e){var d=this,f=this.options;if(this.active||f.disabled){return}this.active=true;this._trigger("open",e,this._handoff());this._trigger("show",e,this._handoff({opened:function(){d._trigger("opened",e,d._handoff())}}))},close:function(e){if(!this.active||this.options.disabled){return}var d=this;this.active=false;this._trigger("close",e,this._handoff());this._trigger("hide",e,this._handoff({closed:function(){d._trigger("closed",e,d._handoff())}}))},sendToTop:function(d){if(this.active){this.pointer.css("z-index",b++)}},toggle:function(d){if(this.pointer.is(":hidden")){this.open(d)}else{this.close(d)}},_handoff:function(d){return c.extend({pointer:this.pointer,element:this.element},d)}})})(jQuery);
     1(function(c){var a=0,b=9999;c.widget("wp.pointer",{options:{pointerClass:"wp-pointer",content:function(f,e,d){return c(this).text()},buttons:function(f,e){var g=(wpPointerL10n)?wpPointerL10n.close:"Close",d=c('<a class="button-secondary">'+g+"</div>");return d.bind("click.pointer",function(){e.element.pointer("close")})},position:"top",show:function(e,d){d.pointer.show();d.opened()},hide:function(e,d){d.pointer.hide();d.closed()},document:document},_create:function(){var e,d;this.content=c('<div class="wp-pointer-content"></div>');this.arrow=c('<div class="wp-pointer-arrow"><div class="wp-pointer-arrow-inner"></div></div>');d=this.element.parents().add(this.element);e="absolute";if(d.filter(function(){return"fixed"===c(this).css("position")}).length){e="fixed"}this.pointer=c("<div />").append(this.content).append(this.arrow).attr("id","wp-pointer-"+a++).addClass(this.options.pointerClass).css("position",e).hide().appendTo(this.options.document.body)},_setOption:function(d,f){var g=this.options,e=this.pointer;if(d==="document"&&f!==g.document){e.detach().appendTo(f.body)}else{if(d==="pointerClass"){e.removeClass(g.pointerClass).addClass(f)}}c.Widget.prototype._setOption.apply(this,arguments);if(d==="position"){this.reposition()}else{if(d==="content"&&this.active){this.update()}}},destroy:function(){this.pointer.remove();c.Widget.prototype.destroy.call(this)},widget:function(){return this.pointer},update:function(g){var e=this,h=this.options,d=c.Deferred(),f;if(h.disabled){return}d.done(function(i){e._update(g,i)});if(typeof h.content==="string"){f=h.content}else{f=h.content.call(this.element[0],d.resolve,g,this._handoff())}if(f){d.resolve(f)}return d.promise()},_update:function(f,e){var d,g=this.options;if(!e){return}this.pointer.stop();this.content.html(e);d=g.buttons.call(this.element[0],f,this._handoff());if(d){d.wrap('<div class="wp-pointer-buttons" />').parent().appendTo(this.content)}this.reposition()},reposition:function(){var d;if(this.options.disabled){return}d=this._processPosition(this.options.position);this.pointer.css({top:0,left:0,zIndex:b++}).show().position(c.extend({of:this.element},d));this.repoint()},repoint:function(){var f=this.options,e,d;if(f.disabled){return}e=c.extend(this._processPosition(f.position),{of:this.pointer,offset:""});d=e.at+"";e.at=e.my;e.my=d;if(e.align!="center"){e.offset=(e.align=="top"||e.align=="left")?15:-15;if(e.align=="top"||e.align=="bottom"){e.offset="0 "+e.offset}else{e.offset=e.offset+" 0"}}this.pointer[0].className=this.pointer[0].className.replace(/wp-pointer-[^\s'"]*/,"");this.pointer.addClass("wp-pointer-"+e.edge);this.arrow.position(e)},_processPosition:function(e){var f={top:"bottom",bottom:"top",left:"right",right:"left"},d;if(typeof e=="string"){d={edge:e+""}}else{d=c.extend({},e)}if(!d.edge){return d}if(d.edge=="top"||d.edge=="bottom"){d.align=d.align||"left";d.at=d.at||d.align+" "+f[d.edge];d.my=d.my||d.align+" "+d.edge}else{d.align=d.align||"top";d.at=d.at||f[d.edge]+" "+d.align;d.my=d.my||d.edge+" "+d.align}return d},open:function(e){var d=this,f=this.options;if(this.active||f.disabled){return}this.update().done(function(){d._open(e)})},_open:function(e){var d=this,f=this.options;if(this.active||f.disabled){return}this.active=true;this._trigger("open",e,this._handoff());this._trigger("show",e,this._handoff({opened:function(){d._trigger("opened",e,d._handoff())}}))},close:function(e){if(!this.active||this.options.disabled){return}var d=this;this.active=false;this._trigger("close",e,this._handoff());this._trigger("hide",e,this._handoff({closed:function(){d._trigger("closed",e,d._handoff())}}))},sendToTop:function(d){if(this.active){this.pointer.css("z-index",b++)}},toggle:function(d){if(this.pointer.is(":hidden")){this.open(d)}else{this.close(d)}},_handoff:function(d){return c.extend({pointer:this.pointer,element:this.element},d)}})})(jQuery);
  • trunk/wp-includes/script-loader.php

    r18967 r18969  
    9797    ) );
    9898
    99     $scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20110918', 1 );
     99    $scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111013', 1 );
    100100    $scripts->add_script_data( 'wp-pointer', 'wpPointerL10n', array(
    101101        'close' => __('Close'),
     
    456456    $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101224' );
    457457    $styles->add( 'editor-buttons', "/wp-includes/css/editor-buttons$suffix.css", array(), '20111010' );
    458     $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array(), '20110918' );
     458    $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array(), '20111013' );
    459459
    460460    foreach ( $rtl_styles as $rtl_style ) {
Note: See TracChangeset for help on using the changeset viewer.