<!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>[28239] trunk/src/wp-admin/js/color-picker.js: Color Picker: Close color picker when clicking outside of them and when opening another one.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28239">28239</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-05-02 11:17:13 +0000 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Color Picker: Close color picker when clicking outside of them and when opening another one.
props mattwiebe.
fixes <a href="http://core.trac.wordpress.org/ticket/25539">#25539</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscolorpickerjs">trunk/src/wp-admin/js/color-picker.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscolorpickerjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/color-picker.js (28238 => 28239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/color-picker.js 2014-05-02 09:28:55 UTC (rev 28238)
+++ trunk/src/wp-admin/js/color-picker.js 2014-05-02 11:17:13 UTC (rev 28239)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-/* global wpColorPickerL10n:true */
</del><ins>+/* global wpColorPickerL10n */
</ins><span class="cx"> ( function( $, undef ){
</span><span class="cx">
</span><span class="cx"> var ColorPicker,
</span><span class="lines">@@ -19,13 +19,18 @@
</span><span class="cx"> },
</span><span class="cx"> _create: function() {
</span><span class="cx"> // bail early for unsupported Iris.
</span><del>- if ( ! $.support.iris )
</del><ins>+ if ( ! $.support.iris ) {
</ins><span class="cx"> return;
</span><ins>+ }
+
</ins><span class="cx"> var self = this,
</span><span class="cx"> el = self.element;
</span><span class="cx">
</span><span class="cx"> $.extend( self.options, el.data() );
</span><span class="cx">
</span><ins>+ // keep close bound so it can be attached to a body listener
+ self.close = $.proxy( self.close, self );
+
</ins><span class="cx"> self.initialValue = el.val();
</span><span class="cx">
</span><span class="cx"> // Set up HTML structure, hide things
</span><span class="lines">@@ -35,12 +40,13 @@
</span><span class="cx"> self.pickerContainer = $( _after ).insertAfter( el );
</span><span class="cx"> self.button = $( _button );
</span><span class="cx">
</span><del>- if ( self.options.defaultColor )
</del><ins>+ if ( self.options.defaultColor ) {
</ins><span class="cx"> self.button.addClass( 'wp-picker-default' ).val( wpColorPickerL10n.defaultString );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> self.button.addClass( 'wp-picker-clear' ).val( wpColorPickerL10n.clear );
</span><ins>+ }
</ins><span class="cx">
</span><del>- el.wrap('<span class="wp-picker-input-wrap" />').after(self.button);
</del><ins>+ el.wrap( '<span class="wp-picker-input-wrap" />' ).after(self.button);
</ins><span class="cx">
</span><span class="cx"> el.iris( {
</span><span class="cx"> target: self.pickerContainer,
</span><span class="lines">@@ -51,80 +57,95 @@
</span><span class="cx"> change: function( event, ui ) {
</span><span class="cx"> self.toggler.css( { backgroundColor: ui.color.toString() } );
</span><span class="cx"> // check for a custom cb
</span><del>- if ( $.isFunction( self.options.change ) )
</del><ins>+ if ( $.isFunction( self.options.change ) ) {
</ins><span class="cx"> self.options.change.call( this, event, ui );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> } );
</span><ins>+
</ins><span class="cx"> el.val( self.initialValue );
</span><span class="cx"> self._addListeners();
</span><del>- if ( ! self.options.hide )
</del><ins>+ if ( ! self.options.hide ) {
</ins><span class="cx"> self.toggler.click();
</span><ins>+ }
</ins><span class="cx"> },
</span><span class="cx"> _addListeners: function() {
</span><span class="cx"> var self = this;
</span><span class="cx">
</span><del>- self.toggler.click( function( event ){
</del><ins>+ // prevent any clicks inside this widget from leaking to the top and closing it
+ self.wrap.on( 'click.wpcolorpicker', function( event ) {
</ins><span class="cx"> event.stopPropagation();
</span><del>- self.element.toggle().iris( 'toggle' );
- self.button.toggleClass('hidden');
- self.toggler.toggleClass( 'wp-picker-open' );
</del><ins>+ });
</ins><span class="cx">
</span><del>- // close picker when you click outside it
- if ( self.toggler.hasClass( 'wp-picker-open' ) )
- $( 'body' ).on( 'click', { wrap: self.wrap, toggler: self.toggler }, self._bodyListener );
- else
- $( 'body' ).off( 'click', self._bodyListener );
</del><ins>+ self.toggler.click( function(){
+ if ( self.toggler.hasClass( 'wp-picker-open' ) ) {
+ self.close();
+ } else {
+ self.open();
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- self.element.change(function( event ) {
- var me = $(this),
</del><ins>+ self.element.change( function( event ) {
+ var me = $( this ),
</ins><span class="cx"> val = me.val();
</span><span class="cx"> // Empty = clear
</span><span class="cx"> if ( val === '' || val === '#' ) {
</span><del>- self.toggler.css('backgroundColor', '');
</del><ins>+ self.toggler.css( 'backgroundColor', '' );
</ins><span class="cx"> // fire clear callback if we have one
</span><del>- if ( $.isFunction( self.options.clear ) )
</del><ins>+ if ( $.isFunction( self.options.clear ) ) {
</ins><span class="cx"> self.options.clear.call( this, event );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // open a keyboard-focused closed picker with space or enter
</span><del>- self.toggler.on('keyup', function( e ) {
- if ( e.keyCode === 13 || e.keyCode === 32 ) {
- e.preventDefault();
- self.toggler.trigger('click').next().focus();
</del><ins>+ self.toggler.on( 'keyup', function( event ) {
+ if ( event.keyCode === 13 || event.keyCode === 32 ) {
+ event.preventDefault();
+ self.toggler.trigger( 'click' ).next().focus();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> self.button.click( function( event ) {
</span><del>- var me = $(this);
</del><ins>+ var me = $( this );
</ins><span class="cx"> if ( me.hasClass( 'wp-picker-clear' ) ) {
</span><span class="cx"> self.element.val( '' );
</span><del>- self.toggler.css('backgroundColor', '');
- if ( $.isFunction( self.options.clear ) )
</del><ins>+ self.toggler.css( 'backgroundColor', '' );
+ if ( $.isFunction( self.options.clear ) ) {
</ins><span class="cx"> self.options.clear.call( this, event );
</span><ins>+ }
</ins><span class="cx"> } else if ( me.hasClass( 'wp-picker-default' ) ) {
</span><span class="cx"> self.element.val( self.options.defaultColor ).change();
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> },
</span><del>- _bodyListener: function( event ) {
- if ( ! event.data.wrap.find( event.target ).length )
- event.data.toggler.click();
</del><ins>+ open: function() {
+ this.element.show().iris( 'toggle' );
+ this.button.removeClass( 'hidden' );
+ this.toggler.addClass( 'wp-picker-open' );
+ $( 'body' ).trigger( 'click.wpcolorpicker' ).on( 'click.wpcolorpicker', this.close );
</ins><span class="cx"> },
</span><ins>+ close: function() {
+ this.element.hide().iris( 'toggle' );
+ this.button.addClass( 'hidden' );
+ this.toggler.removeClass( 'wp-picker-open' );
+ $( 'body' ).off( 'click.wpcolorpicker', this.close );
+ },
</ins><span class="cx"> // $("#input").wpColorPicker('color') returns the current color
</span><span class="cx"> // $("#input").wpColorPicker('color', '#bada55') to set
</span><span class="cx"> color: function( newColor ) {
</span><del>- if ( newColor === undef )
</del><ins>+ if ( newColor === undef ) {
</ins><span class="cx"> return this.element.iris( 'option', 'color' );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.element.iris( 'option', 'color', newColor );
</span><span class="cx"> },
</span><span class="cx"> //$("#input").wpColorPicker('defaultColor') returns the current default color
</span><span class="cx"> //$("#input").wpColorPicker('defaultColor', newDefaultColor) to set
</span><span class="cx"> defaultColor: function( newDefaultColor ) {
</span><del>- if ( newDefaultColor === undef )
</del><ins>+ if ( newDefaultColor === undef ) {
</ins><span class="cx"> return this.options.defaultColor;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.options.defaultColor = newDefaultColor;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>