Merge branch 'develop'

spring-raining · May 13, 2016 · 67a4633 · 67a4633
2 parents 0ca49ee + e746f16
commit 67a4633
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "giraf",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Powerful & Free GIF Creator",
   "main": "main.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "babel-preset-react": "^6.5.0",
     "babelify": "^7.2.0",
     "bourbon": "^4.2.5",
-    "brace": "^0.7.0",
+    "brace": "^0.8.0",
     "brfs": "^1.4.3",
     "browserify": "^11.2.0",
     "decimal.js": "^4.0.3",
@@ -49,7 +49,7 @@
     "lodash": "^3.10.1",
     "mousetrap": "^1.5.3",
     "react": "^0.14.3",
-    "react-ace": "^3.1.0",
+    "react-ace": "^3.4.1",
     "react-addons-css-transition-group": "^0.14.3",
     "react-dom": "^0.14.3",
     "react-inlinesvg": "~0.4.2",

diff --git a/src/utils/saveFile.js b/src/utils/saveFile.js
@@ -8,6 +8,7 @@ export default (blob, filename) => {
   a.download = filename;
   a.href = url;
   evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+  a.dispatchEvent(evt);
 
   window.URL.revokeObjectURL(url);
 };
diff --git a/src/views/forms.jsx b/src/views/forms.jsx
@@ -14,6 +14,7 @@ import genUUID                    from "src/utils/genUUID";
 import "brace/mode/javascript";
 import "brace/theme/github";
 import "brace/theme/monokai";
+import "brace/ext/language_tools";
 
 
 const userAgent = new UAParser();
@@ -503,6 +504,8 @@ export const ScriptArea = React.createClass({
                    width={this.props.width}
                    height={this.props.height}
                    value={this.state.tmpValue}
+                   enableBasicAutocompletion={true}
+                   enableLiveAutocompletion={false}
                    onBlur={this._onBlur}
                    onChange={this._onChange}
                    name={this.state.editorID} />