Skip to content

Commit

Permalink
Merge pull request #81 from alexnavratil/master
Browse files Browse the repository at this point in the history
fix not working in IE11
  • Loading branch information
ivictbor authored Jan 24, 2020
2 parents 5d20f75 + 65e7dfd commit 3cb995d
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 21 deletions.
3 changes: 3 additions & 0 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import Inserter from './inserter';
import Settings from './settings';
import ControlBuilder from './controlbuilder';

require('es6-promise').polyfill();
require('string.prototype.repeat');

class PainterroProc {
constructor(params) {
addDocumentObjectHelpers();
Expand Down
84 changes: 68 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "painterro",
"version": "1.0.29",
"version": "1.0.29.1",
"description": "HTML5 image editor widget",
"main": "build/painterro.commonjs2.js",
"repository": {
"type": "git",
"url": "https://github.com/devforth/painterro"
},
"scripts": {
"prepare": "npm run build",
"test": "echo \"Error: no test specified\" && exit 1",
"build": "webpack --optimize-minimize --progress",
"dev": "webpack-dev-server --inline --hot --content-base build/ --port 8081 --host 127.0.0.1",
Expand All @@ -24,13 +25,13 @@
"babel-core": "^6.24.1",
"babel-loader": "^7.0.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2016": "^6.24.1",
"css-loader": "^0.28.3",
"es6-promise": "^4.1.1",
"eslint": "^4.1.1",
"eslint-config-airbnb-base": "^11.2.0",
"eslint-loader": "^2.2.1",
"eslint-plugin-import": "^2.7.0",
"html2canvas": "^1.0.0-alpha.9",
"html2canvas": "^1.0.0-rc.5",
"icon-font-generator": "^2.1.10",
"ismobilejs": "^1.0.3",
"js-yaml": ">=3.13.1",
Expand All @@ -44,5 +45,8 @@
"webpack-cli": "^3.3.2",
"webpack-dev-server": "^3.8.1"
},
"dependencies": {}
"dependencies": {
"es6-promise": "^4.2.8",
"string.prototype.repeat": "^0.2.0"
}
}
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function webpackConfig(target) {
test: /\.js$/,
loader: 'babel-loader',
query: {
presets: ['es2015']
presets: ['es2015', 'es2016']
}
},
{
Expand Down

0 comments on commit 3cb995d

Please sign in to comment.