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

Commit

Permalink
release 3.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
interactivellama committed Jun 11, 2015
1 parent dc367d9 commit db9bb8d
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 60 deletions.
6 changes: 3 additions & 3 deletions DETAILS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Fuel UX can be applied to a section of your your HTML or the entire page by addi
## Downloading code
Fuel UX can be obtained in any of the following ways:

* Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.7.3/)
* Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.8.0/)
* Using [Bower](https://github.com/bower/bower) (ensures you get all the [dependencies](#dependencies)):

```
Expand All @@ -53,7 +53,7 @@ Fuel UX can be obtained in any of the following ways:

Cloning the repository ensures you can apply future updates to Fuel UX easily, but requires to you manage its [dependencies](#dependencies) on your own.

* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.7.3/fuelux.zip).
* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.8.0/fuelux.zip).

## AMD support

Expand All @@ -63,7 +63,7 @@ If using AMD (such as [RequireJS](http://requirejs.org)), reference the FuelUX d
```javascript
require.config({
paths: {
'fuelux': 'http://www.fuelcdn.com/fuelux/3.7.3/'
'fuelux': 'http://www.fuelcdn.com/fuelux/3.8.0/'
//...
}
});
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ Add `fuelux` class to the portion of the page using Fuel UX as seen [here](https
Ensure all the dependencies are included on the page (eg, such as using the CDN as shown below).
```
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.7.3/css/fuelux.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.8.0/css/fuelux.min.css" rel="stylesheet">
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.1/js/bootstrap.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.7.3/js/fuelux.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.8.0/js/fuelux.min.js"></script>
```

### Install
A few ways available to install.

- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.7.3/)
- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.8.0/)
- [Download the latest release](https://github.com/exacttarget/fuelux/archive/3.4.0.zip).
- Clone the repo: `git clone https://github.com/exacttarget/fuelux.git`.
- Install with [Bower](http://bower.io): `bower install fuelux`.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fuelux",
"description": "Extending Bootstrap with additional lightweight JavaScript controls.",
"version": "3.7.3",
"version": "3.8.0",
"keywords": [
"application",
"bootstrap",
Expand Down
96 changes: 66 additions & 30 deletions dist/css/fuelux.css

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

2 changes: 1 addition & 1 deletion dist/css/fuelux.css.map

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions dist/css/fuelux.min.css

Large diffs are not rendered by default.

Binary file modified dist/fuelux.zip
Binary file not shown.
30 changes: 19 additions & 11 deletions dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*!
* Fuel UX EDGE - Built 2015/06/09, 10:46:14 AM
* Previous release: v3.7.3
* Fuel UX v3.8.0
* Copyright 2012-2015 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -3480,6 +3479,14 @@
this.$prevBtn = this.$element.find( 'button.btn-prev' );
this.$nextBtn = this.$element.find( 'button.btn-next' );

// maintains backwards compatibility with < 3.8, will be removed in the future
if ( this.$element.children( '.steps-container' ).length === 0 ) {
this.$element.addClass( 'no-steps-container' );
if ( window && window.console && window.console.warn ) {
window.console.warn( 'please update your wizard markup to include ".steps-container" as seen in http://getfuelux.com/javascript.html#wizard-usage-markup' );
}
}

kids = this.$nextBtn.children().detach();
this.nextText = $.trim( this.$nextBtn.text() );
this.$nextBtn.append( kids );
Expand Down Expand Up @@ -3761,16 +3768,16 @@
},

next: function() {
if ( this.currentStep < this.numSteps ) {
var e = $.Event( 'actionclicked.fu.wizard' );
this.$element.trigger( e, {
step: this.currentStep,
direction: 'next'
} );
if ( e.isDefaultPrevented() ) {
return;
} // respect preventDefault in case dev has attached validation to step and wants to stop propagation based on it.
var e = $.Event( 'actionclicked.fu.wizard' );
this.$element.trigger( e, {
step: this.currentStep,
direction: 'next'
} );
if ( e.isDefaultPrevented() ) {
return;
} // respect preventDefault in case dev has attached validation to step and wants to stop propagation based on it.

if ( this.currentStep < this.numSteps ) {
this.currentStep += 1;
this.setState();
} else { //is last step
Expand Down Expand Up @@ -6461,6 +6468,7 @@
} );
this.$element.find( '.combobox' ).on( 'changed.fu.combobox', $.proxy( this.changed, this ) );
this.$element.find( '.datepicker' ).on( 'changed.fu.datepicker', $.proxy( this.changed, this ) );
this.$element.find( '.datepicker' ).on( 'dateClicked.fu.datepicker', $.proxy( this.changed, this ) );
this.$element.find( '.selectlist' ).on( 'changed.fu.selectlist', $.proxy( this.changed, this ) );
this.$element.find( '.spinbox' ).on( 'changed.fu.spinbox', $.proxy( this.changed, this ) );
this.$element.find( '.repeat-monthly .radio-custom, .repeat-yearly .radio-custom' ).on( 'change.fu.scheduler', $.proxy( this.changed, this ) );
Expand Down
12 changes: 5 additions & 7 deletions dist/js/fuelux.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"grunt-jsbeautifier": "0.x",
"grunt-prompt": "1.x",
"grunt-saucelabs": "8.x",
"grunt-shell": "1.x",
"grunt-text-replace": "0.x",
"grunt-umd": "2.x",
"grunt-zip": "0.x",
Expand Down Expand Up @@ -74,7 +75,7 @@
"test": "grunt travisci --verbose"
},
"title": "Fuel UX",
"version": "3.7.3",
"version": "3.8.0",
"volo": {
"baseDir": "lib",
"dependencies": {
Expand Down

0 comments on commit db9bb8d

Please sign in to comment.