Merge branch 'master' of github.com:keystonejs/keystone

Author: JedWatson

admin/public/styles/react/react.less

@@ -37,3 +37,6 @@
 @import "@{reactSelectPath}/less/select.less";
 
 @import "../../../../fields/types/markdown/less/bootstrap-markdown.less";
+
+/* The path to keystone-tinymce is dynamically detected by KeystoneJS */
+@import "@{keystoneTinymcePath}/skin/skin.less";

admin/server/app/createDynamicRouter.js

@@ -26,6 +26,14 @@ module.exports = function createDynamicRouter (keystone) {
 		next();
 	});
 
+	// Pre adminroutes middleware
+	if (typeof keystone.get('pre:adminroutes') === 'function') {
+		keystone.get('pre:adminroutes')(router);
+	}
+	router.use(function (req, res, next) {
+		keystone.callHook('pre:adminroutes', req, res, next);
+	});
+
 	if (keystone.get('healthchecks')) {
 		router.use('/server-health', require('./createHealthchecksHandler')(keystone));
 	}

admin/server/app/createStaticRouter.js

@@ -69,13 +69,16 @@ module.exports = function createStaticRouter (keystone) {
 	/* Prepare LESS options */
 	var elementalPath = path.join(path.dirname(require.resolve('elemental')), '..');
 	var reactSelectPath = path.join(path.dirname(require.resolve('react-select')), '..');
+	var keystoneTinymcePath = path.dirname(require.resolve('keystone-tinymce'));
 	var customStylesPath = keystone.getPath('adminui custom styles') || '';
 
 	var lessOptions = {
 		render: {
+			javascriptEnabled: true,
 			modifyVars: {
 				elementalPath: JSON.stringify(elementalPath),
 				reactSelectPath: JSON.stringify(reactSelectPath),
+				keystoneTinymcePath: JSON.stringify(keystoneTinymcePath),
 				customStylesPath: JSON.stringify(customStylesPath),
 				adminPath: JSON.stringify(keystone.get('admin path')),
 			},
@@ -84,13 +87,12 @@ module.exports = function createStaticRouter (keystone) {
 
 	/* Configure router */
 	router.use('/styles', less(path.resolve(__dirname + '/../../public/styles'), lessOptions));
-	router.use('/styles/fonts', express.static(path.resolve(__dirname + '/../../public/js/lib/tinymce/skins/keystone/fonts')));
+	router.use('/styles/fonts', express.static(`${keystoneTinymcePath}/skin/fonts`));
 	router.get('/js/fields.js', bundles.fields.serve);
 	router.get('/js/signin.js', bundles.signin.serve);
 	router.get('/js/admin.js', bundles.admin.serve);
-	var keystone_tinymce = path.dirname(require.resolve('keystone-tinymce'));
-	router.use('/js/lib/tinymce/skins/keystone', express.static(`${keystone_tinymce}/skin`));
-	router.use('/js/lib/tinymce/plugins/uploadimage', express.static(`${keystone_tinymce}/plugins/uploadimage`));
+	router.use('/js/lib/tinymce/skins/keystone', express.static(`${keystoneTinymcePath}/skin`));
+	router.use('/js/lib/tinymce/plugins/uploadimage', express.static(`${keystoneTinymcePath}/plugins/uploadimage`));
 	router.use('/js/lib/tinymce', express.static(path.dirname(require.resolve('tinymce'))));
 	router.use(express.static(path.resolve(__dirname + '/../../public')));
 

docs/api/Methods/middleware.md

@@ -14,7 +14,8 @@ name | call time
 `pre:logger` |
 `pre:bodyparser` |
 `pre:session` |
-`pre:admin` |	Installs Express middleware which is called before each Keystone admin UI route is executed. (i.e. routes starting with `/keystone`)
+`pre:admin` |	Installs Express middleware which is called before a Keystone admin UI route is executed. (i.e. routes starting with `/keystone`)
+`pre:adminroutes` | Installs Express middleware which is called before the route handlers in the admin UI are executed (i.e. after the admin UI-specific middleware is configured but before routes are matched)
 `pre:routes` | Installs Express middleware which is called before each developer defined route is executed. (i.e. the routes you define besides the `/keystone` generated ones)
 `pre:render` | Called before a Keystone [view](/api/view) is rendered.
 `updates` |

fields/types/url/UrlField.js

@@ -35,11 +35,9 @@ module.exports = Field.create({
 		const { value } = this.props;
 		return (
 			<div>
-				<FormInput
-					noedit
-					onClick={value && this.openValue}
-					value={value}
-				/>
+				<FormInput noedit onClick={value && this.openValue}>
+					{value}
+				</FormInput>
 				{ this.renderThumb() }
 			</div>
 		);

index.js

@@ -22,7 +22,7 @@ var moduleRoot = (function (_rootPath) {
  * Keystone Class
  */
 var Keystone = function () {
-	grappling.mixin(this).allowHooks('pre:static', 'pre:bodyparser', 'pre:session', 'pre:logger', 'pre:admin', 'pre:routes', 'pre:render', 'updates', 'signin', 'signout');
+	grappling.mixin(this).allowHooks('pre:static', 'pre:bodyparser', 'pre:session', 'pre:logger', 'pre:admin', 'pre:adminroutes', 'pre:routes', 'pre:render', 'updates', 'signin', 'signout');
 	this.lists = {};
 	this.fieldTypes = {};
 	this.paths = {};