diff options
| author | Garren Smith <garren.smith@gmail.com> | 2013-11-21 17:42:06 +0200 |
|---|---|---|
| committer | Garren Smith <garren.smith@gmail.com> | 2013-11-21 17:42:06 +0200 |
| commit | fb98bbcd1c0dd5e39beb2c40b70c97da188ca612 (patch) | |
| tree | 4ed2fcb9b9e7546d3646ccf19937aa0f7d475824 | |
| parent | 186846e6e66a0053d0c823fd80c498757d7a1828 (diff) | |
| download | couchdb-fb98bbcd1c0dd5e39beb2c40b70c97da188ca612.tar.gz | |
Add ace javascript for release mode and fix new view bug
| -rw-r--r-- | src/fauxton/Gruntfile.js | 9 | ||||
| -rw-r--r-- | src/fauxton/app/modules/documents/views.js | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 94fbf2d2c..42e5e17aa 100644 --- a/src/fauxton/Gruntfile.js +++ b/src/fauxton/Gruntfile.js @@ -186,11 +186,6 @@ module.exports = function(grunt) { src: ["dist/debug/templates.js", "test/test.config.js"], dest: 'test/test.config.js' }, - - boom: { - dest: "dist/release/js/require.js", - src: "dist/debug/js/require.js" - } }, cssmin: { @@ -301,6 +296,8 @@ module.exports = function(grunt) { {src: "assets/js/libs/ace/worker-json.js", dest: "dist/release/js/ace/worker-json.js"}, {src: "assets/js/libs/ace/mode-json.js", dest: "dist/release/js/ace/mode-json.js"}, {src: "assets/js/libs/ace/theme-crimson_editor.js", dest: "dist/release/js/ace/theme-crimson_editor.js"}, + {src: "assets/js/libs/ace/mode-javascript.js", dest: "dist/release/js/ace/mode-javascript.js"}, + {src: "assets/js/libs/ace/worker-javascript.js", dest: "dist/release/js/ace/worker-javascript.js"}, ] }, @@ -406,7 +403,7 @@ module.exports = function(grunt) { // build templates, js and css grunt.registerTask('build', ['less', 'concat:index_css', 'jst', 'requirejs', 'concat:requirejs', 'template:release']); // minify code and css, ready for release. - grunt.registerTask('minify', ['concat:boom', 'cssmin:compress']); + grunt.registerTask('minify', ['uglify', 'cssmin:compress']); /* * Build the app in either dev, debug, or release mode diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js index 1e426f82b..676574f0f 100644 --- a/src/fauxton/app/modules/documents/views.js +++ b/src/fauxton/app/modules/documents/views.js @@ -1477,7 +1477,8 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, resizeColumns) { if (this.newView) { this.mapEditor.setValue(this.langTemplates[this.defaultLang].map); - this.reduceEditor.setValue(this.langTemplates[this.defaultLang].reduce); + //Use a built in view by default + //this.reduceEditor.setValue(this.langTemplates[this.defaultLang].reduce); } } |