From 4f148c2778f39bbe8f2cd8e706e8e63409118189 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 30 Mar 2016 22:42:10 +1300
Subject: [PATCH] More logical dependency ordering in Gulpfile

---
 gulpfile.js                         | 24 ++++++++++++------------
 javascript/dist/InlineFormAction.js | 20 +++++++++++++++++---
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 64fb3c8b1..6f336e787 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -192,8 +192,16 @@ gulp.task('bundle-lib', function bundleLib() {
         .on('update', bundleLib)
         .on('log', function (msg) { gulpUtil.log('Finished', 'bundled ' + bundleFileName + ' ' + msg) })
         .transform('babelify', babelifyOptions)
+        .require('deep-freeze', { expose: 'deep-freeze' })
+        .require('react', { expose: 'react' })
+        .require('react-addons-css-transition-group', { expose: 'react-addons-css-transition-group' })
+        .require('react-addons-test-utils', { expose: 'react-addons-test-utils' })
+        .require('react-dom', { expose: 'react-dom' })
+        .require('react-redux', { expose: 'react-redux' })
+        .require('redux', { expose: 'redux' })
+        .require('redux-thunk', { expose: 'redux-thunk' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form/index', { expose: 'components/form/index' })
-        .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form-action/index', { expose: 'components/form-action' })
+        .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form-action/index', { expose: 'components/form-action/index' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/form-builder/index', { expose: 'components/form-builder/index' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/index', { expose: 'components/grid-field/index' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/cell', { expose: 'components/grid-field/cell/index' })
@@ -202,20 +210,12 @@ gulp.task('bundle-lib', function bundleLib() {
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/row', { expose: 'components/grid-field/row' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/table', { expose: 'components/grid-field/table' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/hidden-field/index', { expose: 'components/hidden-field/index' })
-	    .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/text-field/index', { expose: 'components/text-field/index' })
-	    .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header/index', { expose: 'components/north-header/index' })
-	    .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header-breadcrumbs/index', { expose: 'components/north-header-breadcrumbs/index' })
-	    .require('deep-freeze', { expose: 'deep-freeze' })
+        .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/text-field/index', { expose: 'components/text-field/index' })
+        .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header/index', { expose: 'components/north-header/index' })
+        .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header-breadcrumbs/index', { expose: 'components/north-header-breadcrumbs/index' })
         .require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/i18n.js', { expose: 'i18n' })
         .require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/jQuery.js', { expose: 'jQuery' })
-        .require('react', { expose: 'react' })
-        .require('react-addons-css-transition-group', { expose: 'react-addons-css-transition-group' })
-        .require('react-addons-test-utils', { expose: 'react-addons-test-utils' })
-        .require('react-dom', { expose: 'react-dom' })
-        .require('react-redux', { expose: 'react-redux' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/reducer-register.js', { expose: 'reducer-register' })
-        .require('redux', { expose: 'redux' })
-        .require('redux-thunk', { expose: 'redux-thunk' })
         .require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/router.js', { expose: 'router' })
         .require(PATHS.ADMIN_JAVASCRIPT_SRC + '/silverstripe-component', { expose: 'silverstripe-component' })
         .bundle()
diff --git a/javascript/dist/InlineFormAction.js b/javascript/dist/InlineFormAction.js
index fbce571c0..8b8fc44dc 100644
--- a/javascript/dist/InlineFormAction.js
+++ b/javascript/dist/InlineFormAction.js
@@ -13,16 +13,30 @@
 })(this, function () {
 	'use strict';
 
+	function _defineProperty(obj, key, value) {
+		if (key in obj) {
+			Object.defineProperty(obj, key, {
+				value: value,
+				enumerable: true,
+				configurable: true,
+				writable: true
+			});
+		} else {
+			obj[key] = value;
+		}
+
+		return obj;
+	}
+
 	Behaviour.register({
 		'div.inlineformaction input#$ID': {
 			onclick: function onclick() {
 				var url = jQuery('base').attr('href') + 'admin-custom/' + this.name.substring(7) + '?ID=' + document.getElementById('Form_EditForm_ID').value + '&ajax=1';
 
-				jQuery.ajax({
+				jQuery.ajax(_defineProperty({
 					'url': url,
-					success: Ajax.Evaluator,
 					success: Ajax.Evaluator
-				});
+				}, 'success', Ajax.Evaluator));
 
 				return false;
 			}