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.1
Browse files Browse the repository at this point in the history
  • Loading branch information
interactivellama committed Aug 20, 2015
1 parent f162d77 commit 1269099
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 38 deletions.
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.
53 changes: 23 additions & 30 deletions dist/js/fuelux.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Fuel UX v3.11.0
* Fuel UX v3.11.1
* Copyright 2012-2015 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -5190,8 +5190,8 @@
},

infiniteScrolling: function( enable, options ) {
var itemization = this.$element.find( '.repeater-itemization' );
var pagination = this.$element.find( '.repeater-pagination' );
var footer = this.$element.find( '.repeater-footer' );
var viewport = this.$element.find( '.repeater-viewport' );
var cont, data;

options = options || {};
Expand All @@ -5202,8 +5202,10 @@
delete options.dataSource;
delete options.end;
this.infiniteScrollingOptions = options;
itemization.hide();
pagination.hide();
viewport.css( {
height: viewport.height() + footer.outerHeight()
} );
footer.hide();
} else {
cont = this.infiniteScrollingCont;
data = cont.data();
Expand All @@ -5215,8 +5217,10 @@
this.infiniteScrollingEnabled = false;
this.infiniteScrollingEnd = null;
this.infiniteScrollingOptions = {};
itemization.show();
pagination.show();
viewport.css( {
height: viewport.height() - footer.outerHeight()
} );
footer.show();
}
},

Expand Down Expand Up @@ -6198,7 +6202,7 @@
$col.html( checkBoxMarkup );
}

if ( this.viewOptions.list_columnRendered ) {
if ( !( columns[ columnIndex ].property === '@_CHECKBOX_@' || columns[ columnIndex ].property === '@_ACTIONS_@' ) && this.viewOptions.list_columnRendered ) {
this.viewOptions.list_columnRendered( {
container: $row,
columnAttr: columns[ columnIndex ].property,
Expand Down Expand Up @@ -6543,10 +6547,6 @@
}
}

function hoverClick() {

}

function specialBrowserClass() {
var ua = window.navigator.userAgent;
var msie = ua.indexOf( "MSIE " );
Expand Down Expand Up @@ -7138,10 +7138,7 @@

var data = {
startDateTime: startDateTime,
timeZone: {
name: timeZone.name,
offset: timeZone.offset
},
timeZone: timeZone,
recurrencePattern: pattern
};

Expand All @@ -7155,8 +7152,8 @@

if ( !data ) {
selectedItem = this.$repeatIntervalSelect.selectlist( 'selectedItem' );
val = selectedItem.value;
txt = selectedItem.text;
val = selectedItem.value || "";
txt = selectedItem.text || "";
} else {
val = data.value;
txt = data.text;
Expand Down Expand Up @@ -7231,19 +7228,17 @@
startDate = currentDate.getFullYear() + '-' + currentDate.getMonth() + '-' + currentDate.getDate();
}

item = 'li[data';
// create jQuery selection string for timezone object
// based on data-attributes and pass to selectlist
item = 'li';
if ( options.timeZone ) {
if ( typeof( options.timeZone ) === 'string' ) {
item += '-name="' + options.timeZone;
item += '[data-name="' + options.timeZone + '"]';
} else {
if ( options.timeZone.name ) {
item += '-name="' + options.timeZone.name;
} else {
item += '-offset="' + options.timeZone.offset;
}
$.each( options.timeZone, function( key, value ) {
item += '[data-' + key + '="' + value + '"]';
} );
}

item += '"]';
timeOffset = options.timeZone.offset;
this.$timeZone.selectlist( 'selectBySelector', item );
} else if ( options.startDateTime ) {
Expand All @@ -7259,10 +7254,8 @@
} else {
temp = '+00:00';
}

timeOffset = ( temp === '+00:00' ) ? 'Z' : temp;

item += '-offset="' + temp + '"]';
item += '[data-offset="' + temp + '"]';
this.$timeZone.selectlist( 'selectBySelector', item );
} else {
timeOffset = 'Z';
Expand Down
11 changes: 6 additions & 5 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 @@ -82,7 +82,7 @@
"postinstall": "node postinstall.js"
},
"title": "Fuel UX",
"version": "3.11.0",
"version": "3.11.1",
"volo": {
"baseDir": "lib",
"dependencies": {
Expand Down

0 comments on commit 1269099

Please sign in to comment.