You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/08/12 18:52:22 UTC
git commit: updated refs/heads/master to 891a901
Updated Branches:
refs/heads/master 080f4cf0f -> 891a90159
Fauxton: fix paginate and double jshint
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/891a9015
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/891a9015
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/891a9015
Branch: refs/heads/master
Commit: 891a90159f69b2d800088a1caca164975e3939c1
Parents: 080f4cf
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Aug 12 15:13:36 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Aug 12 15:13:36 2013 +0200
----------------------------------------------------------------------
src/fauxton/Gruntfile.js | 8 ++++----
src/fauxton/app/modules/fauxton/base.js | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/891a9015/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index a0c2232..9cb7e2e 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -378,7 +378,7 @@ module.exports = function(grunt) {
grunt.registerTask('lint', ['clean', 'jshint']);
grunt.registerTask('test', ['lint', 'mochaSetup', 'mocha_phantomjs']);
// Fetch dependencies (from git or local dir), lint them and make load_addons
- grunt.registerTask('dependencies', ['get_deps', 'jshint', 'gen_load_addons:default']);
+ grunt.registerTask('dependencies', ['get_deps', 'gen_load_addons:default']);
// 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.
@@ -391,11 +391,11 @@ module.exports = function(grunt) {
grunt.registerTask('dev', ['debugDev', 'couchserver']);
// build a debug release
grunt.registerTask('debug', ['lint', 'dependencies', 'concat:requirejs','less', 'concat:index_css', 'template:development', 'copy:debug']);
- grunt.registerTask('debugDev', ['lint', 'dependencies', 'less', 'concat:index_css', 'template:development', 'copy:debug']);
+ grunt.registerTask('debugDev', ['clean', 'dependencies','jshint','less', 'concat:index_css', 'template:development', 'copy:debug']);
- grunt.registerTask('watchRun', ['clean:watch', 'dependencies']);
+ grunt.registerTask('watchRun', ['clean:watch', 'dependencies', 'jshint']);
// build a release
- grunt.registerTask('release', ['lint' ,'dependencies', 'build', 'minify', 'copy:dist']);
+ grunt.registerTask('release', ['clean' ,'dependencies','jshint', 'build', 'minify', 'copy:dist']);
/*
* Install into CouchDB in either debug, release, or couchapp mode
http://git-wip-us.apache.org/repos/asf/couchdb/blob/891a9015/src/fauxton/app/modules/fauxton/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/fauxton/base.js b/src/fauxton/app/modules/fauxton/base.js
index a8f2032..ea5f3ec 100644
--- a/src/fauxton/app/modules/fauxton/base.js
+++ b/src/fauxton/app/modules/fauxton/base.js
@@ -238,12 +238,11 @@ function(app, Backbone, resizeColumns) {
template: "templates/fauxton/pagination",
initialize: function(options) {
- this.page = options.page;
+ this.page = parseInt(options.page, 10);
this.perPage = options.perPage;
this.total = options.total;
this.totalPages = Math.ceil(this.total / this.perPage);
this.urlFun = options.urlFun;
-
},
serialize: function() {