Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.

Commit dec9981

Browse files
author
Christopher McCulloh
committed
() builds dist pre-release
1 parent e8394ac commit dec9981

File tree

5 files changed

+26
-18
lines changed

5 files changed

+26
-18
lines changed

dist/css/fuelux.css

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/fuelux.min.css

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fuelux.zip

-128 Bytes
Binary file not shown.

dist/js/fuelux.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*!
2-
* Fuel UX v3.15.9
2+
* Fuel UX EDGE - Built 2016/12/15, 3:42:46 PM
3+
* Previous release: v3.15.9
34
* Copyright 2012-2016 ExactTarget
45
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
56
*/
@@ -986,13 +987,13 @@
986987
return ( true === md.isValid() ) ? md.toDate() : BAD_DATE;
987988
};
988989

989-
tryMomentParseAll = function( d, parseFunc1, parseFunc2 ) {
990-
var pd = parseFunc1( d );
990+
tryMomentParseAll = function( rawDateString, parseFunc1, parseFunc2 ) {
991+
var pd = parseFunc1( rawDateString );
991992
if ( !self.isInvalidDate( pd ) ) {
992993
return pd;
993994
}
994995

995-
pd = parseFunc2( pd );
996+
pd = parseFunc2( rawDateString );
996997
if ( !self.isInvalidDate( pd ) ) {
997998
return pd;
998999
}
@@ -4453,6 +4454,7 @@
44534454
this.$element.addClass( 'pills-editable' );
44544455
this.$element.on( 'blur.fu.pillbox', '.pillbox-add-item', $.proxy( this.cancelEdit, this ) );
44554456
}
4457+
this.$element.on( 'blur.fu.pillbox', '.pillbox-add-item', $.proxy( this.inputEvent, this ) );
44564458
};
44574459

44584460
Pillbox.prototype = {
@@ -4718,10 +4720,13 @@
47184720
inputEvent: function inputEvent( e ) {
47194721
var self = this;
47204722
var text = self.options.cleanInput( this.$addItem.val() );
4721-
4723+
var isFocusOutEvent = e.type === 'focusout';
4724+
var blurredAfterInput = ( isFocusOutEvent && text.length > 0 );
47224725
// If we test for keycode only, it will match for `<` & `,` instead of just `,`
47234726
// This way users can type `<3` and `1 < 3`, etc...
4724-
if ( this.acceptKeyCodes[ e.keyCode ] && !isShiftHeld( e ) ) {
4727+
var acceptKeyPressed = ( this.acceptKeyCodes[ e.keyCode ] && !isShiftHeld( e ) );
4728+
4729+
if ( acceptKeyPressed || blurredAfterInput ) {
47254730
var attr;
47264731
var value;
47274732

@@ -4738,7 +4743,7 @@
47384743
// ignore comma and make sure text that has been entered (protects against " ,". https://github.com/ExactTarget/fuelux/issues/593), unless allowEmptyPills is true.
47394744
if ( text.replace( /[ ]*\,[ ]*/, '' ).match( /\S/ ) || ( this.options.allowEmptyPills && text.length ) ) {
47404745
this._closeSuggestions();
4741-
this.$addItem.hide();
4746+
this.$addItem.hide().val( '' );
47424747

47434748
if ( attr ) {
47444749
this.addItems( {
@@ -4754,9 +4759,9 @@
47544759
}
47554760

47564761
setTimeout( function clearAddItemInput() {
4757-
self.$addItem.show().val( '' ).attr( {
4762+
self.$addItem.show().attr( {
47584763
size: 10
4759-
} );
4764+
} ).focus();
47604765
}, 0 );
47614766
}
47624767

@@ -4794,7 +4799,7 @@
47944799

47954800
this.$pillGroup.find( '.pill' ).removeClass( 'pillbox-highlight' );
47964801

4797-
if ( this.options.onKeyDown ) {
4802+
if ( this.options.onKeyDown && !isFocusOutEvent ) {
47984803
if (
47994804
isTabKey( e ) ||
48004805
isUpArrow( e ) ||

dist/js/fuelux.min.js

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)