Merge pull request #159 from 10gen/one_more_thing

INT-747 🚧 "one more thing"

Author: kangas

package.json

@@ -78,7 +78,8 @@
     "mongodb-connection-model": "^3.0.6",
     "mongodb-instance-model": "^1.0.2",
     "mongodb-ns": "^1.0.0",
-    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.2/scout-server-0.4.2.tar.gz"
+    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.2/scout-server-0.4.2.tar.gz",
+    "google-maps": "^3.1.0"
   },
   "devDependencies": {
     "ampersand-app": "^1.0.4",
@@ -91,6 +92,7 @@
     "ampersand-sync-localforage": "^0.1.1",
     "ampersand-view": "^9.0.0",
     "ampersand-view-switcher": "^2.0.0",
+    "async": "^1.5.0",
     "backoff": "^2.4.1",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
     "browserify": "^12.0.1",

src/app.js

@@ -236,7 +236,7 @@ var state = new Application({
 // via `window.localStorage`.
 var FEATURES = {
   querybuilder: true,
-  'First Run Tour': false,
+  'Geo Minicharts': true,
   'Connect with SSL': false,
   'Connect with Kerberos': false,
   'Connect with LDAP': false,
@@ -245,8 +245,6 @@ var FEATURES = {
 
 app.extend({
   client: null,
-  // @note (imlucas): Backwards compat for querybuilder
-  features: FEATURES,
   /**
    * Check whether a feature flag is currently enabled.
    *
@@ -256,6 +254,16 @@ app.extend({
   isFeatureEnabled: function(id) {
     return FEATURES[id] === true;
   },
+  /**
+   * Enable or disable a feature programatically.
+   *
+   * @param {String} id - A key in `FEATURES`.
+   * @param {Boolean} bool - whether to enable (true) or disable (false)
+   * @return {Boolean}
+   */
+  setFeature: function(id, bool) {
+    FEATURES[id] = bool;
+  },
   sendMessage: function(msg) {
     ipc.send('message', msg);
   },

src/field-list/index.js

@@ -147,9 +147,9 @@ FieldListView = View.extend({
   },
   makeFieldVisible: function() {
     var views = this.fieldCollectionView.views;
-    _.each(views, function(field_view) {
+    _.each(views, function(fieldView) {
       raf(function() {
-        field_view.visible = true;
+        fieldView.visible = true;
       });
     });
   },

src/index.jade

@@ -2,8 +2,7 @@ doctype html
 html(lang='en')
   head
     title MongoDB
-    meta(http-equiv="Content-Security-Policy", content="default-src *; script-src 'self' http://localhost:35729; style-src 'self' 'unsafe-inline';")
-
+    meta(http-equiv="Content-Security-Policy", content="default-src *; script-src 'self' https://*.googleapis.com https://maps.gstatic.com http://localhost:35729 'unsafe-eval'; style-src 'self' https://fonts.googleapis.com 'unsafe-inline';")
     meta(name='viewport', content='initial-scale=1')
     link(rel='stylesheet', href='index.css', charset='UTF-8')
   body