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

Commit

Permalink
release 3.15.12
Browse files Browse the repository at this point in the history
  • Loading branch information
swilliamset committed Mar 27, 2017
1 parent 00c1a32 commit 4ddae64
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 18 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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.15.10/fuelux.zip).
- Download a [.zip archive](http://www.fuelcdn.com/fuelux/3.15.12/fuelux.zip).

# Using Fuel UX

Expand All @@ -79,11 +79,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.15.10/css/fuelux.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.15.12/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.15.10/js/fuelux.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.15.12/js/fuelux.min.js"></script>
```

Expand Down Expand Up @@ -114,7 +114,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.15.10/'
'fuelux': 'http://www.fuelcdn.com/fuelux/3.15.12/'
//...
}
});
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.
29 changes: 25 additions & 4 deletions dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Fuel UX v3.15.11
* Fuel UX 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 @@ -1422,15 +1422,15 @@

// -- BEGIN MODULE CODE HERE --

$( document.body ).on( 'click.fu.dropdown-autoflip', '[data-toggle=dropdown][data-flip]', function( event ) {
$( document ).on( 'click.fu.dropdown-autoflip', '[data-toggle=dropdown][data-flip]', function( event ) {
if ( $( this ).data().flip === "auto" ) {
// have the drop down decide where to place itself
_autoFlip( $( this ).next( '.dropdown-menu' ) );
}
} );

// For pillbox suggestions dropdown
$( document.body ).on( 'suggested.fu.pillbox', function( event, element ) {
$( document ).on( 'suggested.fu.pillbox', function( event, element ) {
_autoFlip( $( element ) );
$( element ).parent().addClass( 'open' );
} );
Expand Down Expand Up @@ -5017,7 +5017,7 @@

// suggestion dropdown
this.$suggest.html( '' ).append( $suggestionList.children() );
$( document.body ).trigger( 'suggested.fu.pillbox', this.$suggest );
$( document ).trigger( 'suggested.fu.pillbox', this.$suggest );
}

return true;
Expand Down Expand Up @@ -5826,6 +5826,23 @@
var viewTypeObj = {};
var height;
var viewportMargins;
var scrubbedElements = [];
var previousProperties = [];
var $hiddenElements = this.$element.parentsUntil( ':visible' ).addBack();
var currentHiddenElement;
var currentElementIndex = 0;

// Set parents to 'display:block' until repeater is visible again
while ( currentElementIndex < $hiddenElements.length && this.$element.is( ':hidden' ) ) {
currentHiddenElement = $hiddenElements[ currentElementIndex ];
// Only set display property on elements that are explicitly hidden (i.e. do not inherit it from their parent)
if ( $( currentHiddenElement ).is( ':hidden' ) ) {
previousProperties.push( currentHiddenElement.style[ 'display' ] );
currentHiddenElement.style[ 'display' ] = 'block';
scrubbedElements.push( currentHiddenElement );
}
currentElementIndex++;
}

if ( this.viewType ) {
viewTypeObj = $.fn.repeater.viewTypes[ this.viewType ] || {};
Expand Down Expand Up @@ -5856,6 +5873,10 @@
width: this.$element.outerWidth()
} );
}

scrubbedElements.forEach( function( element, i ) {
element.style[ 'display' ] = previousProperties[ i ];
} );
},

// e.g. "Rows" or "Thumbnails"
Expand Down
12 changes: 6 additions & 6 deletions dist/js/fuelux.min.js

Large diffs are not rendered by default.

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.15.11',
version: '3.15.12',
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 @@ -87,7 +87,7 @@
"release": "grunt release"
},
"title": "Fuel UX",
"version": "3.15.11",
"version": "3.15.12",
"volo": {
"baseDir": "lib",
"dependencies": {
Expand Down

0 comments on commit 4ddae64

Please sign in to comment.