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

Commit

Permalink
release 3.14.1
Browse files Browse the repository at this point in the history
  • Loading branch information
swilliams committed Jan 26, 2016
1 parent 61e50ed commit 710f545
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 68 deletions.
4 changes: 2 additions & 2 deletions DETAILS.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Additional details to supplement the brief nature of the README file.

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.13.0/fuelux.zip).
* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.14.1/fuelux.zip).

## AMD support

Expand All @@ -39,7 +39,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.13.0/'
'fuelux': 'http://www.fuelcdn.com/fuelux/3.14.1/'
//...
}
});
Expand Down
8 changes: 4 additions & 4 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.13.0/css/fuelux.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.14.1/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.13.0/js/fuelux.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.14.1/js/fuelux.min.js"></script>
```

#### The code you want is in `dist`
A few ways available to install.

- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.13.0/)
- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.14.1/)
- 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 Expand Up @@ -102,7 +102,7 @@ our roadmap.

### Writing code
* Do not edit or commit files in the `dist` directory. *Project maintainers will commit files in the `dist` directory from time to time. Details on compiling CSS and JavasScript can be found [here](https://github.com/exacttarget/fuelux/blob/master/DETAILS.md#compiling-code).*
* Source files are in respective `js`, `less`, and `fonts` directories.
* Source files are in respective `js`, `less`, and `fonts` directories.
* Conform to [Salesforce Marketing Cloud style guide](https://github.com/ExactTarget/javascript).
* Add and/or update unit tests for any new or changed functionality.
* Test your code at [http://localhost:8000/](http://localhost:8000/). (start using `grunt servefast`)
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.
129 changes: 74 additions & 55 deletions dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Fuel UX v3.13.1
* Fuel UX v3.14.1
* Copyright 2012-2016 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -6120,10 +6120,13 @@
$actionsColumn.find( 'tr td:not(:last-child)' ).remove();

// Dont show actions dropdown in header if not multi select
if ( this.viewOptions.list_selectable === 'multi' ) {
if ( this.viewOptions.list_selectable === 'multi' || this.viewOptions.list_selectable === 'action' ) {
$actionsColumn.find( 'thead tr' ).html( '<th><div class="repeater-list-heading">' + selectlist + '</div></th>' );
//disable the header dropdown until an item is selected
$actionsColumn.find( 'thead .btn' ).attr( 'disabled', 'disabled' );

if ( this.viewOptions.list_selectable !== 'action' ) {
//disable the header dropdown until an item is selected
$actionsColumn.find( 'thead .btn' ).attr( 'disabled', 'disabled' );
}
} else {
var label = this.viewOptions.list_actions.label || '<span class="actions-hidden">a</span>';
$actionsColumn.find( 'thead tr' ).addClass( 'empty-heading' ).html( '<th>' + label + '<div class="repeater-list-heading">' + label + '</div></th>' );
Expand Down Expand Up @@ -6164,7 +6167,12 @@
actionName: actionName,
rows: []
};
self.$element.find( '.repeater-list-wrapper > table .selected' ).each( function() {
var selector = '.repeater-list-wrapper > table .selected';

if ( self.viewOptions.list_selectable === 'action' ) {
selector = '.repeater-list-wrapper > table tr';
}
self.$element.find( selector ).each( function() {
var index = $( this ).index();
index = index + 1;
selected.rows.push( index );
Expand Down Expand Up @@ -6571,64 +6579,67 @@
var isActions = this.viewOptions.list_actions;

if ( this.viewOptions.list_selectable ) {
$row.addClass( 'selectable' );
$row.attr( 'tabindex', 0 ); // allow items to be tabbed to / focused on
$row.data( 'item_data', rows[ index ] );

$row.on( 'click.fu.repeaterList', function() {
if ( !self.isDisabled ) {
var $item = $( this );
var index = $( this ).index();
index = index + 1;
var $frozenRow = self.$element.find( '.frozen-column-wrapper tr:nth-child(' + index + ')' );
var $actionsRow = self.$element.find( '.actions-column-wrapper tr:nth-child(' + index + ')' );
var $checkBox = self.$element.find( '.frozen-column-wrapper tr:nth-child(' + index + ') .checkbox-inline' );

if ( $item.is( '.selected' ) ) {
$item.removeClass( 'selected' );
if ( isMulti ) {
$checkBox.checkbox( 'uncheck' );
$frozenRow.removeClass( 'selected' );
if ( isActions ) {
$actionsRow.removeClass( 'selected' );
if ( this.viewOptions.list_selectable !== 'action' ) {
$row.addClass( 'selectable' );
$row.attr( 'tabindex', 0 ); // allow items to be tabbed to / focused on

$row.on( 'click.fu.repeaterList', function() {
if ( !self.isDisabled ) {
var $item = $( this );
var index = $( this ).index();
index = index + 1;
var $frozenRow = self.$element.find( '.frozen-column-wrapper tr:nth-child(' + index + ')' );
var $actionsRow = self.$element.find( '.actions-column-wrapper tr:nth-child(' + index + ')' );
var $checkBox = self.$element.find( '.frozen-column-wrapper tr:nth-child(' + index + ') .checkbox-inline' );

if ( $item.is( '.selected' ) ) {
$item.removeClass( 'selected' );
if ( isMulti ) {
$checkBox.checkbox( 'uncheck' );
$frozenRow.removeClass( 'selected' );
if ( isActions ) {
$actionsRow.removeClass( 'selected' );
}
} else {
$item.find( '.repeater-list-check' ).remove();
}
} else {
$item.find( '.repeater-list-check' ).remove();
}

self.$element.trigger( 'deselected.fu.repeaterList', $item );
} else {
if ( !isMulti ) {
self.$canvas.find( '.repeater-list-check' ).remove();
self.$canvas.find( '.repeater-list tbody tr.selected' ).each( function() {
$( this ).removeClass( 'selected' );
self.$element.trigger( 'deselected.fu.repeaterList', $( this ) );
} );
$item.find( 'td:first' ).prepend( '<div class="repeater-list-check"><span class="glyphicon glyphicon-ok"></span></div>' );
$item.addClass( 'selected' );
$frozenRow.addClass( 'selected' );
self.$element.trigger( 'deselected.fu.repeaterList', $item );
} else {
$checkBox.checkbox( 'check' );
$item.addClass( 'selected' );
$frozenRow.addClass( 'selected' );
if ( isActions ) {
$actionsRow.addClass( 'selected' );
if ( !isMulti ) {
self.$canvas.find( '.repeater-list-check' ).remove();
self.$canvas.find( '.repeater-list tbody tr.selected' ).each( function() {
$( this ).removeClass( 'selected' );
self.$element.trigger( 'deselected.fu.repeaterList', $( this ) );
} );
$item.find( 'td:first' ).prepend( '<div class="repeater-list-check"><span class="glyphicon glyphicon-ok"></span></div>' );
$item.addClass( 'selected' );
$frozenRow.addClass( 'selected' );
} else {
$checkBox.checkbox( 'check' );
$item.addClass( 'selected' );
$frozenRow.addClass( 'selected' );
if ( isActions ) {
$actionsRow.addClass( 'selected' );
}
}
self.$element.trigger( 'selected.fu.repeaterList', $item );
}
self.$element.trigger( 'selected.fu.repeaterList', $item );
}

toggleActionsHeaderButton.call( self );
}
} );
toggleActionsHeaderButton.call( self );
}
} );

// allow selection via enter key
$row.keyup( function( e ) {
if ( e.keyCode === 13 ) {
// triggering a standard click event to be caught by the row click handler above
$row.trigger( 'click.fu.repeaterList' );
}
} );
// allow selection via enter key
$row.keyup( function( e ) {
if ( e.keyCode === 13 ) {
// triggering a standard click event to be caught by the row click handler above
$row.trigger( 'click.fu.repeaterList' );
}
} );
}
}

if ( this.viewOptions.list_actions && !this.viewOptions.list_selectable ) {
Expand Down Expand Up @@ -6784,8 +6795,16 @@
}

function toggleActionsHeaderButton() {
var $selected = this.$canvas.find( '.repeater-list-wrapper > table .selected' );
var selectedSelector = '.repeater-list-wrapper > table .selected';
var $actionsColumn = this.$element.find( '.table-actions' );
var $selected;

if ( this.viewOptions.list_selectable === 'action' ) {
selectedSelector = '.repeater-list-wrapper > table tr';
}

$selected = this.$canvas.find( selectedSelector );

if ( $selected.length > 0 ) {
$actionsColumn.find( 'thead .btn' ).removeAttr( 'disabled' );
} else {
Expand Down
6 changes: 3 additions & 3 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.12.0',
version: '3.14.1',
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 @@ -83,7 +83,7 @@
"postinstall": "node postinstall.js"
},
"title": "Fuel UX",
"version": "3.14.0",
"version": "3.14.1",
"volo": {
"baseDir": "lib",
"dependencies": {
Expand Down

0 comments on commit 710f545

Please sign in to comment.