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

Commit

Permalink
release 3.16.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Vernacchia committed Feb 19, 2018
1 parent d27ab2f commit 74f478e
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 20 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ You can also use on of the following methods:
- [Volo](https://github.com/volojs/volo) `volo add fuelux` (update with `volo add -f fuelux`).
- Clone via git `git clone https://github.com/ExactTarget/fuelux/`
- 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](http://www.fuelcdn.com/fuelux/3.16.4/fuelux.zip).
- Download a [.zip archive](http://www.fuelcdn.com/fuelux/3.16.5/fuelux.zip).

# Using Fuel UX

Expand All @@ -81,11 +81,11 @@ For other methods of managing dependencies consider [AMD support via require](#a
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.16.4/css/fuelux.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.16.5/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.16.4/js/fuelux.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.16.5/js/fuelux.min.js"></script>
```

Expand Down Expand Up @@ -116,7 +116,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.16.4/'
'fuelux': 'http://www.fuelcdn.com/fuelux/3.16.5/'
//...
}
});
Expand Down
2 changes: 1 addition & 1 deletion 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.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.
2 changes: 1 addition & 1 deletion dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Fuel UX v3.16.5
* Fuel UX v3.16.6
* Copyright 2012-2018 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
Expand Down
4 changes: 2 additions & 2 deletions dist/js/fuelux.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion grunt/tasks/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = function test (grunt) {

// multiple jQuery versions, then run SauceLabs VMs
grunt.registerTask('releasetest', 'run jshint, build dist, all source tests, validation, and qunit on SauceLabs',
['test', 'saucelabs-qunit:defaultBrowsers']);
['test'/*, 'saucelabs-qunit:defaultBrowsers'*/]);

// Due to TravisCI security concerns, Saucelabs can not be run for PRs from forks. Therefore, it can not become part of our PR process.
// https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
Expand Down
2 changes: 1 addition & 1 deletion package.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Package.describe({
name: 'exacttarget:fuelux', // http://atmospherejs.com/exacttarget/fuelux
summary: 'Base Fuel UX styles and controls',
version: '3.16.3',
version: '3.16.6',
git: 'https://github.com/ExactTarget/fuelux.git'
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"url": "git://github.com/ExactTarget/fuelux.git"
},
"title": "Fuel UX",
"version": "3.16.5",
"version": "3.16.6",
"volo": {
"baseDir": "lib",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions reference/dist/css/fuelux.css

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

16 changes: 10 additions & 6 deletions reference/dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Fuel UX v3.16.1
* Copyright 2012-2017 ExactTarget
* Fuel UX v3.16.6
* Copyright 2012-2018 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/

Expand Down Expand Up @@ -4644,7 +4644,7 @@
getPercentage: function() {
var height = ( this.$element.css( 'box-sizing' ) === 'border-box' ) ? this.$element.outerHeight() : this.$element.height();
var scrollHeight = this.$element.get( 0 ).scrollHeight;
return ( scrollHeight > height ) ? ( ( height / ( scrollHeight - this.curScrollTop ) ) * 100 ) : 0;
return ( height / ( scrollHeight - this.curScrollTop ) ) * 100;
},

fetchData: function( force ) {
Expand Down Expand Up @@ -5109,7 +5109,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().val( '' );
this.$addItem.val( '' ).hide();

if ( attr ) {
this.addItems( {
Expand Down Expand Up @@ -5979,8 +5979,12 @@

this.currentPage = ( page !== undefined ) ? page : NaN;

if ( data.end === true || ( this.currentPage + 1 ) >= pages ) {
this.infiniteScrollingCont.infinitescroll( 'end', end );
if ( this.infiniteScrollingCont ) {
if ( data.end === true || ( this.currentPage + 1 ) >= pages ) {
this.infiniteScrollingCont.infinitescroll( 'end', end );
} else {
this.infiniteScrollingCont.infinitescroll( 'onScroll' );
}
}
},

Expand Down

0 comments on commit 74f478e

Please sign in to comment.