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

Commit

Permalink
release 3.11.5
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinparkerson committed Oct 23, 2015
1 parent 3547080 commit c3cb922
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 55 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.11.3/)
* Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.11.4/)
* 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.11.3/fuelux.zip).
* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.11.4/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.11.3/'
'fuelux': 'http://www.fuelcdn.com/fuelux/3.11.4/'
//...
}
});
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,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.11.3/css/fuelux.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.11.4/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.11.3/js/fuelux.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.11.4/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.11.3/)
- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.11.4/)
- Install with [NPM](https://www.npmjs.com/package/fuelux): `npm install fuelux`.
- [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`.
Expand Down
9 changes: 1 addition & 8 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.
69 changes: 37 additions & 32 deletions dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*!
* Fuel UX EDGE - Built 2015/10/20, 11:44:20 AM
* Previous release: v3.11.4
* Fuel UX v3.11.5
* Copyright 2012-2015 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -5887,7 +5886,8 @@
var $hr = $( this );
var $heading = $hr.find( '.repeater-list-heading' );
$heading.outerHeight( $hr.outerHeight() );
$heading.outerWidth( $hr.outerWidth() );
// outerWidth isn't always appropriate or desirable. Allow an explicit value to be set if needed
$heading.outerWidth( $heading.data( 'forced-width' ) || $hr.outerWidth() );
} );
};

Expand Down Expand Up @@ -5964,7 +5964,6 @@
$wrapper.find( '.frozen-column-wrapper' ).css( 'left', scrollLeft );
}
if ( actionsEnabled && shouldScroll ) {
$wrapper.find( '.actions-thead-wrapper' ).css( 'right', -scrollLeft );
$wrapper.find( '.actions-column-wrapper' ).css( 'right', -scrollLeft );
}

Expand All @@ -5974,7 +5973,6 @@
$wrapper.find( '.frozen-column-wrapper' ).css( 'left', '0' );
}
if ( actionsEnabled ) {
$wrapper.find( '.actions-thead-wrapper' ).css( 'right', '0' );
$wrapper.find( '.actions-column-wrapper' ).css( 'right', '0' );
}
}
Expand All @@ -5994,16 +5992,16 @@
actionsHtml += '<li><a href="#" data-action="' + action.name + '" class="action-item"> ' + html + '</a></li>';
}

var selectlist = '<div class="btn-group">' +
'<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" data-flip="auto" aria-expanded="false">' +
'<span class="caret"></span>' +
'</button>' +
'<ul class="dropdown-menu dropdown-menu-right" role="menu">' +
actionsHtml +
'</ul></div>';

if ( $actionsTable.length < 1 ) {

var selectlist = '<div class="btn-group">' +
'<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" data-flip="auto" aria-expanded="false">' +
'<span class="caret"></span>' +
'</button>' +
'<ul class="dropdown-menu dropdown-menu-right" role="menu">' +
actionsHtml +
'</ul></div>';

// The width set here is overwritten in `list_sizeHeadings`. This is used for sizing the subsequent rows.
var $actionsColumnWrapper = $( '<div class="actions-column-wrapper" style="width: ' + this.list_actions_width + 'px"></div>' ).insertBefore( $table );
var $actionsColumn = $table.clone().addClass( 'table-actions' );
$actionsColumn.find( 'th:not(:last-child)' ).remove();
Expand All @@ -6015,12 +6013,18 @@
//disable the header dropdown until an item is selected
$actionsColumn.find( 'thead .btn' ).attr( 'disabled', 'disabled' );
} else {
var label = this.viewOptions.list_actions.label || '';
var labelHTML = label;
if ( label !== '' ) {
labelHTML = label + '<div class="repeater-list-heading">' + label + '</div>';
}
$actionsColumn.find( 'thead tr' ).addClass( 'empty-heading' ).html( '<th>' + labelHTML + '</th>' );
var labelText = this.viewOptions.list_actions.label || '';

var $labelOverlay = $( '<div class="repeater-list-heading empty">' + labelText + '</div>' );

// repeater-list.less:302 has `margin-left: -9px;` which shifts this over and makes it not actually cover what it is supposed to cover. Make it wider to compensate.
var negative_maring_accomodation = 9;
$labelOverlay.data( 'forced-width', this.list_actions_width + negative_maring_accomodation );

var $th = $( '<th>' + labelText + '</th>' );
$th.append( $labelOverlay );

$actionsColumn.find( 'thead tr' ).addClass( 'empty-heading' ).append( $th );
}

// Create Actions dropdown for each cell in actions table
Expand All @@ -6036,10 +6040,6 @@
this.$canvas.addClass( 'actions-enabled' );
}

/* this.$element.find('.repeater-list .actions-column-wrapper, .repeater-list .actions-column-wrapper td, .repeater-list .actions-column-wrapper th')
.css('width', this.list_actions_width);
this.$element.find('.repeater-list .actions-column-wrapper th .repeater-list-heading').css('width', this.list_actions_width + 1 + 'px');*/
this.$element.find( '.repeater-list table.table-actions thead tr th' ).outerHeight( $table.find( 'thead tr th' ).outerHeight() );
this.$element.find( '.repeater-list table.table-actions tbody tr td:first-child' ).each( function( i, elem ) {
$( this ).outerHeight( $table.find( 'tbody tr:eq(' + i + ') td' ).outerHeight() );
Expand Down Expand Up @@ -6285,23 +6285,24 @@

//ADDITIONAL METHODS
function renderColumn( $tr, row, rowIndex, column ) {
var className = column.className;
var content = row[ column.property ];
var $col = $( '<td></td>' );
var width = column._auto_width;

var property = column.property;
if ( this.viewOptions.list_actions !== false && property === '@_ACTIONS_@' ) {
$col.addClass( column.className );

if ( this.viewOptions.list_actions !== false && column.property === '@_ACTIONS_@' ) {
$col.addClass( 'repeater-list-actions-placeholder-column' );
content = '<div class="repeater-list-actions-placeholder" style="width: ' + this.list_actions_width + 'px"></div>';
content = '';
}

content = ( content !== undefined ) ? content : '';
$col.append( content );

$col.addClass( className ).append( content );
if ( width !== undefined ) {
$col.outerWidth( width );
// excludes checkbox and actions columns, as well as columns with user set widths
if ( column._auto_width !== undefined ) {
$col.outerWidth( column._auto_width );
}

$tr.append( $col );

if ( this.viewOptions.list_selectable === 'multi' && column.property === '@_CHECKBOX_@' ) {
Expand Down Expand Up @@ -6384,6 +6385,10 @@
// header underlayment
var $headerBase = $( '<th></th>' );

// actions column is _always_ hidden underneath absolute positioned actions table.
// Neither headerBase nor headerOverlay will ever be visible for actions column.
// This is here strictly for sizing purposes for the benefit of the other columns'
// sizing calculations.
if ( this.viewOptions.list_actions && column.property === '@_ACTIONS_@' ) {
var width = this.list_actions_width;
$headerBase.css( 'width', width );
Expand Down
7 changes: 3 additions & 4 deletions dist/js/fuelux.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"postinstall": "node postinstall.js"
},
"title": "Fuel UX",
"version": "3.11.4",
"version": "3.11.5",
"volo": {
"baseDir": "lib",
"dependencies": {
Expand Down

0 comments on commit c3cb922

Please sign in to comment.