mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-02 14:18:46 +02:00
More logical dependency ordering in Gulpfile
This commit is contained in:
parent
ca25c78dda
commit
4f148c2778
18
gulpfile.js
18
gulpfile.js
@ -192,8 +192,16 @@ gulp.task('bundle-lib', function bundleLib() {
|
|||||||
.on('update', bundleLib)
|
.on('update', bundleLib)
|
||||||
.on('log', function (msg) { gulpUtil.log('Finished', 'bundled ' + bundleFileName + ' ' + msg) })
|
.on('log', function (msg) { gulpUtil.log('Finished', 'bundled ' + bundleFileName + ' ' + msg) })
|
||||||
.transform('babelify', babelifyOptions)
|
.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/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/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/index', { expose: 'components/grid-field/index' })
|
||||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/cell', { expose: 'components/grid-field/cell/index' })
|
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/grid-field/cell', { expose: 'components/grid-field/cell/index' })
|
||||||
@ -205,17 +213,9 @@ gulp.task('bundle-lib', function bundleLib() {
|
|||||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/text-field/index', { expose: 'components/text-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/index', { expose: 'components/north-header/index' })
|
||||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/components/north-header-breadcrumbs/index', { expose: 'components/north-header-breadcrumbs/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.FRAMEWORK_JAVASCRIPT_SRC + '/i18n.js', { expose: 'i18n' })
|
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/i18n.js', { expose: 'i18n' })
|
||||||
.require(PATHS.FRAMEWORK_JAVASCRIPT_SRC + '/jQuery.js', { expose: 'jQuery' })
|
.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(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.FRAMEWORK_JAVASCRIPT_SRC + '/router.js', { expose: 'router' })
|
||||||
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/silverstripe-component', { expose: 'silverstripe-component' })
|
.require(PATHS.ADMIN_JAVASCRIPT_SRC + '/silverstripe-component', { expose: 'silverstripe-component' })
|
||||||
.bundle()
|
.bundle()
|
||||||
|
20
javascript/dist/InlineFormAction.js
vendored
20
javascript/dist/InlineFormAction.js
vendored
@ -13,16 +13,30 @@
|
|||||||
})(this, function () {
|
})(this, function () {
|
||||||
'use strict';
|
'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({
|
Behaviour.register({
|
||||||
'div.inlineformaction input#$ID': {
|
'div.inlineformaction input#$ID': {
|
||||||
onclick: function onclick() {
|
onclick: function onclick() {
|
||||||
var url = jQuery('base').attr('href') + 'admin-custom/' + this.name.substring(7) + '?ID=' + document.getElementById('Form_EditForm_ID').value + '&ajax=1';
|
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,
|
'url': url,
|
||||||
success: Ajax.Evaluator,
|
|
||||||
success: Ajax.Evaluator
|
success: Ajax.Evaluator
|
||||||
});
|
}, 'success', Ajax.Evaluator));
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user