Comparing version 3.13.1 to 3.14.0
@@ -32,3 +32,3 @@ Additional details to supplement the brief nature of the README file. | ||
* 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.13.1/fuelux.zip). | ||
@@ -43,3 +43,3 @@ ## AMD support | ||
paths: { | ||
'fuelux': 'http://www.fuelcdn.com/fuelux/3.13.0/' | ||
'fuelux': 'http://www.fuelcdn.com/fuelux/3.13.1/' | ||
//... | ||
@@ -46,0 +46,0 @@ } |
@@ -14,3 +14,9 @@ module.exports = { | ||
src: ['**'] | ||
}, | ||
templates: { | ||
cwd: 'templates/', | ||
dest: 'dist/templates/', | ||
expand: true, | ||
src: ['**'] | ||
} | ||
}; |
@@ -31,5 +31,5 @@ module.exports = function(grunt) { | ||
grunt.registerTask('dist', 'Build "dist." Contributors: do not commit "dist."', | ||
['clean:dist', 'distcss', 'copy:fonts', 'distjs', 'commonjs', 'distzip']); | ||
['clean:dist', 'distcss', 'copy:fonts', 'copy:templates', 'distjs', 'commonjs', 'distzip']); | ||
}; |
@@ -288,6 +288,9 @@ /* | ||
// 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'); | ||
} | ||
} | ||
@@ -334,3 +337,8 @@ else { | ||
}; | ||
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(); | ||
@@ -745,62 +753,65 @@ index = index + 1; | ||
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 (this.viewOptions.list_selectable !== 'action') { | ||
$row.addClass('selectable'); | ||
$row.attr('tabindex', 0); // allow items to be tabbed to / focused on | ||
if ($item.is('.selected')) { | ||
$item.removeClass('selected'); | ||
if (isMulti){ | ||
$checkBox.checkbox('uncheck'); | ||
$frozenRow.removeClass('selected'); | ||
if (isActions) { | ||
$actionsRow.removeClass('selected'); | ||
$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'); | ||
} | ||
else { | ||
$checkBox.checkbox('check'); | ||
$item.addClass('selected'); | ||
$frozenRow.addClass('selected'); | ||
if (isActions) { | ||
$actionsRow.addClass('selected'); | ||
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'); | ||
} | ||
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'); | ||
} | ||
}); | ||
} | ||
} | ||
@@ -962,4 +973,12 @@ | ||
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) { | ||
@@ -966,0 +985,0 @@ $actionsColumn.find('thead .btn').removeAttr('disabled'); |
@@ -9,3 +9,3 @@ // package metadata file for Meteor.js | ||
summary: 'Base Fuel UX styles and controls', | ||
version: '3.13.0', | ||
version: '3.14.0', | ||
git: 'https://github.com/ExactTarget/fuelux.git' | ||
@@ -12,0 +12,0 @@ }); |
@@ -86,3 +86,3 @@ { | ||
"title": "Fuel UX", | ||
"version": "3.13.1", | ||
"version": "3.14.0", | ||
"volo": { | ||
@@ -89,0 +89,0 @@ "baseDir": "lib", |
@@ -37,7 +37,7 @@ #[Fuel UX](http://getfuelux.com/) | ||
<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.13.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.13.1/js/fuelux.min.js"></script> | ||
@@ -49,3 +49,3 @@ ``` | ||
- 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.13.1/) | ||
- Install with [NPM](https://www.npmjs.com/package/fuelux): `npm install fuelux`. | ||
@@ -52,0 +52,0 @@ - [Download the latest release](https://github.com/exacttarget/fuelux/archive/3.4.0.zip). |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1930052
217
25169