Updated Branches: refs/heads/master 4f6198336 -> 2430c7bc7
Cleanup of paths for when we removed CodeMirror & added ace. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2430c7bc Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2430c7bc Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2430c7bc Branch: refs/heads/master Commit: 2430c7bc7240d01c6e736c71be419fdf0a9a0724 Parents: 4f61983 Author: suelockwood <[email protected]> Authored: Thu Nov 7 15:48:15 2013 -0500 Committer: suelockwood <[email protected]> Committed: Thu Nov 7 15:48:15 2013 -0500 ---------------------------------------------------------------------- src/Makefile.am | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/2430c7bc/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index e74637e..03896f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -159,14 +159,12 @@ FAUXTON_FILES = \ fauxton/app/templates/fauxton/nav_bar.html \ fauxton/app/templates/fauxton/notification.html \ fauxton/app/templates/fauxton/pagination.html \ - fauxton/app/templates/layouts/login_pane.html \ fauxton/app/templates/layouts/one_pane.html \ fauxton/app/templates/layouts/two_pane.html \ fauxton/app/templates/layouts/with_right_sidebar.html \ fauxton/app/templates/layouts/with_sidebar.html \ fauxton/app/templates/layouts/with_tabs.html \ fauxton/app/templates/layouts/with_tabs_sidebar.html \ - fauxton/assets/css/codemirror.css \ fauxton/assets/css/nv.d3.css \ fauxton/assets/img/couchdb-site.png \ fauxton/assets/img/couchdblogo.png \ @@ -185,10 +183,36 @@ FAUXTON_FILES = \ fauxton/assets/img/loader.gif \ fauxton/assets/img/minilogo.png \ fauxton/assets/index.underscore \ + fauxton/assets/js/libs/ace/ace.js \ + fauxton/assets/js/libs/ace/ext-static_highlight.js \ + fauxton/assets/js/libs/ace/ext-chromevox.js \ + fauxton/assets/js/libs/ace/ext-statusbar.js \ + fauxton/assets/js/libs/ace/ext-elastic_tabstops_lite.js \ + fauxton/assets/js/libs/ace/ext-textarea.js \ + fauxton/assets/js/libs/ace/ext-emmet.js \ + fauxton/assets/js/libs/ace/ext-themelist.js \ + fauxton/assets/js/libs/ace/ext-keybinding_menu.js \ + fauxton/assets/js/libs/ace/ext-whitespace.js \ + fauxton/assets/js/libs/ace/ext-language_tools.js \ + fauxton/assets/js/libs/ace/mode-javascript.js \ + fauxton/assets/js/libs/ace/ext-modelist.js \ + fauxton/assets/js/libs/ace/mode-json.js \ + fauxton/assets/js/libs/ace/ext-old_ie.js \ + fauxton/assets/js/libs/ace/mode-jsoniq.js \ + fauxton/assets/js/libs/ace/ext-options.js \ + fauxton/assets/js/libs/ace/ext-searchbox.js \ + fauxton/assets/js/libs/ace/theme-crimson_editor.js \ + fauxton/assets/js/libs/ace/ext-settings_menu.js \ + fauxton/assets/js/libs/ace/worker-javascript.js \ + fauxton/assets/js/libs/ace/ext-spellcheck.js \ + fauxton/assets/js/libs/ace/worker-json.js \ + fauxton/assets/js/libs/ace/ext-split.js \ + fauxton/assets/js/libs/ace/snippets/javascript.js \ + fauxton/assets/js/libs/ace/snippets/json.js \ + fauxton/assets/js/libs/ace/snippets/jsoniq.js \ fauxton/assets/js/libs/almond.js \ fauxton/assets/js/libs/backbone.js \ fauxton/assets/js/libs/bootstrap.js \ - fauxton/assets/js/libs/codemirror.js \ fauxton/assets/js/libs/d3.js \ fauxton/assets/js/libs/jquery.js \ fauxton/assets/js/libs/jshint.js \ @@ -197,7 +221,6 @@ FAUXTON_FILES = \ fauxton/assets/js/libs/require.js \ fauxton/assets/js/libs/spin.min.js \ fauxton/assets/js/plugins/backbone.layoutmanager.js \ - fauxton/assets/js/plugins/codemirror-javascript.js \ fauxton/assets/js/plugins/jquery.form.js \ fauxton/assets/js/plugins/prettify.js \ fauxton/assets/less/bootstrap/accordion.less \
