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

Commit

Permalink
() builds dist pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher McCulloh committed Dec 15, 2016
1 parent e8394ac commit dec9981
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 18 deletions.
3 changes: 2 additions & 1 deletion dist/css/fuelux.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion dist/css/fuelux.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified dist/fuelux.zip
Binary file not shown.
25 changes: 15 additions & 10 deletions dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*!
* Fuel UX v3.15.9
* Fuel UX EDGE - Built 2016/12/15, 3:42:46 PM
* Previous release: v3.15.9
* Copyright 2012-2016 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -986,13 +987,13 @@
return ( true === md.isValid() ) ? md.toDate() : BAD_DATE;
};

tryMomentParseAll = function( d, parseFunc1, parseFunc2 ) {
var pd = parseFunc1( d );
tryMomentParseAll = function( rawDateString, parseFunc1, parseFunc2 ) {
var pd = parseFunc1( rawDateString );
if ( !self.isInvalidDate( pd ) ) {
return pd;
}

pd = parseFunc2( pd );
pd = parseFunc2( rawDateString );
if ( !self.isInvalidDate( pd ) ) {
return pd;
}
Expand Down Expand Up @@ -4453,6 +4454,7 @@
this.$element.addClass( 'pills-editable' );
this.$element.on( 'blur.fu.pillbox', '.pillbox-add-item', $.proxy( this.cancelEdit, this ) );
}
this.$element.on( 'blur.fu.pillbox', '.pillbox-add-item', $.proxy( this.inputEvent, this ) );
};

Pillbox.prototype = {
Expand Down Expand Up @@ -4718,10 +4720,13 @@
inputEvent: function inputEvent( e ) {
var self = this;
var text = self.options.cleanInput( this.$addItem.val() );

var isFocusOutEvent = e.type === 'focusout';
var blurredAfterInput = ( isFocusOutEvent && text.length > 0 );
// If we test for keycode only, it will match for `<` & `,` instead of just `,`
// This way users can type `<3` and `1 < 3`, etc...
if ( this.acceptKeyCodes[ e.keyCode ] && !isShiftHeld( e ) ) {
var acceptKeyPressed = ( this.acceptKeyCodes[ e.keyCode ] && !isShiftHeld( e ) );

if ( acceptKeyPressed || blurredAfterInput ) {
var attr;
var value;

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

if ( attr ) {
this.addItems( {
Expand All @@ -4754,9 +4759,9 @@
}

setTimeout( function clearAddItemInput() {
self.$addItem.show().val( '' ).attr( {
self.$addItem.show().attr( {
size: 10
} );
} ).focus();
}, 0 );
}

Expand Down Expand Up @@ -4794,7 +4799,7 @@

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

if ( this.options.onKeyDown ) {
if ( this.options.onKeyDown && !isFocusOutEvent ) {
if (
isTabKey( e ) ||
isUpArrow( e ) ||
Expand Down
13 changes: 7 additions & 6 deletions dist/js/fuelux.min.js

Large diffs are not rendered by default.

0 comments on commit dec9981

Please sign in to comment.