Bug 1304262 - Codemirror dialog does not work in inspector and scratchpad. r=gl, a=gchang
authorFred Lin <gasolin@mozilla.com>
Thu, 22 Sep 2016 11:34:20 +0800
changeset 355754 0f50f2ef1ee1f2d323ef407f3ff074b038644327
parent 355753 ee1b7429ed13fbbdccfa7e22d9dc1d314cbead85
child 355755 57257bd35a87af27775217e6b722db268deb9d4f
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgl, gchang
bugs1304262
milestone51.0a2
Bug 1304262 - Codemirror dialog does not work in inspector and scratchpad. r=gl, a=gchang MozReview-Commit-ID: 4JJu8mr9IpI
devtools/client/.babelrc
devtools/client/jar.mn
devtools/client/package.json
deleted file mode 100644
--- a/devtools/client/.babelrc
+++ /dev/null
@@ -1,1 +0,0 @@
- { "presets": [ "es2015" ] }
\ No newline at end of file
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -25,16 +25,17 @@ devtools.jar:
     content/shared/frame-script-utils.js (shared/frame-script-utils.js)
     content/styleeditor/styleeditor.xul (styleeditor/styleeditor.xul)
     content/storage/storage.xul (storage/storage.xul)
     content/inspector/fonts/fonts.js (inspector/fonts/fonts.js)
     content/inspector/markup/markup.xhtml (inspector/markup/markup.xhtml)
     content/animationinspector/animation-controller.js (animationinspector/animation-controller.js)
     content/animationinspector/animation-panel.js (animationinspector/animation-panel.js)
     content/animationinspector/animation-inspector.xhtml (animationinspector/animation-inspector.xhtml)
+    content/sourceeditor/codemirror/addon/dialog/dialog.css (sourceeditor/codemirror/addon/dialog/dialog.css)
     content/sourceeditor/codemirror/addon/hint/show-hint.js (sourceeditor/codemirror/addon/hint/show-hint.js)
     content/sourceeditor/codemirror/addon/tern/tern.js (sourceeditor/codemirror/addon/tern/tern.js)
     content/sourceeditor/codemirror/codemirror.bundle.js (sourceeditor/codemirror/codemirror.bundle.js)
     content/sourceeditor/codemirror/lib/codemirror.css (sourceeditor/codemirror/lib/codemirror.css)
     content/sourceeditor/codemirror/mozilla.css (sourceeditor/codemirror/mozilla.css)
     content/debugger/new/index.html (debugger/new/index.html)
     content/debugger/new/images/angle-brackets.svg (debugger/new/images/angle-brackets.svg)
     content/debugger/new/images/arrow.svg (debugger/new/images/arrow.svg)
--- a/devtools/client/package.json
+++ b/devtools/client/package.json
@@ -1,16 +1,19 @@
 {
   "name": "devtools",
   "version": "0.1",
   "description": "",
   "main": "",
   "scripts": {
     "build": "webpack"
   },
+  "babel":  {
+    "presets": [ "es2015" ]
+  },
   "author": "",
   "license": "",
   "devDependencies": {
     "babel-core": "^6.11.4",
     "babel-loader": "^6.2.4",
     "babel-preset-es2015": "^6.9.0",
     "raw-loader": "^0.5.1",
     "webpack": "^1.13.1"