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

Commit 1269099

Browse files
release 3.11.1
1 parent f162d77 commit 1269099

File tree

6 files changed

+32
-38
lines changed

6 files changed

+32
-38
lines changed

dist/css/fuelux.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/fuelux.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fuelux.zip

147 Bytes
Binary file not shown.

dist/js/fuelux.js

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Fuel UX v3.11.0
2+
* Fuel UX v3.11.1
33
* Copyright 2012-2015 ExactTarget
44
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
55
*/
@@ -5190,8 +5190,8 @@
51905190
},
51915191

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

51975197
options = options || {};
@@ -5202,8 +5202,10 @@
52025202
delete options.dataSource;
52035203
delete options.end;
52045204
this.infiniteScrollingOptions = options;
5205-
itemization.hide();
5206-
pagination.hide();
5205+
viewport.css( {
5206+
height: viewport.height() + footer.outerHeight()
5207+
} );
5208+
footer.hide();
52075209
} else {
52085210
cont = this.infiniteScrollingCont;
52095211
data = cont.data();
@@ -5215,8 +5217,10 @@
52155217
this.infiniteScrollingEnabled = false;
52165218
this.infiniteScrollingEnd = null;
52175219
this.infiniteScrollingOptions = {};
5218-
itemization.show();
5219-
pagination.show();
5220+
viewport.css( {
5221+
height: viewport.height() - footer.outerHeight()
5222+
} );
5223+
footer.show();
52205224
}
52215225
},
52225226

@@ -6198,7 +6202,7 @@
61986202
$col.html( checkBoxMarkup );
61996203
}
62006204

6201-
if ( this.viewOptions.list_columnRendered ) {
6205+
if ( !( columns[ columnIndex ].property === '@_CHECKBOX_@' || columns[ columnIndex ].property === '@_ACTIONS_@' ) && this.viewOptions.list_columnRendered ) {
62026206
this.viewOptions.list_columnRendered( {
62036207
container: $row,
62046208
columnAttr: columns[ columnIndex ].property,
@@ -6543,10 +6547,6 @@
65436547
}
65446548
}
65456549

6546-
function hoverClick() {
6547-
6548-
}
6549-
65506550
function specialBrowserClass() {
65516551
var ua = window.navigator.userAgent;
65526552
var msie = ua.indexOf( "MSIE " );
@@ -7138,10 +7138,7 @@
71387138

71397139
var data = {
71407140
startDateTime: startDateTime,
7141-
timeZone: {
7142-
name: timeZone.name,
7143-
offset: timeZone.offset
7144-
},
7141+
timeZone: timeZone,
71457142
recurrencePattern: pattern
71467143
};
71477144

@@ -7155,8 +7152,8 @@
71557152

71567153
if ( !data ) {
71577154
selectedItem = this.$repeatIntervalSelect.selectlist( 'selectedItem' );
7158-
val = selectedItem.value;
7159-
txt = selectedItem.text;
7155+
val = selectedItem.value || "";
7156+
txt = selectedItem.text || "";
71607157
} else {
71617158
val = data.value;
71627159
txt = data.text;
@@ -7231,19 +7228,17 @@
72317228
startDate = currentDate.getFullYear() + '-' + currentDate.getMonth() + '-' + currentDate.getDate();
72327229
}
72337230

7234-
item = 'li[data';
7231+
// create jQuery selection string for timezone object
7232+
// based on data-attributes and pass to selectlist
7233+
item = 'li';
72357234
if ( options.timeZone ) {
72367235
if ( typeof( options.timeZone ) === 'string' ) {
7237-
item += '-name="' + options.timeZone;
7236+
item += '[data-name="' + options.timeZone + '"]';
72387237
} else {
7239-
if ( options.timeZone.name ) {
7240-
item += '-name="' + options.timeZone.name;
7241-
} else {
7242-
item += '-offset="' + options.timeZone.offset;
7243-
}
7238+
$.each( options.timeZone, function( key, value ) {
7239+
item += '[data-' + key + '="' + value + '"]';
7240+
} );
72447241
}
7245-
7246-
item += '"]';
72477242
timeOffset = options.timeZone.offset;
72487243
this.$timeZone.selectlist( 'selectBySelector', item );
72497244
} else if ( options.startDateTime ) {
@@ -7259,10 +7254,8 @@
72597254
} else {
72607255
temp = '+00:00';
72617256
}
7262-
72637257
timeOffset = ( temp === '+00:00' ) ? 'Z' : temp;
7264-
7265-
item += '-offset="' + temp + '"]';
7258+
item += '[data-offset="' + temp + '"]';
72667259
this.$timeZone.selectlist( 'selectBySelector', item );
72677260
} else {
72687261
timeOffset = 'Z';

dist/js/fuelux.min.js

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"postinstall": "node postinstall.js"
8383
},
8484
"title": "Fuel UX",
85-
"version": "3.11.0",
85+
"version": "3.11.1",
8686
"volo": {
8787
"baseDir": "lib",
8888
"dependencies": {

0 commit comments

Comments
 (0)