formatic
Advanced tools
Comparing version 1.2.1 to 1.2.2
@@ -162,7 +162,3 @@ 'use strict'; | ||
onFocusClick: function onFocusClick() { | ||
this.onFocusWrapper(true); | ||
}, | ||
onFocusWrapper: function onFocusWrapper(isFromClick) { | ||
onFocusWrapper: function onFocusWrapper() { | ||
var _this2 = this; | ||
@@ -173,12 +169,2 @@ | ||
_this2.codeMirror.setCursor(_this2.codeMirror.lineCount(), 0); | ||
}, function () { | ||
// If this is from a click, we lose focus, so force it focused! | ||
if (isFromClick) { | ||
setTimeout(function () { | ||
if (_this2.codeMirror && !_this2.codeMirror.state.focused) { | ||
_this2.codeMirror.focus(); | ||
_this2.codeMirror.setCursor(_this2.codeMirror.lineCount(), 0); | ||
} | ||
}, 0); | ||
} | ||
}); | ||
@@ -336,3 +322,3 @@ }, | ||
// of a focus click event | ||
, onFocus: this.onFocusClick, | ||
, onFocus: this.onFocusWrapper, | ||
role: 'textbox' | ||
@@ -557,3 +543,3 @@ }, | ||
switchToCodeMirror: function switchToCodeMirror(cb, alreadySwitchedCb) { | ||
switchToCodeMirror: function switchToCodeMirror(cb) { | ||
var _this6 = this; | ||
@@ -571,6 +557,2 @@ | ||
}); | ||
} else { | ||
if (_undash2.default.isFunction(alreadySwitchedCb)) { | ||
alreadySwitchedCb(); | ||
} | ||
} | ||
@@ -577,0 +559,0 @@ } |
{ | ||
"name": "formatic", | ||
"version": "1.2.1", | ||
"version": "1.2.2", | ||
"description": "Automatic, pluggable form generation", | ||
@@ -13,3 +13,3 @@ "main": "./build/lib/index.js", | ||
"lint": "zapier-scripts lint '__tests__/**/*.js' 'demo/**/*.js' 'lib/**/*.js' 'scripts/**/*.js' 'tasks/**/*.js' '*.js'", | ||
"live": "node server.js", | ||
"live": "webpack-dev-server", | ||
"patch-release": "npm version patch && npm publish && git push --follow-tags", | ||
@@ -20,3 +20,3 @@ "minor-release": "npm version minor && npm publish && git push --follow-tags", | ||
"prepublish": "npm run build", | ||
"start": "node server.js", | ||
"start": "webpack-dev-server", | ||
"test": "jest --no-cache" | ||
@@ -55,3 +55,2 @@ }, | ||
"open": "^0.0.5", | ||
"portscanner": "^2.1.1", | ||
"react": "^16.2.0", | ||
@@ -69,4 +68,5 @@ "react-bootstrap": "^0.31.5", | ||
"uglify-js": "^3.2.0", | ||
"webpack": "^3.9.1", | ||
"webpack-dev-server": "^2.9.5", | ||
"webpack": "^4.28.1", | ||
"webpack-cli": "^3.2.1", | ||
"webpack-dev-server": "^3.1.11", | ||
"zapier-scripts": "^3.0.1" | ||
@@ -73,0 +73,0 @@ }, |
@@ -7,2 +7,4 @@ /* global __dirname */ | ||
const publicPath = '/static'; | ||
module.exports = { | ||
@@ -18,5 +20,6 @@ devtool: 'source-map', | ||
filename: 'bundle.js', | ||
publicPath: '/static/', | ||
publicPath, | ||
}, | ||
plugins: [new webpack.HotModuleReplacementPlugin()], | ||
mode: 'development', | ||
module: { | ||
@@ -41,2 +44,9 @@ rules: [ | ||
}, | ||
devServer: { | ||
historyApiFallback: true, | ||
hot: true, | ||
open: true, | ||
openPage: 'demo/index.html', | ||
publicPath, | ||
}, | ||
}; |
Sorry, the diff of this file is too big to display
406270
80
11794