aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-03-03 14:24:59 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-03-03 14:24:59 +0900
commit5010f137d2c266b00626da89effd6edc9469d60e (patch)
treef0846fd5da6dd5f4c526955c9d3205d81f46ef4c
parentc946f04a83f5d97c0d0c1d455def57a8a22cee32 (diff)
downloadpoe-5010f137d2c266b00626da89effd6edc9469d60e.tar.gz
use brace instead of ace-builds
-rw-r--r--frontend/app/editor.component.ts4
-rw-r--r--frontend/bootstrap.js7
-rw-r--r--frontend/package.json3
3 files changed, 5 insertions, 9 deletions
diff --git a/frontend/app/editor.component.ts b/frontend/app/editor.component.ts
index 260f5eb..35590d9 100644
--- a/frontend/app/editor.component.ts
+++ b/frontend/app/editor.component.ts
@@ -1,6 +1,8 @@
import {Component, OnInit, ElementRef, Input, Output, EventEmitter} from "angular2/core";
import {EditingData, EditingDataService} from "./editing-data.service";
-import "ace/ace";
+import "brace";
+import "brace/mode/php";
+import "brace/mode/ruby";
@Component({
selector: "editor",
diff --git a/frontend/bootstrap.js b/frontend/bootstrap.js
index ca98d88..7034cef 100644
--- a/frontend/bootstrap.js
+++ b/frontend/bootstrap.js
@@ -9,7 +9,6 @@ var xcb = function() {
defaultJSExtensions: true,
paths: {
"*": "./node_modules/*",
- "ace/*": "./node_modules/ace-builds/src/*",
"app/*": "./app/*",
},
bundles: {
@@ -19,12 +18,6 @@ var xcb = function() {
"rxjs/bundles/Rx": ["rxjs/*"],
},
packageConfigPaths: ["./node_modules/*/package.json"],
- meta: {
- "ace-builds/src/ace.js": {
- format: "global",
- exports: "ace",
- }
- }
});
}
diff --git a/frontend/package.json b/frontend/package.json
index a03054b..6279099 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,8 +11,9 @@
"postinstall": "typings install"
},
"dependencies": {
- "ace-builds": "git+https://github.com/ajaxorg/ace-builds.git#master",
"angular2": "2.0.0-beta.7",
+ "brace": "^0.7.0",
+ "buffer": "^4.5.0",
"es6-promise": "^3.0.2",
"es6-shim": "^0.33.3",
"reflect-metadata": "0.1.2",