scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-27 09:13:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

tweak tweak

Browse source
This commit is contained in:
zmagod 2017-10-11 15:20:03 +02:00
parent 9e2b589e4b
commit abe0b8adcc
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.babelrc
View file

@ -5,7 +5,7 @@
{ {
"modules": false, "modules": false,
"targets": { "targets": {
"browsers": "last 2 versions", "browsers": ["last 2 versions"],
"uglify": true "uglify": true
}, },
"useBuiltIns": true "useBuiltIns": true
@ -29,9 +29,6 @@
"env": { "env": {
"test": { "test": {
"plugins": ["transform-es2015-modules-commonjs"] "plugins": ["transform-es2015-modules-commonjs"]
},
"development": {
"plugins": ["transform-es2015-modules-commonjs"]
} }
} }
} }

1
app/javascript/src/scenes/SettingsPage/scenes/profile/components/InputEnabled.jsx
View file

@ -343,6 +343,7 @@ class InputEnabled extends Component {
if (inputType === "file") { if (inputType === "file") {
return ( return (
<FormControl <FormControl
id="user_avatar"
type={this.props.inputType} type={this.props.inputType}
onChange={this.handleChange} onChange={this.handleChange}
onKeyPress={this.handleKeyPress} onKeyPress={this.handleKeyPress}

15
features/support/env.rb
View file

@ -10,13 +10,20 @@ require 'capybara/poltergeist'
require 'simplecov' require 'simplecov'
Capybara.register_driver :poltergeist do |app| Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, Capybara::Poltergeist::Driver.new(
js_errors: true, app,
phantomjs: Phantomjs.path) js_errors: true,
phantomjs_options: ['--ignore-ssl-errors=yes', '--ssl-protocol=any'],
debug: true,
timeout: 500,
phantomjs: File.absolute_path(Phantomjs.path)
)
end end
Capybara.javascript_driver = :poltergeist Capybara.javascript_driver = :poltergeist
Capybara.default_max_wait_time = 5
Capybara.server_port = 3001
# Capybara defaults to CSS3 selectors rather than XPath. # Capybara defaults to CSS3 selectors rather than XPath.
# If you'd prefer to use XPath, just uncomment this line and adjust any # If you'd prefer to use XPath, just uncomment this line and adjust any
# selectors in your step definitions to use the XPath syntax. # selectors in your step definitions to use the XPath syntax.