From d9f2a6e8a85b1eb4e6af8ea752ffd19e9d2a4b47 Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Thu, 17 Dec 2015 04:34:21 -0800 Subject: [PATCH] Bug 1232290 - Package codemirror with the same layout than in source tree. r=jlongster --- devtools/client/jar.mn | 36 +++++++++---------- devtools/client/sourceeditor/autocomplete.js | 4 +-- devtools/client/sourceeditor/editor.js | 32 ++++++++--------- .../test/codemirror/codemirror.html | 12 +++---- .../test/codemirror/vimemacs.html | 12 +++---- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index a4f60e52db64..118fb2143a67 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -39,24 +39,24 @@ devtools.jar: 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/comment/comment.js (sourceeditor/codemirror/addon/comment/comment.js) - content/sourceeditor/codemirror/edit/trailingspace.js (sourceeditor/codemirror/addon/edit/trailingspace.js) - content/sourceeditor/codemirror/edit/matchbrackets.js (sourceeditor/codemirror/addon/edit/matchbrackets.js) - content/sourceeditor/codemirror/edit/closebrackets.js (sourceeditor/codemirror/addon/edit/closebrackets.js) - content/sourceeditor/codemirror/dialog/dialog.js (sourceeditor/codemirror/addon/dialog/dialog.js) - content/sourceeditor/codemirror/dialog/dialog.css (sourceeditor/codemirror/addon/dialog/dialog.css) - content/sourceeditor/codemirror/fold/foldcode.js (sourceeditor/codemirror/addon/fold/foldcode.js) - content/sourceeditor/codemirror/fold/brace-fold.js (sourceeditor/codemirror/addon/fold/brace-fold.js) - content/sourceeditor/codemirror/fold/comment-fold.js (sourceeditor/codemirror/addon/fold/comment-fold.js) - content/sourceeditor/codemirror/fold/xml-fold.js (sourceeditor/codemirror/addon/fold/xml-fold.js) - content/sourceeditor/codemirror/fold/foldgutter.js (sourceeditor/codemirror/addon/fold/foldgutter.js) - content/sourceeditor/codemirror/hint/show-hint.js (sourceeditor/codemirror/addon/hint/show-hint.js) - content/sourceeditor/codemirror/search/search.js (sourceeditor/codemirror/addon/search/search.js) - content/sourceeditor/codemirror/search/searchcursor.js (sourceeditor/codemirror/addon/search/searchcursor.js) - content/sourceeditor/codemirror/selection/active-line.js (sourceeditor/codemirror/addon/selection/active-line.js) - content/sourceeditor/codemirror/tern/tern.js (sourceeditor/codemirror/addon/tern/tern.js) - content/sourceeditor/codemirror/codemirror.js (sourceeditor/codemirror/lib/codemirror.js) - content/sourceeditor/codemirror/codemirror.css (sourceeditor/codemirror/lib/codemirror.css) + content/sourceeditor/codemirror/addon/comment/comment.js (sourceeditor/codemirror/addon/comment/comment.js) + content/sourceeditor/codemirror/addon/edit/trailingspace.js (sourceeditor/codemirror/addon/edit/trailingspace.js) + content/sourceeditor/codemirror/addon/edit/matchbrackets.js (sourceeditor/codemirror/addon/edit/matchbrackets.js) + content/sourceeditor/codemirror/addon/edit/closebrackets.js (sourceeditor/codemirror/addon/edit/closebrackets.js) + content/sourceeditor/codemirror/addon/dialog/dialog.js (sourceeditor/codemirror/addon/dialog/dialog.js) + content/sourceeditor/codemirror/addon/dialog/dialog.css (sourceeditor/codemirror/addon/dialog/dialog.css) + content/sourceeditor/codemirror/addon/fold/foldcode.js (sourceeditor/codemirror/addon/fold/foldcode.js) + content/sourceeditor/codemirror/addon/fold/brace-fold.js (sourceeditor/codemirror/addon/fold/brace-fold.js) + content/sourceeditor/codemirror/addon/fold/comment-fold.js (sourceeditor/codemirror/addon/fold/comment-fold.js) + content/sourceeditor/codemirror/addon/fold/xml-fold.js (sourceeditor/codemirror/addon/fold/xml-fold.js) + content/sourceeditor/codemirror/addon/fold/foldgutter.js (sourceeditor/codemirror/addon/fold/foldgutter.js) + content/sourceeditor/codemirror/addon/hint/show-hint.js (sourceeditor/codemirror/addon/hint/show-hint.js) + content/sourceeditor/codemirror/addon/search/search.js (sourceeditor/codemirror/addon/search/search.js) + content/sourceeditor/codemirror/addon/search/searchcursor.js (sourceeditor/codemirror/addon/search/searchcursor.js) + content/sourceeditor/codemirror/addon/selection/active-line.js (sourceeditor/codemirror/addon/selection/active-line.js) + content/sourceeditor/codemirror/addon/tern/tern.js (sourceeditor/codemirror/addon/tern/tern.js) + content/sourceeditor/codemirror/lib/codemirror.js (sourceeditor/codemirror/lib/codemirror.js) + content/sourceeditor/codemirror/lib/codemirror.css (sourceeditor/codemirror/lib/codemirror.css) content/sourceeditor/codemirror/mode/javascript.js (sourceeditor/codemirror/mode/javascript.js) content/sourceeditor/codemirror/mode/xml.js (sourceeditor/codemirror/mode/xml.js) content/sourceeditor/codemirror/mode/css.js (sourceeditor/codemirror/mode/css.js) diff --git a/devtools/client/sourceeditor/autocomplete.js b/devtools/client/sourceeditor/autocomplete.js index 4827268c65c9..cebc9372e1b7 100644 --- a/devtools/client/sourceeditor/autocomplete.js +++ b/devtools/client/sourceeditor/autocomplete.js @@ -8,8 +8,8 @@ const cssAutoCompleter = require("devtools/client/sourceeditor/css-autocompleter const { AutocompletePopup } = require("devtools/client/shared/autocomplete-popup"); const CM_TERN_SCRIPTS = [ - "chrome://devtools/content/sourceeditor/codemirror/tern/tern.js", - "chrome://devtools/content/sourceeditor/codemirror/hint/show-hint.js" + "chrome://devtools/content/sourceeditor/codemirror/addon/tern/tern.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/hint/show-hint.js" ]; const autocompleteMap = new WeakMap(); diff --git a/devtools/client/sourceeditor/editor.js b/devtools/client/sourceeditor/editor.js index c3274891b708..592fc003a069 100644 --- a/devtools/client/sourceeditor/editor.js +++ b/devtools/client/sourceeditor/editor.js @@ -47,35 +47,35 @@ const { OS } = Services.appinfo; const CM_STYLES = [ "chrome://devtools/skin/common.css", - "chrome://devtools/content/sourceeditor/codemirror/codemirror.css", - "chrome://devtools/content/sourceeditor/codemirror/dialog/dialog.css", + "chrome://devtools/content/sourceeditor/codemirror/lib/codemirror.css", + "chrome://devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css", "chrome://devtools/content/sourceeditor/codemirror/mozilla.css" ]; const CM_SCRIPTS = [ "chrome://devtools/content/shared/theme-switching.js", - "chrome://devtools/content/sourceeditor/codemirror/codemirror.js", - "chrome://devtools/content/sourceeditor/codemirror/dialog/dialog.js", - "chrome://devtools/content/sourceeditor/codemirror/search/searchcursor.js", - "chrome://devtools/content/sourceeditor/codemirror/search/search.js", - "chrome://devtools/content/sourceeditor/codemirror/edit/matchbrackets.js", - "chrome://devtools/content/sourceeditor/codemirror/edit/closebrackets.js", - "chrome://devtools/content/sourceeditor/codemirror/comment/comment.js", + "chrome://devtools/content/sourceeditor/codemirror/lib/codemirror.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/dialog/dialog.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/search/searchcursor.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/search/search.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/edit/matchbrackets.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/edit/closebrackets.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/comment/comment.js", "chrome://devtools/content/sourceeditor/codemirror/mode/javascript.js", "chrome://devtools/content/sourceeditor/codemirror/mode/xml.js", "chrome://devtools/content/sourceeditor/codemirror/mode/css.js", "chrome://devtools/content/sourceeditor/codemirror/mode/htmlmixed.js", "chrome://devtools/content/sourceeditor/codemirror/mode/clike.js", - "chrome://devtools/content/sourceeditor/codemirror/selection/active-line.js", - "chrome://devtools/content/sourceeditor/codemirror/edit/trailingspace.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/selection/active-line.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/edit/trailingspace.js", "chrome://devtools/content/sourceeditor/codemirror/keymap/emacs.js", "chrome://devtools/content/sourceeditor/codemirror/keymap/vim.js", "chrome://devtools/content/sourceeditor/codemirror/keymap/sublime.js", - "chrome://devtools/content/sourceeditor/codemirror/fold/foldcode.js", - "chrome://devtools/content/sourceeditor/codemirror/fold/brace-fold.js", - "chrome://devtools/content/sourceeditor/codemirror/fold/comment-fold.js", - "chrome://devtools/content/sourceeditor/codemirror/fold/xml-fold.js", - "chrome://devtools/content/sourceeditor/codemirror/fold/foldgutter.js" + "chrome://devtools/content/sourceeditor/codemirror/addon/fold/foldcode.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/fold/brace-fold.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/fold/comment-fold.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/fold/xml-fold.js", + "chrome://devtools/content/sourceeditor/codemirror/addon/fold/foldgutter.js" ]; const CM_IFRAME = diff --git a/devtools/client/sourceeditor/test/codemirror/codemirror.html b/devtools/client/sourceeditor/test/codemirror/codemirror.html index a8bdebd8dd62..7449f1ce524c 100644 --- a/devtools/client/sourceeditor/test/codemirror/codemirror.html +++ b/devtools/client/sourceeditor/test/codemirror/codemirror.html @@ -3,15 +3,15 @@ CodeMirror: Basic Tests - + - - - - - + + + + + diff --git a/devtools/client/sourceeditor/test/codemirror/vimemacs.html b/devtools/client/sourceeditor/test/codemirror/vimemacs.html index 0c39d90bc794..e3d9ff393107 100644 --- a/devtools/client/sourceeditor/test/codemirror/vimemacs.html +++ b/devtools/client/sourceeditor/test/codemirror/vimemacs.html @@ -3,15 +3,15 @@ CodeMirror: VIM/Emacs tests - + - - - - - + + + + +