💚 👕

Author: imlucas

gulpfile.js

@@ -126,8 +126,9 @@ gulp.task('watch', function() {
 /**
  * Use browserify to compile the UI js.
  */
+var jadeify = require('jadeify');
 gulp.task('build:js', function() {
-  var bundler = browserify(pkg.browserify).transform('jadeify');
+  var bundler = browserify(pkg.browserify).transform(jadeify);
   if (process.env.NODE_ENV === 'production') {
     return bundler.bundle()
       .on('error', notify('js'))

package.json

@@ -22,21 +22,21 @@
       "./tasks/linux.js"
     ],
     "ignore": [
-      "app", 
-      "auto-updater", 
-      "bootstrap", 
-      "browser-window", 
+      "app",
+      "auto-updater",
+      "bootstrap",
+      "browser-window",
       "clipboard",
-      "crash-reporter", 
-      "dialog", 
-      "electron-squirrel-startup", 
-      "font-awesome", 
-      "glob", 
-      "ipc", 
-      "jade", 
-      "keytar", 
-      "menu", 
-      "octicons", 
+      "crash-reporter",
+      "dialog",
+      "electron-squirrel-startup",
+      "font-awesome",
+      "glob",
+      "ipc",
+      "jade",
+      "keytar",
+      "menu",
+      "octicons",
       "scout-server"
     ]
   },
@@ -116,7 +116,6 @@
     "electron-installer-dmg": "^0.1.0",
     "electron-installer-squirrel-windows": "^0.4.0",
     "electron-packager": "^5.1.1",
-<<<<<<< 50eddee91c762cac77586943130d76ca301908cb
     "eslint": "^1.9.0",
     "eslint-config-mongodb-js": "^1.0.6",
     "event-stream": "^3.3.2",

src/app.js

@@ -237,9 +237,9 @@ var Application = View.extend({
 });
 
 var params = qs.parse(window.location.search.replace('?', ''));
-var connection_id = params.connection_id;
+var connectionId = params.connection_id;
 var state = new Application({
-  connection_id: connection_id
+  connection_id: connectionId
 });
 
 /**
@@ -296,7 +296,7 @@ app.extend({
     domReady(function() {
       state.render();
 
-      if (!connection_id) {
+      if (!connectionId) {
         // Not serving a part of the app which uses the client,
         // so we can just start everything up now.
         state.startRouter();
@@ -306,10 +306,10 @@ app.extend({
       app.statusbar.show('Retrieving connection details...');
 
       state.connection = new Connection({
-        _id: connection_id
+        _id: connectionId
       });
 
-      debug('looking up connection `%s`...', connection_id);
+      debug('looking up connection `%s`...', connectionId);
       getConnection(state.connection, function(err) {
         if (err) {
           state.onFatalError('fetch connection', err);

src/models/scout-client-mixin.js

@@ -30,7 +30,7 @@ module.exports = {
       if (err) {
         return options.error({}, 'error', err.message);
       }
-      raf(function call_scout_client_success() {
+      raf(function onScoutClientSuccess() {
         options.success(res, 'success', res);
       });
     };

src/models/selectable-collection-mixin.js

@@ -61,7 +61,7 @@ module.exports = {
     if (model.selected) {
       return false;
     }
-    raf(function selectable_mark_selected() {
+    raf(function selectableMarkModelSelected() {
       var current = this.selected;
       if (current) {
         current.selected = false;

src/models/user.js

@@ -12,12 +12,12 @@ var User = Model.extend({
     created_at: 'date',
     avatar_url: 'string',
     company_name: 'string'
-    // github_username: 'string',
-    /**
-     * `public_repos + public_gists + followers + following`
-     */
-    // github_score: 'number',
-    // github_last_activity_at: 'date'
+  // github_username: 'string',
+  /**
+   * `public_repos + public_gists + followers + following`
+   */
+  // github_score: 'number',
+  // github_last_activity_at: 'date'
   },
   sync: sync.exec.bind(sync)
 });

tasks/linux.js

@@ -1,3 +1,4 @@
+/* eslint no-console:0 */
 var path = require('path');
 var pkg = require(path.resolve(__dirname, '../package.json'));
 var fs = require('fs');

tasks/notify.js

@@ -1,3 +1,4 @@
+/* eslint no-console:0 */
 var notifier = require('node-notifier');
 var path = require('path');
 var gutil = require('gulp-util');

test/keytar.test.js

@@ -4,6 +4,6 @@ describe('keytar', function() {
   it('should be requirable', function() {
     assert.doesNotThrow(function() {
       require('keytar');
-    })
+    });
   });
 });