couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [2/6] fauxton commit: updated refs/heads/master to 42b9fa4
Date Mon, 19 Oct 2015 09:06:49 GMT
fix missing semicolons and style

PR: #560
PR-URL: https://github.com/apache/couchdb-fauxton/pull/560
Reviewed-By: Benjamin Keen <ben.keen@gmail.com>


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

Branch: refs/heads/master
Commit: 901d0060f7c1acff0b1b9cec50da4b6c157a36b1
Parents: 1468b1d
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Fri Oct 16 14:36:11 2015 +0200
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Mon Oct 19 11:05:39 2015 +0200

----------------------------------------------------------------------
 Gruntfile.js                                | 4 ++--
 app/addons/activetasks/routes.js            | 2 +-
 app/addons/documents/tests/resourcesSpec.js | 2 +-
 app/addons/replication/views.js             | 5 +++--
 couchapp.js                                 | 2 +-
 tasks/addon/template.js                     | 2 +-
 tasks/helper.js                             | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/901d0060/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index e9f36aa..b4cf7aa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -203,7 +203,7 @@ module.exports = function (grunt) {
     // index.html.
     concat: {
       requirejs: {
-        src: [ "assets/js/libs/require.js", "dist/debug/templates.js", "dist/debug/require.js"],
+        src: ["assets/js/libs/require.js", "dist/debug/templates.js", "dist/debug/require.js"],
         dest: "dist/debug/js/require.js"
       },
 
@@ -594,5 +594,5 @@ module.exports = function (grunt) {
    * Nightwatch functional testing
    */
   //Start Nightwatch test from terminal, using: $ grunt nightwatch
-  grunt.registerTask('nightwatch', [ 'exec:check_selenium', 'initNightwatch', 'exec:start_nightWatch']);
+  grunt.registerTask('nightwatch', ['exec:check_selenium', 'initNightwatch', 'exec:start_nightWatch']);
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/901d0060/app/addons/activetasks/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/activetasks/routes.js b/app/addons/activetasks/routes.js
index b03d54a..7352c72 100644
--- a/app/addons/activetasks/routes.js
+++ b/app/addons/activetasks/routes.js
@@ -33,7 +33,7 @@ function (app, FauxtonAPI, ActiveTasksResources, ActiveTasksComponents,
Actions)
     ],
     apiUrl: function () {
       var apiurl = window.location.origin + '/_active_tasks';
-      return [ apiurl, FauxtonAPI.constants.DOC_URLS.ACTIVE_TASKS];
+      return [apiurl, FauxtonAPI.constants.DOC_URLS.ACTIVE_TASKS];
     },
     roles: ['_admin'],
     initialize: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/901d0060/app/addons/documents/tests/resourcesSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/resourcesSpec.js b/app/addons/documents/tests/resourcesSpec.js
index e751266..e8b608d 100644
--- a/app/addons/documents/tests/resourcesSpec.js
+++ b/app/addons/documents/tests/resourcesSpec.js
@@ -296,7 +296,7 @@ define([
       });
 
       it('stringifies key', function () {
-        var params = {'key':[ 'a', 'b']};
+        var params = {'key':['a', 'b']};
         var result = Models.QueryParams.stringify(params);
 
         assert.deepEqual(result, { 'key': '[\"a\",\"b\"]' });

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/901d0060/app/addons/replication/views.js
----------------------------------------------------------------------
diff --git a/app/addons/replication/views.js b/app/addons/replication/views.js
index bcc6b69..81473c4 100644
--- a/app/addons/replication/views.js
+++ b/app/addons/replication/views.js
@@ -90,9 +90,10 @@ function (app, FauxtonAPI, Components, Replication) {
 
       if (targetVal === 'local') {
         $currentTarget.parents('.form_set').addClass('local');
-      }else {
-        $currentTarget.parents('.form_set').removeClass('local');
+        return;
       }
+
+      $currentTarget.parents('.form_set').removeClass('local');
     },
 
     establish: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/901d0060/couchapp.js
----------------------------------------------------------------------
diff --git a/couchapp.js b/couchapp.js
index fec8dd3..ce0d0a4 100644
--- a/couchapp.js
+++ b/couchapp.js
@@ -27,7 +27,7 @@ ddoc = {
   views: {},
   shows: {},
   lists: {},
-  validate_doc_update: function(newDoc, oldDoc, userCtx) {
+  validate_doc_update: function (newDoc, oldDoc, userCtx) {
     /*if (newDoc._deleted === true && userCtx.roles.indexOf('_admin') === -1) {
       throw "Only admin can delete documents on this database.";
     }*/

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/901d0060/tasks/addon/template.js
----------------------------------------------------------------------
diff --git a/tasks/addon/template.js b/tasks/addon/template.js
index b9b4c1e..a1ef206 100644
--- a/tasks/addon/template.js
+++ b/tasks/addon/template.js
@@ -64,5 +64,5 @@ exports.template = function (grunt, init, done) {
       // All done!
       done();
     }
-  )
+  );
 };

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/901d0060/tasks/helper.js
----------------------------------------------------------------------
diff --git a/tasks/helper.js b/tasks/helper.js
index 8ad4d32..4b4095e 100644
--- a/tasks/helper.js
+++ b/tasks/helper.js
@@ -53,7 +53,7 @@ exports.init = function (grunt) {
             files.push(path.join(dep.path, '**/*' + fileExtension ));
           });
         }
-        return files
+        return files;
       }, defaults);
     },
 


Mime
View raw message