Merge branch 'master' into greenkeeper-grunt-1.0.1

ExactTarget · Sep 22, 2016 · 7b74ef1 · 7b74ef1
2 parents 37f1f4a + 8b0f01b
commit 7b74ef1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/dist/css/fuelux.css b/dist/css/fuelux.css
diff --git a/dist/css/fuelux.min.css b/dist/css/fuelux.min.css
diff --git a/dist/fuelux.zip b/dist/fuelux.zip
diff --git a/dist/js/fuelux.js b/dist/js/fuelux.js
@@ -1,5 +1,6 @@
 /*!
- * Fuel UX v3.15.7 
+ * Fuel UX EDGE - Built 2016/09/22, 1:48:06 PM 
+ * Previous release: v3.15.7 
  * Copyright 2012-2016 ExactTarget
  * Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
  */
@@ -5406,7 +5407,11 @@
 			this.$loader.hide().loader( 'pause' );
 			this.enable();
 
-			this.$search.trigger( 'rendered.fu.repeater' );
+			this.$search.trigger( 'rendered.fu.repeater', {
+				data: data,
+				options: state.dataOptions,
+				renderOptions: state.options
+			} );
 			this.$element.trigger( 'rendered.fu.repeater', {
 				data: data,
 				options: state.dataOptions,
@@ -5968,7 +5973,7 @@
 						addItem( this.$canvas, addAfter );
 					}
 
-					callback();
+					callback( data );
 				} else {
 					viewTypeObj.render.call( this, {
 						container: this.$canvas,

diff --git a/dist/js/fuelux.min.js b/dist/js/fuelux.min.js
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "description": "Base Fuel UX styles and controls",
   "devDependencies": {
     "bower": "1.7.9",
-    "connect": "3.4.1",
+    "connect": "3.5.0",
     "eslint": "^3.3.1",
     "eslint-config-airbnb-es5": "^1.0.9",
     "eslint-plugin-requirejs": "^2.0.1",