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

Commit 2786adf

Browse files
author
Christopher McCulloh
authored
Merge branch 'master' into greenkeeper-grunt-contrib-uglify-2.0.0
2 parents 220e83a + 5c75c22 commit 2786adf

6 files changed

Lines changed: 20 additions & 12 deletions

File tree

dist/css/fuelux.css

Lines changed: 2 additions & 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: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fuelux.zip

218 Bytes
Binary file not shown.

dist/js/fuelux.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*!
2-
* Fuel UX v3.15.7
2+
* Fuel UX EDGE - Built 2016/09/22, 1:48:06 PM
3+
* Previous release: v3.15.7
34
* Copyright 2012-2016 ExactTarget
45
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
56
*/
@@ -5406,7 +5407,11 @@
54065407
this.$loader.hide().loader( 'pause' );
54075408
this.enable();
54085409

5409-
this.$search.trigger( 'rendered.fu.repeater' );
5410+
this.$search.trigger( 'rendered.fu.repeater', {
5411+
data: data,
5412+
options: state.dataOptions,
5413+
renderOptions: state.options
5414+
} );
54105415
this.$element.trigger( 'rendered.fu.repeater', {
54115416
data: data,
54125417
options: state.dataOptions,
@@ -5968,7 +5973,7 @@
59685973
addItem( this.$canvas, addAfter );
59695974
}
59705975

5971-
callback();
5976+
callback( data );
59725977
} else {
59735978
viewTypeObj.render.call( this, {
59745979
container: this.$canvas,

dist/js/fuelux.min.js

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"description": "Base Fuel UX styles and controls",
1616
"devDependencies": {
1717
"bower": "1.7.9",
18-
"connect": "3.4.1",
18+
"connect": "3.5.0",
1919
"eslint": "^3.3.1",
2020
"eslint-config-airbnb-es5": "^1.0.9",
2121
"eslint-plugin-requirejs": "^2.0.1",
22-
"grunt": "^0.4.5",
22+
"grunt": "^1.0.1",
2323
"grunt-banner": "0.6.0",
2424
"grunt-blanket-qunit": "0.2.0",
2525
"grunt-browserify": "5.0.0",
@@ -38,7 +38,7 @@
3838
"grunt-html": "5.0.1",
3939
"grunt-jsbeautifier": "0.2.13",
4040
"grunt-prompt": "1.3.3",
41-
"grunt-saucelabs": "8.6.2",
41+
"grunt-saucelabs": "9.0.0",
4242
"grunt-shell": "1.3.1",
4343
"grunt-text-replace": "0.4.0",
4444
"grunt-umd": "2.3.6",

0 commit comments

Comments
 (0)