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

Commit

Permalink
release 2.6.6
Browse files Browse the repository at this point in the history
  • Loading branch information
interactivellama committed May 11, 2015
1 parent 4876a35 commit b1b60ca
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 18 deletions.
10 changes: 9 additions & 1 deletion dist/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -4693,6 +4693,11 @@ define('fuelux/select',['require','jquery','./util'],function(require) {

itemclicked: function (e) {
this.$selectedItem = $(e.target).parent();

if (this.$selectedItem.is('.disabled')) {
return;
}

this.$hiddenField.val(this.$selectedItem.attr('data-value'));
this.$label.text(this.$selectedItem.text());

Expand Down Expand Up @@ -5040,6 +5045,8 @@ define('fuelux/spinner',['require','jquery'],function(require) {
var data = $this.data( 'spinner' );
var options = typeof option === 'object' && option;

options = $.extend({}, $this.data(), options);

if( !data ) $this.data('spinner', (data = new Spinner( this, options ) ) );
if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
});
Expand Down Expand Up @@ -5074,7 +5081,8 @@ define('fuelux/spinner',['require','jquery'],function(require) {
$this.spinner($this.data());
});
});
});
});

/*
* Fuel UX Scheduler
* https://github.com/ExactTarget/fuelux
Expand Down
4 changes: 2 additions & 2 deletions dist/all.min.js

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions dist/css/fuelux.css
Original file line number Diff line number Diff line change
Expand Up @@ -6264,10 +6264,6 @@ textarea.span1,
border-radius: 0 4px 4px 0;
}

.fuelux .datagrid th {
cursor: pointer;
}

.fuelux .datagrid thead {
background-color: #f9f9f9;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/css/fuelux.min.css

Large diffs are not rendered by default.

Binary file modified dist/fuelux.zip
Binary file not shown.
4 changes: 0 additions & 4 deletions dist/less/datagrid.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

.datagrid {

th {
cursor: pointer;
}

thead {

background-color: @tableBackgroundAccent;
Expand Down
10 changes: 9 additions & 1 deletion dist/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -5034,6 +5034,11 @@ define('fuelux/select',['require','jquery','./util'],function(require) {

itemclicked: function (e) {
this.$selectedItem = $(e.target).parent();

if (this.$selectedItem.is('.disabled')) {
return;
}

this.$hiddenField.val(this.$selectedItem.attr('data-value'));
this.$label.text(this.$selectedItem.text());

Expand Down Expand Up @@ -5381,6 +5386,8 @@ define('fuelux/spinner',['require','jquery'],function(require) {
var data = $this.data( 'spinner' );
var options = typeof option === 'object' && option;

options = $.extend({}, $this.data(), options);

if( !data ) $this.data('spinner', (data = new Spinner( this, options ) ) );
if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
});
Expand Down Expand Up @@ -5415,7 +5422,8 @@ define('fuelux/spinner',['require','jquery'],function(require) {
$this.spinner($this.data());
});
});
});
});

/*
* Fuel UX Scheduler
* https://github.com/ExactTarget/fuelux
Expand Down
6 changes: 3 additions & 3 deletions dist/loader.min.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions dist/select.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ define(['require','jquery','./util'],function(require) {

itemclicked: function (e) {
this.$selectedItem = $(e.target).parent();

if (this.$selectedItem.is('.disabled')) {
return;
}

this.$hiddenField.val(this.$selectedItem.attr('data-value'));
this.$label.text(this.$selectedItem.text());

Expand Down
4 changes: 3 additions & 1 deletion dist/spinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ define(['require','jquery'],function(require) {
var data = $this.data( 'spinner' );
var options = typeof option === 'object' && option;

options = $.extend({}, $this.data(), options);

if( !data ) $this.data('spinner', (data = new Spinner( this, options ) ) );
if( typeof option === 'string' ) methodReturn = data[ option ].apply( data, args );
});
Expand Down Expand Up @@ -235,4 +237,4 @@ define(['require','jquery'],function(require) {
$this.spinner($this.data());
});
});
});
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fuelux",
"title": "Fuel UX",
"version": "2.6.5",
"version": "2.6.6",
"description": "Base Fuel UX styles and controls",
"homepage": "https://github.com/ExactTarget/fuelux",
"author": {
Expand Down

0 comments on commit b1b60ca

Please sign in to comment.