couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject git commit: updated refs/heads/master to fb98bbc
Date Thu, 21 Nov 2013 15:42:34 GMT
Updated Branches:
  refs/heads/master 186846e6e -> fb98bbcd1


Add ace javascript for release mode and fix new view bug


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fb98bbcd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fb98bbcd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fb98bbcd

Branch: refs/heads/master
Commit: fb98bbcd1c0dd5e39beb2c40b70c97da188ca612
Parents: 186846e
Author: Garren Smith <garren.smith@gmail.com>
Authored: Thu Nov 21 17:42:06 2013 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Thu Nov 21 17:42:06 2013 +0200

----------------------------------------------------------------------
 src/fauxton/Gruntfile.js                   | 9 +++------
 src/fauxton/app/modules/documents/views.js | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/fb98bbcd/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 94fbf2d..42e5e17 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

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fb98bbcd/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 1e426f8..676574f 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);
       } 
 
     }


Mime
View raw message