Skip to content

🚧 "one more thing" #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Nov 3, 2015
Merged

🚧 "one more thing" #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7118fec
WIP first steps for adding a coordinate minichart.
Sep 17, 2015
c2065b8
added google maps, no interaction yet
Sep 18, 2015
25a0dbf
selection circle working
Sep 23, 2015
bf07dac
mostly name changes
Oct 6, 2015
a980ca1
geo queries are created in the query bar. no backwards pass yet.
Oct 6, 2015
e3c9a3f
map style, enabling controls (for now)
Oct 7, 2015
9612732
debug message when starting to drag map
Oct 7, 2015
5bf4f7f
use google maps Circle class instead of d3
Oct 9, 2015
6e9918c
feature flag for geo minicharts
Oct 9, 2015
e89be93
defer map resizing after stack has cleared.
Oct 9, 2015
876b0f4
shiftkey handling, language model bump, geojson
Oct 13, 2015
da655fa
geo backwards pass implemented.
Oct 14, 2015
89ca12d
update security policy, fix eslint errors
Oct 14, 2015
2c4d0cb
detect google map loading timeouts and disable
Oct 15, 2015
231efe9
WIP first steps for adding a coordinate minichart.
Sep 17, 2015
412f987
added google maps, no interaction yet
Sep 18, 2015
486c9e3
selection circle working
Sep 23, 2015
b472ab7
mostly name changes
Oct 6, 2015
57cfc76
geo queries are created in the query bar. no backwards pass yet.
Oct 6, 2015
87068cf
map style, enabling controls (for now)
Oct 7, 2015
dcb3ce8
debug message when starting to drag map
Oct 7, 2015
f3ebd22
use google maps Circle class instead of d3
Oct 9, 2015
08209c7
feature flag for geo minicharts
Oct 9, 2015
cf5c698
defer map resizing after stack has cleared.
Oct 9, 2015
79e0494
shiftkey handling, language model bump, geojson
Oct 13, 2015
52f6e0b
geo backwards pass implemented.
Oct 14, 2015
9820dd4
update security policy, fix eslint errors
Oct 14, 2015
57259a6
detect google map loading timeouts and disable
Oct 15, 2015
ee13bb1
security policy updated, POIs hidden.
rueckstiess Nov 2, 2015
58e9c09
:bug: :shirt: fix nested geo fields, eslint cleanup
rueckstiess Nov 3, 2015
bba40ee
DRY'ed minicharts/index.js. Offline detection.
rueckstiess Nov 3, 2015
6e89734
rename type to "coordinates". suppress fields/types.
rueckstiess Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
14 changes: 11 additions & 3 deletions src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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.
*
Expand All @@ -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);
},
Expand Down
4 changes: 2 additions & 2 deletions src/field-list/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
});
},
Expand Down
3 changes: 1 addition & 2 deletions src/index.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading