glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into paring.down

Browse source
This commit is contained in:
Connor Turland 2016-08-10 17:16:33 +00:00
commit c308e276e8
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/src/Metamaps.Import.js
View file

@ -29,6 +29,7 @@ Metamaps.Import = {
$('body').bind('paste', function (e) { $('body').bind('paste', function (e) {
if (e.target.tagName === 'INPUT') return if (e.target.tagName === 'INPUT') return
if (e.target.tagName === 'TEXTAREA') return
var text = e.originalEvent.clipboardData.getData('text/plain') var text = e.originalEvent.clipboardData.getData('text/plain')

5
webpack.config.js
View file

@ -3,6 +3,11 @@ const webpack = 'webpack'
const config = module.exports = { const config = module.exports = {
context: __dirname, context: __dirname,
plugins: [
new webpack.DefinePlugin({
"process.env.NODE_ENV": `"${process.env.NODE_ENV || 'development'}"`
})
],
module: { module: {
loaders: [ loaders: [
{ {