touchup last commit

Author: WaleyChen

src/electron/menu.js

@@ -1,3 +1,6 @@
+// based off of https://github.com/atom/atom/blob/master/src/browser/application-menu.coffee
+// use js2.coffee to convert it to JS
+
 var app = require('app');
 var BrowserWindow = require('browser-window');
 var Menu = require('menu');
@@ -180,51 +183,76 @@ function windowSubMenu() {
 }
 
 // menus
-function darwinMenu(showShareSubMenu) {
+function darwinMenu(showConnectSubMenu, showShareSubMenu) {
   var m = [
-    darwinCompassSubMenu(),
-    connectSubMenu(),
-    editSubMenu(),
-    viewSubMenu(),
-    windowSubMenu()
+    darwinCompassSubMenu()
   ];
+
+  if (showConnectSubMenu) {
+    m.push(connectSubMenu());
+  }
+
+  m.push(editSubMenu());
+  m.push(viewSubMenu());
+
   if (showShareSubMenu) {
-    m.splice(4, 0, shareSubMenu());
+    m.push(shareSubMenu());
   }
+
+  m.push(windowSubMenu());
+
   return m;
 }
 
-function nonDarwinMenu(showShareSubMenu) {
+function nonDarwinMenu(showConnectSubMenu, showShareSubMenu) {
   var m = [
-    nonDarwinCompassSubMenu(),
-    connectSubMenu(),
-    viewSubMenu()
+    nonDarwinCompassSubMenu()
   ];
+
+  if (showConnectSubMenu) {
+    m.push(connectSubMenu());
+  }
+
+  m.push(viewSubMenu());
+
   if (showShareSubMenu) {
     m.push(shareSubMenu());
   }
+
   return m;
 }
 
 // menu singleton
 var menu = (function() {
   return {
-    init: function() {
+    load: function(showConnectSubMenu, showShareSubMenu) {
+      if (typeof showConnectSubMenu === 'undefined') {
+        showConnectSubMenu = true;
+      }
+
+      if (typeof showShareSubMenu === 'undefined') {
+        showShareSubMenu = true;
+      }
+
       var m;
       if (process.platform === 'darwin') {
-        m = darwinMenu();
+        m = darwinMenu(showConnectSubMenu, showShareSubMenu);
       } else {
-        m = nonDarwinMenu();
+        m = nonDarwinMenu(showConnectSubMenu, showShareSubMenu);
       }
       m = Menu.buildFromTemplate(m);
       Menu.setApplicationMenu(m);
-    },
-    hideShareSubMenu: function() {
-
-    },
-    showShareSubMenu: function() {
-
     }
+    // hideShareSubMenu: function() {
+    //   this.load(false);
+    // },
+    // hideConnectSubMenu: function() {
+    // },
+    // showConnectSubMenu: function() {
+    // },
+    // showShareSubMenu: function() {
+    //   this.load(true);
+    // }
   };
 }());
 

src/electron/window-manager.js

@@ -63,8 +63,8 @@ module.exports.create = function(opts) {
       'direct-write': true
     }
   });
-  menu.init();
-  GLOBAL.menu = menu;
+  menu.load();
+  // GLOBAL.menu = menu;
 
   // makes the application a single instance application
   // see "app.makeSingleInstance" in https://github.com/atom/electron/blob/master/docs/api/app.md

src/home/collection.js

@@ -75,7 +75,7 @@ var MongoDBCollectionView = View.extend({
   schemaIsSynced: function() {
     // only listen to share menu events if we have a sync'ed schema
     // @todo enable share menu item here
-    GLOBAL.menu.showShareMenu();
+    // GLOBAL.menu.showShareMenu();
     this.listenTo(app, 'menu-share-schema-json', this.onShareSchema.bind(this));
   },
   schemaIsRequested: function() {