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

Commit

Permalink
build before 3.15.13 - includes spinbox setValue update
Browse files Browse the repository at this point in the history
  • Loading branch information
swilliamset committed May 3, 2017
1 parent d28b365 commit aa431db
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 14 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.
21 changes: 15 additions & 6 deletions dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*!
* Fuel UX v3.15.12
* Fuel UX EDGE - Built 2017/05/03, 1:07:06 PM
* Previous release: v3.15.12
* Copyright 2012-2017 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -2830,11 +2831,11 @@
},

render: function render() {
this.setValue( this.getDisplayValue() );
this._setValue( this.getDisplayValue() );
},

change: function change() {
this.setValue( this.getDisplayValue() );
this._setValue( this.getDisplayValue() );

this.triggerChangedEvent();
},
Expand Down Expand Up @@ -2885,7 +2886,7 @@

step: function step( isIncrease ) {
//refresh value from display before trying to increment in case they have just been typing before clicking the nubbins
this.setValue( this.getDisplayValue() );
this._setValue( this.getDisplayValue() );
var newVal;

if ( isIncrease ) {
Expand All @@ -2896,7 +2897,7 @@

newVal = newVal.toFixed( 5 );

this.setValue( newVal + this.unit );
this._setValue( newVal + this.unit );
},

getDisplayValue: function getDisplayValue() {
Expand All @@ -2918,6 +2919,10 @@
},

setValue: function setValue( val ) {
return this._setValue( val, true );
},

_setValue: function _setValue( val, shouldSetLastValue ) {
//remove any i18n on the number
if ( this.options.decimalMark !== '.' ) {
val = this.parseInput( val );
Expand All @@ -2934,7 +2939,7 @@

//make sure we are dealing with a number
if ( isNaN( intVal ) && !isFinite( intVal ) ) {
return this.setValue( this.options.value );
return this._setValue( this.options.value, shouldSetLastValue );
}

//conform
Expand All @@ -2953,6 +2958,10 @@
//display number
this.setDisplayValue( val );

if ( shouldSetLastValue ) {
this.lastValue = val;
}

return this;
},

Expand Down
13 changes: 7 additions & 6 deletions dist/js/fuelux.min.js

Large diffs are not rendered by default.

0 comments on commit aa431db

Please sign in to comment.