release 3.15.4

DETAILS.md

@@ -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.15.2/fuelux.zip).
+* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.15.3/fuelux.zip).
 
 ## AMD support
 
@@ -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.15.2/'
+        'fuelux': 'http://www.fuelcdn.com/fuelux/3.15.3/'
         //...
     }
 });

README.md

@@ -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.15.2/css/fuelux.min.css" rel="stylesheet">
+<link href="//www.fuelcdn.com/fuelux/3.15.3/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.15.2/js/fuelux.min.js"></script>
+<script src="//www.fuelcdn.com/fuelux/3.15.3/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.15.2/)
+- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.15.3/)
 - 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`.

dist/js/fuelux.js

@@ -1,5 +1,5 @@
 /*!
- * Fuel UX v3.15.3 
+ * Fuel UX v3.15.4 
  * Copyright 2012-2016 ExactTarget
  * Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
  */
@@ -298,12 +298,22 @@
 			},
 
 			doSelect: function( $item ) {
+
 				if ( typeof $item[ 0 ] !== 'undefined' ) {
-					$item.addClass( 'selected' );
+					// remove selection from old item, may result in remove and 
+					// re-addition of class if item is the same
+					this.$element.find( 'li.selected:first' ).removeClass( 'selected' );
+
+					// add selection to new item
 					this.$selectedItem = $item;
+					this.$selectedItem.addClass( 'selected' );
+
+					// update input
 					this.$input.val( this.$selectedItem.text().trim() );
 				} else {
+					// this is a custom input, not in the menu
 					this.$selectedItem = null;
+					this.$element.find( 'li.selected:first' ).removeClass( 'selected' );
 				}
 			},
 
@@ -335,7 +345,8 @@
 					}, this.$selectedItem.data() );
 				} else {
 					data = {
-						text: this.$input.val().trim()
+						text: this.$input.val().trim(),
+						notFound: true
 					};
 				}
 
@@ -447,7 +458,6 @@
 					}
 
 					this.$inputGroupBtn.removeClass( 'open' );
-					this.inputchanged( e );
 				} else if ( e.which === ESC ) {
 					e.preventDefault();
 					this.clearSelection();
@@ -471,8 +481,7 @@
 								$selected = this.$dropMenu.find( 'li:not(.hidden):last' );
 							}
 						}
-						this.$dropMenu.find( 'li' ).removeClass( 'selected' );
-						$selected.addClass( 'selected' );
+						this.doSelect( $selected );
 					}
 				}
 
@@ -485,10 +494,13 @@
 			},
 
 			inputchanged: function( e, extra ) {
+				var val = $( e.target ).val();
 				// skip processing for internally-generated synthetic event
 				// to avoid double processing
-				if ( extra && extra.synthetic ) return;
-				var val = $( e.target ).val();
+				if ( extra && extra.synthetic ) {
+					this.selectByText( val );
+					return;
+				}
 				this.selectByText( val );
 
 				// find match based on input
@@ -2761,9 +2773,6 @@
 			this.$element.on( 'keydown.fu.spinbox', this.$input, $.proxy( this.keydown, this ) );
 			this.$element.on( 'keyup.fu.spinbox', this.$input, $.proxy( this.keyup, this ) );
 
-			this.bindMousewheelListeners();
-			this.mousewheelTimeout = {};
-
 			if ( this.options.hold ) {
 				this.$element.on( 'mousedown.fu.spinbox', '.spinbox-up', $.proxy( function() {
 					this.startSpin( true );
@@ -3068,47 +3077,8 @@
 				if ( keyCode === 38 || keyCode === 40 ) {
 					this.triggerChangedEvent();
 				}
-			},
-
-			bindMousewheelListeners: function bindMousewheelListeners() {
-				var inputEl = this.$input.get( 0 );
-				if ( inputEl.addEventListener ) {
-					//IE 9, Chrome, Safari, Opera
-					inputEl.addEventListener( 'mousewheel', $.proxy( this.mousewheelHandler, this ), false );
-					// Firefox
-					inputEl.addEventListener( 'DOMMouseScroll', $.proxy( this.mousewheelHandler, this ), false );
-				} else {
-					// IE <9
-					inputEl.attachEvent( 'onmousewheel', $.proxy( this.mousewheelHandler, this ) );
-				}
-			},
-
-			mousewheelHandler: function mousewheelHandler( event ) {
-				if ( !this.options.disabled ) {
-					var e = window.event || event; // old IE support
-					var delta = Math.max( -1, Math.min( 1, ( e.wheelDelta || -e.detail ) ) );
-					var self = this;
-
-					clearTimeout( this.mousewheelTimeout );
-					this.mousewheelTimeout = setTimeout( function() {
-						self.triggerChangedEvent();
-					}, 300 );
-
-					if ( delta < 0 ) {
-						this.step( true );
-					} else {
-						this.step( false );
-					}
-
-					if ( e.preventDefault ) {
-						e.preventDefault();
-					} else {
-						e.returnValue = false;
-					}
-
-					return false;
-				}
 			}
+
 		};
 
 
@@ -5251,8 +5221,7 @@
 			} );
 			this.$prevBtn.on( 'click.fu.repeater', $.proxy( this.previous, this ) );
 			this.$primaryPaging.find( '.combobox' ).on( 'changed.fu.combobox', function( evt, data ) {
-				self.$element.trigger( 'pageChanged.fu.repeater', [ data.text, data ] );
-				self.pageInputChange( data.text );
+				self.pageInputChange( data.text, data );
 			} );
 			this.$search.on( 'searched.fu.search cleared.fu.search', function( e, value ) {
 				self.$element.trigger( 'searchChanged.fu.repeater', value );
@@ -5628,13 +5597,15 @@
 				} );
 			},
 
-			pageInputChange: function( val ) {
+			pageInputChange: function( val, dataFromCombobox ) {
+				// dataFromCombobox is a proxy for data from combobox's changed event,
+				// if no combobox is present data will be undefined
 				var pageInc;
 				if ( val !== this.lastPageInput ) {
 					this.lastPageInput = val;
 					val = parseInt( val, 10 ) - 1;
 					pageInc = val - this.currentPage;
-					this.$element.trigger( 'pageChanged.fu.repeater', val );
+					this.$element.trigger( 'pageChanged.fu.repeater', [ val, dataFromCombobox ] );
 					this.render( {
 						pageIncrement: pageInc
 					} );
@@ -6568,6 +6539,13 @@
 					var self = this;
 					var $table;
 
+					// this is a patch, it was pulled out of `renderThead`
+					if ( helpers.data.count > 0 ) {
+						this.list_noItems = false;
+					} else {
+						this.list_noItems = true;
+					}
+
 					if ( $listContainer.length < 1 ) {
 						$listContainer = $( '<div class="repeater-list ' + this.list_specialBrowserClass + '" data-preserve="shallow"><div class="repeater-list-wrapper" data-infinite="true" data-preserve="shallow"><table aria-readonly="true" class="table" data-preserve="shallow" role="grid"></table></div></div>' );
 						$listContainer.find( '.repeater-list-wrapper' ).on( 'scroll.fu.repeaterList', function() {
@@ -6896,9 +6874,7 @@
 			if ( this.list_firstRender || areDifferentColumns( this.list_columns, columns ) || $thead.length === 0 ) {
 				$thead.remove();
 
-				if ( data.count < 1 ) {
-					this.list_noItems = true;
-				}
+				// list_noItems is set in `before` method
 
 				if ( this.viewOptions.list_selectable === 'multi' && !this.list_noItems ) {
 					var checkboxColumn = {
@@ -6913,7 +6889,8 @@
 				this.list_firstRender = false;
 				this.$loader.removeClass( 'noHeader' );
 
-				if ( this.viewOptions.list_actions && !this.list_noItems ) {
+				// keep action column header even when empty, you'll need it later....
+				if ( this.viewOptions.list_actions ) {
 					var actionsColumn = {
 						label: this.viewOptions.list_actions.label || '<span class="actions-hidden">a</span>',
 						property: '@_ACTIONS_@',

dist/templates/handlebars/fuelux/tree.hbs

@@ -10,7 +10,7 @@
 		</div>
 		<ul class="tree-branch-children" role="group"></ul>
 		<!-- this loader shows on nested folders and when overflow is triggered -->
-		{{#if loaderHTML }}{{loaderHTML}}{{else}}<div class="tree-loader hidden" role="alert">Loading...</div>{{/if}}
+		{{#if loaderHTML }}{{loaderHTML}}{{else}}<div class="tree-loader hidden"><span role="alert">Loading...</span></div>{{/if}}
 	</li>
 	<li class="tree-item hidden" data-template="treeitem" role="treeitem">
 		<button type="button" class="tree-item-name">
@@ -25,5 +25,5 @@
 		</button>
 	</li>
 	<!-- Loader shown at root level and when tree is loading -->
-	{{#if initialLoaderHTML}}{{initialLoaderHTML}}{{else}}{{#if loaderHTML }}{{loaderHTML}}{{else}}<li class="tree-loader hidden" role="alert">Loading...</li>{{/if}}{{/if}}
+	{{#if initialLoaderHTML}}{{initialLoaderHTML}}{{else}}{{#if loaderHTML }}{{loaderHTML}}{{else}}<li class="tree-loader hidden"><span role="alert">Loading...</span></li>{{/if}}{{/if}}
 </ul>

package.json

@@ -83,7 +83,7 @@
     "postinstall": "node postinstall.js"
   },
   "title": "Fuel UX",
-  "version": "3.15.3",
+  "version": "3.15.4",
   "volo": {
     "baseDir": "lib",
     "dependencies": {